2009-02-04 09:47:56 +01:00
|
|
|
|
/* Handle Darwin shared libraries for GDB, the GNU Debugger.
|
|
|
|
|
|
2015-01-01 10:32:14 +01:00
|
|
|
|
Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
|
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "bfd.h"
|
|
|
|
|
#include "symfile.h"
|
|
|
|
|
#include "objfiles.h"
|
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "target.h"
|
|
|
|
|
#include "inferior.h"
|
2009-05-05 15:24:49 +02:00
|
|
|
|
#include "regcache.h"
|
2009-02-04 09:47:56 +01:00
|
|
|
|
#include "gdbthread.h"
|
* dwarf2read.c (try_open_dwo_file): Use gdb_bfd_ref and
gdb_bfd_unref.
(free_dwo_file): Use gdb_bfd_unref.
* cli/cli-dump.c: Include gdb_bfd.h.
(bfd_openw_with_cleanup): Use gdb_bfd_ref.
(bfd_openr_with_cleanup): Likewise.
* windows-nat.c (windows_make_so): Use gdb_bfd_ref,
gdb_bfd_unref.
* utils.c: Include gdb_bfd.h.
(do_bfd_close_cleanup): Use gdb_bfd_unref.
* symfile.c: Include gdb_bfd.h.
(separate_debug_file_exists): Use gdb_bfd_unref.
(bfd_open_maybe_remote): Use gdb_bfd_ref.
(symfile_bfd_open): Use gdb_bfd_ref, gdb_bfd_unref.
(generic_load): Use gdb_bfd_ref.
(reread_symbols): Use gdb_bfd_unref.
* symfile-mem.c: Include gdb_bfd.h.
(symbol_file_add_from_memory): Use make_cleanup_bfd_close.
* spu-linux-nat.c (spu_bfd_open): Use gdb_bfd_ref, gdb_bfd_unref.
* solib.c: Include gdb_bfd.h.
(solib_bfd_fopen): Use gdb_bfd_ref.
(solib_bfd_open): Use gdb_bfd_unref.
(free_so_symbols): Use gdb_bfd_unref.
(reload_shared_libraries_1): Use gdb_bfd_unref.
* solib-spu.c: Include gdb_bfd.h.
(spu_bfd_fopen): Use gdb_bfd_ref, gdb_bfd_unref.
* solib-pa64.c (pa64_solib_create_inferior_hook): Use gdb_bfd_ref,
gdb_bfd_unref.
* solib-frv.c: Include gdb_bfd.h.
(enable_break2): Use gdb_bfd_unref.
* solib-dsbt.c: Include gdb_bfd.h.
(enable_break2): Use gdb_bfd_unref.
* solib-darwin.c: Include gdb_bfd.h.
(darwin_solib_get_all_image_info_addr_at_init): Use gdb_bfd_ref,
gdb_bfd_unref.
(darwin_bfd_open): Use gdb_bfd_unref.
* rs6000-nat.c (add_vmap): Use gdb_bfd_ref, gdb_bfd_unref.
* remote-mips.c: Include gdb_bfd.h.
(mips_load_srec): Use gdb_bfd_ref.
(pmon_load_fast): Use gdb_bfd_ref.
* remote-m32r-sdi.c: Include gdb_bfd.h.
(m32r_load): Use gdb_bfd_ref.
* record.c: Include gdb_bfd.h.
(record_save_cleanups): Use gdb_bfd_unref.
(cmd_record_save): Use gdb_bfd_unref.
* procfs.c (insert_dbx_link_bpt_in_file): Use gdb_bfd_ref,
gdb_bfd_unref.
* objfiles.h (gdb_bfd_close_or_warn): Remove.
(gdb_bfd_ref, gdb_bfd_unref): Move to gdb_bfd.h.
* objfiles.c: Include gdb_bfd.h.
(free_objfile): Use gdb_bfd_unref.
(gdb_bfd_close_or_warn, gdb_bfd_ref, gdb_bfd_unref): Move to
gdb_bfd.c.
* machoread.c (macho_add_oso_symfile): Use gdb_bfd_unref.
(macho_symfile_read_all_oso): Use gdb_bfd_ref, gdb_bfd_unref.
(macho_check_dsym): Likewise.
* m32r-rom.c: Include gdb_bfd.h.
(m32r_load): Use gdb_bfd_ref.
(m32r_upload_command): Use gdb_bfd_ref.
* jit.c: Include gdb_bfd.h.
(jit_bfd_try_read_symtab): Use gdb_bfd_ref, gdb_bfd_unref.
* gdb_bfd.h: New file.
* gdb_bfd.c: New file.
* gcore.c: Include gdb_bfd.h.
(create_gcore_bfd): Use gdb_bfd_ref.
(do_bfd_delete_cleanup): Use gdb_bfd_unref.
(gcore_command): Use gdb_bfd_unref.
* exec.c: Include gdb_bfd.h.
(exec_close): Use gdb_bfd_unref.
(exec_close_1): Use gdb_bfd_unref.
(exec_file_attach): Use gdb_bfd_ref.
* elfread.c: Include gdb_bfd.h.
(build_id_verify): Use gdb_bfd_unref.
* dsrec.c: Include gdb_bfd.h.
(load_srec): Use gdb_bfd_ref.
* corelow.c: Include gdb_bfd.h.
(core_close): Use gdb_bfd_unref.
(core_open): Use gdb_bfd_ref.
* bfd-target.c: Include gdb_bfd.h.
(target_bfd_xclose): Use gdb_bfd_unref.
(target_bfd_reopen): Use gdb_bfd_ref.
* Makefile.in (SFILES): Add gdb_bfd.c.
(HFILES_NO_SRCDIR): Add gdb_bfd.h.
(COMMON_OBS): Add gdb_bfd.o.
2012-07-18 21:33:34 +02:00
|
|
|
|
#include "gdb_bfd.h"
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
#include "solist.h"
|
|
|
|
|
#include "solib.h"
|
|
|
|
|
#include "solib-svr4.h"
|
|
|
|
|
|
|
|
|
|
#include "bfd-target.h"
|
|
|
|
|
#include "elf-bfd.h"
|
|
|
|
|
#include "exec.h"
|
|
|
|
|
#include "auxv.h"
|
|
|
|
|
#include "mach-o.h"
|
2012-02-17 17:37:43 +01:00
|
|
|
|
#include "mach-o/external.h"
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
struct gdb_dyld_image_info
|
|
|
|
|
{
|
|
|
|
|
/* Base address (which corresponds to the Mach-O header). */
|
|
|
|
|
CORE_ADDR mach_header;
|
|
|
|
|
/* Image file path. */
|
|
|
|
|
CORE_ADDR file_path;
|
|
|
|
|
/* st.m_time of image file. */
|
|
|
|
|
unsigned long mtime;
|
|
|
|
|
};
|
|
|
|
|
|
2009-10-13 12:31:40 +02:00
|
|
|
|
/* Content of inferior dyld_all_image_infos structure.
|
|
|
|
|
See /usr/include/mach-o/dyld_images.h for the documentation. */
|
2009-02-04 09:47:56 +01:00
|
|
|
|
struct gdb_dyld_all_image_infos
|
|
|
|
|
{
|
|
|
|
|
/* Version (1). */
|
|
|
|
|
unsigned int version;
|
|
|
|
|
/* Number of images. */
|
|
|
|
|
unsigned int count;
|
|
|
|
|
/* Image description. */
|
|
|
|
|
CORE_ADDR info;
|
|
|
|
|
/* Notifier (function called when a library is added or removed). */
|
|
|
|
|
CORE_ADDR notifier;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Current all_image_infos version. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
#define DYLD_VERSION_MIN 1
|
2014-03-17 14:01:02 +01:00
|
|
|
|
#define DYLD_VERSION_MAX 14
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
/* Per PSPACE specific data. */
|
|
|
|
|
struct darwin_info
|
|
|
|
|
{
|
|
|
|
|
/* Address of structure dyld_all_image_infos in inferior. */
|
|
|
|
|
CORE_ADDR all_image_addr;
|
|
|
|
|
|
|
|
|
|
/* Gdb copy of dyld_all_info_infos. */
|
|
|
|
|
struct gdb_dyld_all_image_infos all_image;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Per-program-space data key. */
|
|
|
|
|
static const struct program_space_data *solib_darwin_pspace_data;
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
darwin_pspace_data_cleanup (struct program_space *pspace, void *arg)
|
|
|
|
|
{
|
2013-10-24 14:42:02 +02:00
|
|
|
|
xfree (arg);
|
2012-05-29 14:59:53 +02:00
|
|
|
|
}
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
/* Get the current darwin data. If none is found yet, add it now. This
|
|
|
|
|
function always returns a valid object. */
|
|
|
|
|
|
|
|
|
|
static struct darwin_info *
|
|
|
|
|
get_darwin_info (void)
|
|
|
|
|
{
|
|
|
|
|
struct darwin_info *info;
|
|
|
|
|
|
2015-09-25 20:08:07 +02:00
|
|
|
|
info = (struct darwin_info *) program_space_data (current_program_space,
|
|
|
|
|
solib_darwin_pspace_data);
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (info != NULL)
|
|
|
|
|
return info;
|
|
|
|
|
|
2013-12-28 23:31:01 +01:00
|
|
|
|
info = XCNEW (struct darwin_info);
|
2012-05-29 14:59:53 +02:00
|
|
|
|
set_program_space_data (current_program_space,
|
|
|
|
|
solib_darwin_pspace_data, info);
|
|
|
|
|
return info;
|
|
|
|
|
}
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2009-10-13 12:31:40 +02:00
|
|
|
|
/* Return non-zero if the version in dyld_all_image is known. */
|
|
|
|
|
|
|
|
|
|
static int
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_dyld_version_ok (const struct darwin_info *info)
|
2009-10-13 12:31:40 +02:00
|
|
|
|
{
|
2012-05-29 14:59:53 +02:00
|
|
|
|
return info->all_image.version >= DYLD_VERSION_MIN
|
|
|
|
|
&& info->all_image.version <= DYLD_VERSION_MAX;
|
2009-10-13 12:31:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
/* Read dyld_all_image from inferior. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static void
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_load_image_infos (struct darwin_info *info)
|
2009-02-04 09:47:56 +01:00
|
|
|
|
{
|
|
|
|
|
gdb_byte buf[24];
|
* gdbarch.sh (target_gdbarch): Remove macro.
(get_target_gdbarch): Rename to target_gdbarch.
* gdbarch.c, gdbarch.h: Rebuild.
* ada-tasks.c, aix-thread.c, amd64-linux-nat.c, arch-utils.c,
arm-tdep.c, auxv.c, breakpoint.c, bsd-uthread.c, corefile.c,
darwin-nat-info.c, dcache.c, dsrec.c, exec.c, fbsd-nat.c,
filesystem.c, gcore.c, gnu-nat.c, i386-darwin-nat.c, i386-nat.c,
ia64-vms-tdep.c, inf-ptrace.c, infcmd.c, jit.c, linux-nat.c,
linux-tdep.c, linux-thread-db.c, m32r-rom.c, memattr.c,
mep-tdep.c, microblaze-tdep.c, mips-linux-nat.c,
mips-linux-tdep.c, mips-tdep.c, monitor.c, moxie-tdep.c,
nto-procfs.c, nto-tdep.c, ppc-linux-nat.c, proc-service.c,
procfs.c, progspace.c, ravenscar-thread.c, record.c,
remote-m32r-sdi.c, remote-mips.c, remote-sim.c, remote.c,
rl78-tdep.c, rs6000-nat.c, rx-tdep.c, s390-nat.c, sol-thread.c,
solib-darwin.c, solib-dsbt.c, solib-frv.c, solib-ia64-hpux.c,
solib-irix.c, solib-pa64.c, solib-som.c, solib-spu.c,
solib-sunos.c, solib-svr4.c, solib.c, spu-linux-nat.c,
spu-multiarch.c, spu-tdep.c, symfile-mem.c, symfile.c, symtab.c,
target-descriptions.c, target.c, target.h, tracepoint.c,
windows-nat.c, windows-tdep.c, xcoffsolib.c, cli/cli-dump.c,
common/agent.c, mi/mi-interp.c, python/py-finishbreakpoint.c,
python/py-inferior.c, python/python.c: Update.
2012-11-09 20:58:03 +01:00
|
|
|
|
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
|
|
|
|
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
/* If the structure address is not known, don't continue. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (info->all_image_addr == 0)
|
2009-02-04 09:47:56 +01:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* The structure has 4 fields: version (4 bytes), count (4 bytes),
|
|
|
|
|
info (pointer) and notifier (pointer). */
|
2015-12-11 18:06:35 +01:00
|
|
|
|
len = 4 + 4 + 2 * TYPE_LENGTH (ptr_type);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
gdb_assert (len <= sizeof (buf));
|
2012-05-29 14:59:53 +02:00
|
|
|
|
memset (&info->all_image, 0, sizeof (info->all_image));
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
/* Read structure raw bytes from target. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (target_read_memory (info->all_image_addr, buf, len))
|
2009-02-04 09:47:56 +01:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Extract the fields. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
info->all_image.version = extract_unsigned_integer (buf, 4, byte_order);
|
|
|
|
|
if (!darwin_dyld_version_ok (info))
|
2009-02-04 09:47:56 +01:00
|
|
|
|
return;
|
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
info->all_image.count = extract_unsigned_integer (buf + 4, 4, byte_order);
|
|
|
|
|
info->all_image.info = extract_typed_address (buf + 8, ptr_type);
|
|
|
|
|
info->all_image.notifier = extract_typed_address
|
2015-12-11 18:06:35 +01:00
|
|
|
|
(buf + 8 + TYPE_LENGTH (ptr_type), ptr_type);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Link map info to include in an allocated so_list entry. */
|
|
|
|
|
|
|
|
|
|
struct lm_info
|
|
|
|
|
{
|
|
|
|
|
/* The target location of lm. */
|
|
|
|
|
CORE_ADDR lm_addr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct darwin_so_list
|
|
|
|
|
{
|
|
|
|
|
/* Common field. */
|
|
|
|
|
struct so_list sl;
|
|
|
|
|
/* Darwin specific data. */
|
|
|
|
|
struct lm_info li;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Lookup the value for a specific symbol. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static CORE_ADDR
|
|
|
|
|
lookup_symbol_from_bfd (bfd *abfd, char *symname)
|
|
|
|
|
{
|
|
|
|
|
long storage_needed;
|
|
|
|
|
asymbol **symbol_table;
|
|
|
|
|
unsigned int number_of_symbols;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
CORE_ADDR symaddr = 0;
|
|
|
|
|
|
|
|
|
|
storage_needed = bfd_get_symtab_upper_bound (abfd);
|
|
|
|
|
|
|
|
|
|
if (storage_needed <= 0)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
symbol_table = (asymbol **) xmalloc (storage_needed);
|
|
|
|
|
number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
|
2009-10-14 15:15:34 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
for (i = 0; i < number_of_symbols; i++)
|
|
|
|
|
{
|
|
|
|
|
asymbol *sym = symbol_table[i];
|
2010-05-17 01:49:58 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
if (strcmp (sym->name, symname) == 0
|
|
|
|
|
&& (sym->section->flags & (SEC_CODE | SEC_DATA)) != 0)
|
|
|
|
|
{
|
|
|
|
|
/* BFD symbols are section relative. */
|
|
|
|
|
symaddr = sym->value + sym->section->vma;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
xfree (symbol_table);
|
|
|
|
|
|
|
|
|
|
return symaddr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return program interpreter string. */
|
2009-08-10 11:35:24 +02:00
|
|
|
|
|
2013-04-19 17:10:53 +02:00
|
|
|
|
static char *
|
2009-02-04 09:47:56 +01:00
|
|
|
|
find_program_interpreter (void)
|
|
|
|
|
{
|
2013-04-19 17:10:53 +02:00
|
|
|
|
char *buf = NULL;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2009-08-10 11:35:24 +02:00
|
|
|
|
/* If we have an exec_bfd, get the interpreter from the load commands. */
|
2009-02-04 09:47:56 +01:00
|
|
|
|
if (exec_bfd)
|
|
|
|
|
{
|
2009-08-10 11:35:24 +02:00
|
|
|
|
bfd_mach_o_load_command *cmd;
|
2009-10-14 15:15:34 +02:00
|
|
|
|
|
2009-08-10 11:35:24 +02:00
|
|
|
|
if (bfd_mach_o_lookup_command (exec_bfd,
|
|
|
|
|
BFD_MACH_O_LC_LOAD_DYLINKER, &cmd) == 1)
|
|
|
|
|
return cmd->command.dylinker.name_str;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we didn't find it, read from memory.
|
|
|
|
|
FIXME: todo. */
|
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Not used. I don't see how the main symbol file can be found: the
|
|
|
|
|
interpreter name is needed and it is known from the executable file.
|
|
|
|
|
Note that darwin-nat.c implements pid_to_exec_file. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static int
|
|
|
|
|
open_symbol_file_object (void *from_ttyp)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-11 22:53:25 +01:00
|
|
|
|
/* Build a list of currently loaded shared objects. See solib-svr4.c. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static struct so_list *
|
|
|
|
|
darwin_current_sos (void)
|
|
|
|
|
{
|
* gdbarch.sh (target_gdbarch): Remove macro.
(get_target_gdbarch): Rename to target_gdbarch.
* gdbarch.c, gdbarch.h: Rebuild.
* ada-tasks.c, aix-thread.c, amd64-linux-nat.c, arch-utils.c,
arm-tdep.c, auxv.c, breakpoint.c, bsd-uthread.c, corefile.c,
darwin-nat-info.c, dcache.c, dsrec.c, exec.c, fbsd-nat.c,
filesystem.c, gcore.c, gnu-nat.c, i386-darwin-nat.c, i386-nat.c,
ia64-vms-tdep.c, inf-ptrace.c, infcmd.c, jit.c, linux-nat.c,
linux-tdep.c, linux-thread-db.c, m32r-rom.c, memattr.c,
mep-tdep.c, microblaze-tdep.c, mips-linux-nat.c,
mips-linux-tdep.c, mips-tdep.c, monitor.c, moxie-tdep.c,
nto-procfs.c, nto-tdep.c, ppc-linux-nat.c, proc-service.c,
procfs.c, progspace.c, ravenscar-thread.c, record.c,
remote-m32r-sdi.c, remote-mips.c, remote-sim.c, remote.c,
rl78-tdep.c, rs6000-nat.c, rx-tdep.c, s390-nat.c, sol-thread.c,
solib-darwin.c, solib-dsbt.c, solib-frv.c, solib-ia64-hpux.c,
solib-irix.c, solib-pa64.c, solib-som.c, solib-spu.c,
solib-sunos.c, solib-svr4.c, solib.c, spu-linux-nat.c,
spu-multiarch.c, spu-tdep.c, symfile-mem.c, symfile.c, symtab.c,
target-descriptions.c, target.c, target.h, tracepoint.c,
windows-nat.c, windows-tdep.c, xcoffsolib.c, cli/cli-dump.c,
common/agent.c, mi/mi-interp.c, python/py-finishbreakpoint.c,
python/py-inferior.c, python/python.c: Update.
2012-11-09 20:58:03 +01:00
|
|
|
|
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
|
|
|
|
|
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
2009-02-04 09:47:56 +01:00
|
|
|
|
int ptr_len = TYPE_LENGTH (ptr_type);
|
|
|
|
|
unsigned int image_info_size;
|
|
|
|
|
struct so_list *head = NULL;
|
|
|
|
|
struct so_list *tail = NULL;
|
|
|
|
|
int i;
|
2012-05-29 14:59:53 +02:00
|
|
|
|
struct darwin_info *info = get_darwin_info ();
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
/* Be sure image infos are loaded. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_load_image_infos (info);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (!darwin_dyld_version_ok (info))
|
2009-02-04 09:47:56 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
image_info_size = ptr_len * 3;
|
|
|
|
|
|
|
|
|
|
/* Read infos for each solib.
|
2012-02-17 17:37:43 +01:00
|
|
|
|
The first entry was rumored to be the executable itself, but this is not
|
|
|
|
|
true when a large number of shared libraries are used (table expanded ?).
|
|
|
|
|
We now check all entries, but discard executable images. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
for (i = 0; i < info->all_image.count; i++)
|
2009-02-04 09:47:56 +01:00
|
|
|
|
{
|
2012-05-29 14:59:53 +02:00
|
|
|
|
CORE_ADDR iinfo = info->all_image.info + i * image_info_size;
|
Use gdb_byte for bytes from the program being debugged.
gdb_byte should be used for bytes from the program being debugged. We
have many places using char or unsigned char instead all over the
existing ports, and more ends up added over time due to copy/paste as
new code is based on old code.
I've greped the tree for "char buf[", and fixed all I found.
Tested by building with --enable-targets=all.
2013-03-01 Pedro Alves <palves@redhat.com>
Use gdb_byte for bytes from the program being debugged.
* arm-tdep.c (arm_store_return_value, arm_get_longjmp_target):
Change type of local 'buf' to gdb_byte.
* avr-tdep.c (avr_frame_prev_register, avr_push_dummy_call): Likewise.
* bfin-tdep.c (bfin_push_dummy_call): Likewise.
* cris-tdep.c (cris_sigcontext_addr)
(cris_sigtramp_frame_unwind_cache): Likewise.
* frv-linux-tdep.c (frv_linux_pc_in_sigtramp)
(frv_linux_sigcontext_reg_addr, frv_linux_sigtramp_frame_cache):
Likewise.
* frv-tdep.c (frv_pseudo_register_write, frv_analyze_prologue): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_find_global_pointer)
(hppa32_hpux_search_dummy_call_sequence)
(hppa_hpux_supply_save_state): Likewise.
* hppa-linux-tdep.c (insns_match_pattern)
(hppa_linux_find_global_pointer): Likewise.
* hppa-tdep.c (hppa_in_function_epilogue_p)
(skip_prologue_hard_way, hppa_frame_cache): Likewise.
* i386-nto-tdep.c (i386nto_sigcontext_addr): Likewise.
* i386fbsd-tdep.c (i386fbsd_supply_uthread)
(i386fbsd_collect_uthread): Likewise.
* ia64-hpux-tdep.c (ia64_hpux_push_dummy_code): Likewise.
* ia64-linux-tdep.c (ia64_linux_sigcontext_register_address): Likewise.
* ia64-tdep.c (examine_prologue, ia64_frame_cache)
(ia64_frame_prev_register, ia64_sigtramp_frame_cache)
(ia64_sigtramp_frame_prev_register, ia64_access_reg)
(ia64_access_rse_reg, ia64_libunwind_frame_this_id)
(ia64_libunwind_frame_prev_register)
(ia64_libunwind_sigtramp_frame_this_id)
(ia64_find_global_pointer_from_dynamic_section)
(find_extant_func_descr, find_func_descr, ia64_dummy_id)
(ia64_unwind_pc): Likewise.
* iq2000-tdep.c (iq2000_store_return_value): Likewise.
* m68hc11-tdep.c (m68hc11_push_dummy_call)
(m68hc11_extract_return_value): Likewise.
* m68klinux-nat.c (fetch_register, store_register): Likewise.
* mep-tdep.c (mep_pseudo_cr32_read, mep_pseudo_cr32_write)
(mep_get_insn, mep_push_dummy_call): Likewise.
* mips-linux-tdep.c (mips_linux_get_longjmp_target)
(mips_linux_in_dynsym_stub): Likewise.
* mn10300-tdep.c (mep_pseudo_cr32_write): Likewise.
* ppc-linux-nat.c (fetch_register, store_register): Likewise.
* regcache.c (dump_endian_bytes): Change type of parameter 'buf'
to gdb_byte.
* remote-mips.c (mips_set_register): Likewise.
* remote-sim.c (gdbsim_fetch_register): Likewise.
* score-tdep.c (score7_fetch_inst): Change type of parameter
'memblock' and local 'buf' to gdb_byte.
(score7_malloc_and_get_memblock): Change return type to gdb_byte.
Change type of local 'buf' to gdb_byte. Adjust.
(score7_adjust_memblock_ptr): Change type of parameter 'memblock'
to gdb_byte**.
(score7_analyze_prologue): Change type of 'memblock' and
'memblock_ptr' locals to gdb_byte*.
* sh64-tdep.c (sh64_extract_return_value)
(sh64_store_return_value): Change type of local 'buf' to gdb_byte.
* solib-darwin.c (darwin_current_sos, darwin_read_exec_load_addr):
* solib-pa64.c (pa64_solib_create_inferior_hook)
(pa64_open_symbol_file_object): Remove local 'buf'.
* solib-som.c (som_solib_create_inferior_hook, link_map_start)
(som_open_symbol_file_object): Likewise.
* solib-spu.c (spu_current_sos): Likewise.
* spu-linux-nat.c (spu_fetch_inferior_registers): Likewise.
* spu-multiarch.c (parse_spufs_run, spu_fetch_registers)
(spu_store_registers): Likewise.
* target.c (debug_print_register): Likewise.
* tic6x-tdep.c (tic6x_get_longjmp_target): Likewise.
* xstormy16-tdep.c (xstormy16_store_return_value)
(xstormy16_push_dummy_call, xstormy16_resolve_jmp_table_entry)
(xstormy16_find_jmp_table_entry): Likewise.
2013-03-01 16:38:27 +01:00
|
|
|
|
gdb_byte buf[image_info_size];
|
2009-02-04 09:47:56 +01:00
|
|
|
|
CORE_ADDR load_addr;
|
|
|
|
|
CORE_ADDR path_addr;
|
2012-02-17 17:37:43 +01:00
|
|
|
|
struct mach_o_header_external hdr;
|
|
|
|
|
unsigned long hdr_val;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
char *file_path;
|
|
|
|
|
int errcode;
|
|
|
|
|
struct darwin_so_list *dnew;
|
2015-02-27 17:33:07 +01:00
|
|
|
|
struct so_list *newobj;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
|
|
|
|
/* Read image info from inferior. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (target_read_memory (iinfo, buf, image_info_size))
|
2009-02-04 09:47:56 +01:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
load_addr = extract_typed_address (buf, ptr_type);
|
|
|
|
|
path_addr = extract_typed_address (buf + ptr_len, ptr_type);
|
|
|
|
|
|
2012-02-17 17:37:43 +01:00
|
|
|
|
/* Read Mach-O header from memory. */
|
-Wpointer-sign: char -> gdb_byte.
-Wpointer-sign catches all these cases across the codebase that should
be using gdb_byte for raw target bytes. I think these are all
obvious, hence I've collapsed into a single patch.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* aarch64-tdep.c (aarch64_default_breakpoint): Change type to
gdb_byte[].
(aarch64_breakpoint_from_pc): Change return type to gdb_byte *.
* ada-lang.c (ada_value_assign): Use gdb_byte.
* alphanbsd-tdep.c (sigtramp_retcode): Change type to gdb_byte[].
(alphanbsd_sigtramp_offset): Use gdb_byte.
* arm-linux-tdep.c (arm_linux_arm_le_breakpoint)
(arm_linux_arm_be_breakpoint, eabi_linux_arm_le_breakpoint)
(eabi_linux_arm_be_breakpoint, arm_linux_thumb_be_breakpoint)
(arm_linux_thumb_le_breakpoint, arm_linux_thumb2_be_breakpoint)
(arm_linux_thumb2_le_breakpoint): Change type to gdb_byte[].
* arm-tdep.c (arm_stub_unwind_sniffer)
(arm_displaced_init_closure): Use gdb_byte.
(arm_default_arm_le_breakpoint, arm_default_arm_be_breakpoint)
(arm_default_thumb_le_breakpoint)
(arm_default_thumb_be_breakpoint): Change type to gdb_byte[].
* arm-tdep.h (struct gdbarch_tdep) <arm_breakpoint,
thumb_breakpoint, thumb2_breakpoint>: Change type to gdb_byte *.
* arm-wince-tdep.c (arm_wince_le_breakpoint)
(arm_wince_thumb_le_breakpoint): Change type to gdb_byte[].
* armnbsd-tdep.c (arm_nbsd_arm_le_breakpoint)
(arm_nbsd_arm_be_breakpoint, arm_nbsd_thumb_le_breakpoint)
(arm_nbsd_thumb_be_breakpoint): Change type to gdb_byte[].
* armobsd-tdep.c (arm_obsd_thumb_le_breakpoint)
(arm_obsd_thumb_be_breakpoint): Change type to gdb_byte[].
* cris-tdep.c (push_stack_item, cris_push_dummy_call)
(cris_store_return_value, cris_extract_return_value): Use
gdb_byte.
(constraint): Change type of parameter to char * from signed
char*. Use gdb_byte.
* dwarf2loc.c (read_pieced_value, write_pieced_value): Change type
of local buffer to gdb_byte *.
* dwarf2read.c (read_index_from_section): Use gdb_byte.
(create_dwp_hash_table): Change type of locals to gdb_byte *.
(add_address_entry): Change type of local buffer to gdb_byte[].
* frv-tdep.c (frv_adjust_breakpoint_address, find_func_descr)
(frv_push_dummy_call): Use gdb_byte.
* hppa-hpux-tdep.c (hppa_hpux_push_dummy_code)
(hppa_hpux_supply_ss_fpblock, hppa_hpux_supply_ss_wide)
(hppa_hpux_supply_save_state): Use gdb_byte.
* hppa-tdep.c (hppa32_push_dummy_call)
(hppa64_convert_code_addr_to_fptr): Use gdb_byte.
* ia64-tdep.c (extract_bit_field, replace_bit_field)
(slotN_contents, replace_slotN_contents): Change type of parameter
to gdb_byte *.
(fetch_instruction, ia64_pseudo_register_write)
(ia64_register_to_value, ia64_value_to_register)
(ia64_extract_return_value, ia64_store_return_value)
(ia64_push_dummy_call): Use gdb_byte.
* m32c-tdep.c (m32c_return_value): Remove cast.
* m68hc11-tdep.c (m68hc11_pseudo_register_write)
(m68hc11_push_dummy_call, m68hc11_store_return_value): Use
gdb_byte.
* mipsnbsd-tdep.c (mipsnbsd_get_longjmp_target): Use gdb_byte.
* mn10300-tdep.c (mn10300_store_return_value)
(mn10300_breakpoint_from_pc, mn10300_push_dummy_call): Use
gdb_byte.
* moxie-tdep.c (moxie_process_readu): Use gdb_byte.
(moxie_process_record): Remove casts.
* ppc-ravenscar-thread.c (supply_register_at_address)
(ppc_ravenscar_generic_store_registers): Use gdb_byte.
* ravenscar-thread.c (get_running_thread_id): Use gdb_byte.
* remote-m32r-sdi.c (m32r_fetch_register): Use gdb_byte.
* remote-mips.c (mips_xfer_memory): Use gdb_byte.
* remote.c (compare_sections_command): Use gdb_byte.
* score-tdep.c (score7_free_memblock): Change type of parameter to
gdb_byte *.
* sh-tdep.c (sh_justify_value_in_reg): Change return type to
gdb_byte *. Use gdb_byte.
(sh_push_dummy_call_fpu): Use gdb_byte.
(sh_extract_return_value_nofpu, sh_extract_return_value_fpu)
(sh_store_return_value_nofpu, sh_store_return_value_fpu)
(sh_register_convert_to_virtual, sh_register_convert_to_raw):
Change parameter type to 'gdb_byte *'. Use gdb_byte.
(sh_pseudo_register_read, sh_pseudo_register_write): Use gdb_byte.
* sh64-tdep.c (sh64_push_dummy_call): Use gdb_byte.
(sh64_store_return_value, sh64_register_convert_to_virtual):
Change parameter type to 'gdb_byte *'. Use gdb_byte.
(sh64_pseudo_register_write): Use gdb_byte.
* solib-darwin.c (darwin_current_sos): Add casts to 'gdb_byte *'.
* solib-irix.c (fetch_lm_info): Likewise. Use gdb_byte for byte
buffer.
(irix_current_sos): Use gdb_byte.
* solib-som.c (som_current_sos): Use gdb_byte.
* sparc-ravenscar-thread.c (supply_register_at_address)
(sparc_ravenscar_generic_store_registers): Use gdb_byte.
* spu-multiarch.c (spu_xfer_partial): Add cast to 'char *'.
* spu-tdep.c (spu_get_overlay_table): Use gdb_byte.
* tic6x-tdep.c (tic6x_breakpoint_from_pc): Change return type to
'gdb_byte *'.
* tic6x-tdep.h (struct gdbarch_tdep) <breakpoint>: Change type to
'gdb_byte *'.
* tracepoint.c (tfile_fetch_registers): Use gdb_byte.
* xstormy16-tdep.c (xstormy16_extract_return_value)
(xstormy16_store_return_value): Change parameter type to
'gdb_byte *'. Adjust.
(xstormy16_push_dummy_call): Use gdb_byte.
* xtensa-tdep.c (xtensa_scan_prologue, call0_ret)
(call0_analyze_prologue, execute_code): Use gdb_byte.
2013-04-19 17:09:46 +02:00
|
|
|
|
if (target_read_memory (load_addr, (gdb_byte *) &hdr, sizeof (hdr) - 4))
|
2012-02-17 17:37:43 +01:00
|
|
|
|
break;
|
|
|
|
|
/* Discard wrong magic numbers. Shouldn't happen. */
|
|
|
|
|
hdr_val = extract_unsigned_integer
|
|
|
|
|
(hdr.magic, sizeof (hdr.magic), byte_order);
|
|
|
|
|
if (hdr_val != BFD_MACH_O_MH_MAGIC && hdr_val != BFD_MACH_O_MH_MAGIC_64)
|
|
|
|
|
continue;
|
|
|
|
|
/* Discard executable. Should happen only once. */
|
|
|
|
|
hdr_val = extract_unsigned_integer
|
|
|
|
|
(hdr.filetype, sizeof (hdr.filetype), byte_order);
|
|
|
|
|
if (hdr_val == BFD_MACH_O_MH_EXECUTE)
|
|
|
|
|
continue;
|
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
target_read_string (path_addr, &file_path,
|
|
|
|
|
SO_NAME_MAX_PATH_SIZE - 1, &errcode);
|
|
|
|
|
if (errcode)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Create and fill the new so_list element. */
|
2013-12-28 23:31:01 +01:00
|
|
|
|
dnew = XCNEW (struct darwin_so_list);
|
2015-02-27 17:33:07 +01:00
|
|
|
|
newobj = &dnew->sl;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
old_chain = make_cleanup (xfree, dnew);
|
|
|
|
|
|
2015-02-27 17:33:07 +01:00
|
|
|
|
newobj->lm_info = &dnew->li;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2015-02-27 17:33:07 +01:00
|
|
|
|
strncpy (newobj->so_name, file_path, SO_NAME_MAX_PATH_SIZE - 1);
|
|
|
|
|
newobj->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0';
|
|
|
|
|
strcpy (newobj->so_original_name, newobj->so_name);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
xfree (file_path);
|
2015-02-27 17:33:07 +01:00
|
|
|
|
newobj->lm_info->lm_addr = load_addr;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
if (head == NULL)
|
2015-02-27 17:33:07 +01:00
|
|
|
|
head = newobj;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
else
|
2015-02-27 17:33:07 +01:00
|
|
|
|
tail->next = newobj;
|
|
|
|
|
tail = newobj;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
discard_cleanups (old_chain);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return head;
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-23 11:45:05 +01:00
|
|
|
|
/* Check LOAD_ADDR points to a Mach-O executable header. Return LOAD_ADDR
|
|
|
|
|
in case of success, 0 in case of failure. */
|
2012-12-18 07:19:54 +01:00
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
2015-11-23 11:45:05 +01:00
|
|
|
|
darwin_validate_exec_header (CORE_ADDR load_addr)
|
|
|
|
|
{
|
|
|
|
|
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
|
|
|
|
struct mach_o_header_external hdr;
|
|
|
|
|
unsigned long hdr_val;
|
|
|
|
|
|
|
|
|
|
/* Read Mach-O header from memory. */
|
|
|
|
|
if (target_read_memory (load_addr, (gdb_byte *) &hdr, sizeof (hdr) - 4))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Discard wrong magic numbers. Shouldn't happen. */
|
|
|
|
|
hdr_val = extract_unsigned_integer
|
|
|
|
|
(hdr.magic, sizeof (hdr.magic), byte_order);
|
|
|
|
|
if (hdr_val != BFD_MACH_O_MH_MAGIC && hdr_val != BFD_MACH_O_MH_MAGIC_64)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Check executable. */
|
|
|
|
|
hdr_val = extract_unsigned_integer
|
|
|
|
|
(hdr.filetype, sizeof (hdr.filetype), byte_order);
|
|
|
|
|
if (hdr_val == BFD_MACH_O_MH_EXECUTE)
|
|
|
|
|
return load_addr;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get the load address of the executable using dyld list of images.
|
|
|
|
|
We assume that the dyld info are correct (which is wrong if the target
|
|
|
|
|
is stopped at the first instruction). */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
darwin_read_exec_load_addr_from_dyld (struct darwin_info *info)
|
2012-12-18 07:19:54 +01:00
|
|
|
|
{
|
|
|
|
|
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
|
|
|
|
|
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
|
|
|
|
int ptr_len = TYPE_LENGTH (ptr_type);
|
|
|
|
|
unsigned int image_info_size = ptr_len * 3;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Read infos for each solib. One of them should be the executable. */
|
|
|
|
|
for (i = 0; i < info->all_image.count; i++)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR iinfo = info->all_image.info + i * image_info_size;
|
Use gdb_byte for bytes from the program being debugged.
gdb_byte should be used for bytes from the program being debugged. We
have many places using char or unsigned char instead all over the
existing ports, and more ends up added over time due to copy/paste as
new code is based on old code.
I've greped the tree for "char buf[", and fixed all I found.
Tested by building with --enable-targets=all.
2013-03-01 Pedro Alves <palves@redhat.com>
Use gdb_byte for bytes from the program being debugged.
* arm-tdep.c (arm_store_return_value, arm_get_longjmp_target):
Change type of local 'buf' to gdb_byte.
* avr-tdep.c (avr_frame_prev_register, avr_push_dummy_call): Likewise.
* bfin-tdep.c (bfin_push_dummy_call): Likewise.
* cris-tdep.c (cris_sigcontext_addr)
(cris_sigtramp_frame_unwind_cache): Likewise.
* frv-linux-tdep.c (frv_linux_pc_in_sigtramp)
(frv_linux_sigcontext_reg_addr, frv_linux_sigtramp_frame_cache):
Likewise.
* frv-tdep.c (frv_pseudo_register_write, frv_analyze_prologue): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_find_global_pointer)
(hppa32_hpux_search_dummy_call_sequence)
(hppa_hpux_supply_save_state): Likewise.
* hppa-linux-tdep.c (insns_match_pattern)
(hppa_linux_find_global_pointer): Likewise.
* hppa-tdep.c (hppa_in_function_epilogue_p)
(skip_prologue_hard_way, hppa_frame_cache): Likewise.
* i386-nto-tdep.c (i386nto_sigcontext_addr): Likewise.
* i386fbsd-tdep.c (i386fbsd_supply_uthread)
(i386fbsd_collect_uthread): Likewise.
* ia64-hpux-tdep.c (ia64_hpux_push_dummy_code): Likewise.
* ia64-linux-tdep.c (ia64_linux_sigcontext_register_address): Likewise.
* ia64-tdep.c (examine_prologue, ia64_frame_cache)
(ia64_frame_prev_register, ia64_sigtramp_frame_cache)
(ia64_sigtramp_frame_prev_register, ia64_access_reg)
(ia64_access_rse_reg, ia64_libunwind_frame_this_id)
(ia64_libunwind_frame_prev_register)
(ia64_libunwind_sigtramp_frame_this_id)
(ia64_find_global_pointer_from_dynamic_section)
(find_extant_func_descr, find_func_descr, ia64_dummy_id)
(ia64_unwind_pc): Likewise.
* iq2000-tdep.c (iq2000_store_return_value): Likewise.
* m68hc11-tdep.c (m68hc11_push_dummy_call)
(m68hc11_extract_return_value): Likewise.
* m68klinux-nat.c (fetch_register, store_register): Likewise.
* mep-tdep.c (mep_pseudo_cr32_read, mep_pseudo_cr32_write)
(mep_get_insn, mep_push_dummy_call): Likewise.
* mips-linux-tdep.c (mips_linux_get_longjmp_target)
(mips_linux_in_dynsym_stub): Likewise.
* mn10300-tdep.c (mep_pseudo_cr32_write): Likewise.
* ppc-linux-nat.c (fetch_register, store_register): Likewise.
* regcache.c (dump_endian_bytes): Change type of parameter 'buf'
to gdb_byte.
* remote-mips.c (mips_set_register): Likewise.
* remote-sim.c (gdbsim_fetch_register): Likewise.
* score-tdep.c (score7_fetch_inst): Change type of parameter
'memblock' and local 'buf' to gdb_byte.
(score7_malloc_and_get_memblock): Change return type to gdb_byte.
Change type of local 'buf' to gdb_byte. Adjust.
(score7_adjust_memblock_ptr): Change type of parameter 'memblock'
to gdb_byte**.
(score7_analyze_prologue): Change type of 'memblock' and
'memblock_ptr' locals to gdb_byte*.
* sh64-tdep.c (sh64_extract_return_value)
(sh64_store_return_value): Change type of local 'buf' to gdb_byte.
* solib-darwin.c (darwin_current_sos, darwin_read_exec_load_addr):
* solib-pa64.c (pa64_solib_create_inferior_hook)
(pa64_open_symbol_file_object): Remove local 'buf'.
* solib-som.c (som_solib_create_inferior_hook, link_map_start)
(som_open_symbol_file_object): Likewise.
* solib-spu.c (spu_current_sos): Likewise.
* spu-linux-nat.c (spu_fetch_inferior_registers): Likewise.
* spu-multiarch.c (parse_spufs_run, spu_fetch_registers)
(spu_store_registers): Likewise.
* target.c (debug_print_register): Likewise.
* tic6x-tdep.c (tic6x_get_longjmp_target): Likewise.
* xstormy16-tdep.c (xstormy16_store_return_value)
(xstormy16_push_dummy_call, xstormy16_resolve_jmp_table_entry)
(xstormy16_find_jmp_table_entry): Likewise.
2013-03-01 16:38:27 +01:00
|
|
|
|
gdb_byte buf[image_info_size];
|
2012-12-18 07:19:54 +01:00
|
|
|
|
CORE_ADDR load_addr;
|
|
|
|
|
|
|
|
|
|
/* Read image info from inferior. */
|
|
|
|
|
if (target_read_memory (iinfo, buf, image_info_size))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
load_addr = extract_typed_address (buf, ptr_type);
|
2015-11-23 11:45:05 +01:00
|
|
|
|
if (darwin_validate_exec_header (load_addr) == load_addr)
|
2012-12-18 07:19:54 +01:00
|
|
|
|
return load_addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-23 11:45:05 +01:00
|
|
|
|
/* Get the load address of the executable when the PC is at the dyld
|
|
|
|
|
entry point using parameter passed by the kernel (at SP). */
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
|
darwin_read_exec_load_addr_at_init (struct darwin_info *info)
|
|
|
|
|
{
|
|
|
|
|
struct gdbarch *gdbarch = target_gdbarch ();
|
|
|
|
|
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
|
|
|
|
|
int addr_size = gdbarch_addr_bit (gdbarch) / 8;
|
|
|
|
|
ULONGEST load_ptr_addr;
|
|
|
|
|
ULONGEST load_addr;
|
|
|
|
|
gdb_byte buf[8];
|
|
|
|
|
|
|
|
|
|
/* Get SP. */
|
|
|
|
|
if (regcache_cooked_read_unsigned (get_current_regcache (),
|
|
|
|
|
gdbarch_sp_regnum (gdbarch),
|
|
|
|
|
&load_ptr_addr) != REG_VALID)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Read value at SP (image load address). */
|
|
|
|
|
if (target_read_memory (load_ptr_addr, buf, addr_size))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
load_addr = extract_unsigned_integer (buf, addr_size, byte_order);
|
|
|
|
|
|
|
|
|
|
return darwin_validate_exec_header (load_addr);
|
|
|
|
|
}
|
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
/* Return 1 if PC lies in the dynamic symbol resolution code of the
|
|
|
|
|
run time loader. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2012-03-02 01:06:13 +01:00
|
|
|
|
static int
|
2009-02-04 09:47:56 +01:00
|
|
|
|
darwin_in_dynsym_resolve_code (CORE_ADDR pc)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* No special symbol handling. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static void
|
|
|
|
|
darwin_special_symbol_handling (void)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-28 19:48:38 +01:00
|
|
|
|
/* A wrapper for bfd_mach_o_fat_extract that handles reference
|
|
|
|
|
counting properly. This will either return NULL, or return a new
|
|
|
|
|
reference to a BFD. */
|
|
|
|
|
|
|
|
|
|
static bfd *
|
|
|
|
|
gdb_bfd_mach_o_fat_extract (bfd *abfd, bfd_format format,
|
|
|
|
|
const bfd_arch_info_type *arch)
|
|
|
|
|
{
|
|
|
|
|
bfd *result = bfd_mach_o_fat_extract (abfd, format, arch);
|
|
|
|
|
|
|
|
|
|
if (result == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (result == abfd)
|
|
|
|
|
gdb_bfd_ref (result);
|
|
|
|
|
else
|
|
|
|
|
gdb_bfd_mark_parent (result, abfd);
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-27 17:30:18 +02:00
|
|
|
|
/* Extract dyld_all_image_addr when the process was just created, assuming the
|
|
|
|
|
current PC is at the entry of the dynamic linker. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static void
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_solib_get_all_image_info_addr_at_init (struct darwin_info *info)
|
2009-02-04 09:47:56 +01:00
|
|
|
|
{
|
2013-04-19 17:10:53 +02:00
|
|
|
|
char *interp_name;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
CORE_ADDR load_addr = 0;
|
|
|
|
|
bfd *dyld_bfd = NULL;
|
2012-07-18 21:38:39 +02:00
|
|
|
|
struct cleanup *cleanup;
|
2011-09-27 17:30:18 +02:00
|
|
|
|
|
|
|
|
|
/* This method doesn't work with an attached process. */
|
|
|
|
|
if (current_inferior ()->attach_flag)
|
|
|
|
|
return;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
/* Find the program interpreter. */
|
|
|
|
|
interp_name = find_program_interpreter ();
|
|
|
|
|
if (!interp_name)
|
|
|
|
|
return;
|
|
|
|
|
|
2012-07-18 21:38:39 +02:00
|
|
|
|
cleanup = make_cleanup (null_cleanup, NULL);
|
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
/* Create a bfd for the interpreter. */
|
2012-08-22 18:24:39 +02:00
|
|
|
|
dyld_bfd = gdb_bfd_open (interp_name, gnutarget, -1);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
if (dyld_bfd)
|
|
|
|
|
{
|
|
|
|
|
bfd *sub;
|
2010-05-17 01:49:58 +02:00
|
|
|
|
|
2012-07-18 21:42:26 +02:00
|
|
|
|
make_cleanup_bfd_unref (dyld_bfd);
|
2015-11-23 11:45:05 +01:00
|
|
|
|
sub = gdb_bfd_mach_o_fat_extract
|
|
|
|
|
(dyld_bfd, bfd_object, gdbarch_bfd_arch_info (target_gdbarch ()));
|
2009-02-04 09:47:56 +01:00
|
|
|
|
if (sub)
|
|
|
|
|
{
|
2012-07-23 16:56:11 +02:00
|
|
|
|
dyld_bfd = sub;
|
2012-07-18 21:42:26 +02:00
|
|
|
|
make_cleanup_bfd_unref (sub);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
2012-07-18 21:38:39 +02:00
|
|
|
|
else
|
|
|
|
|
dyld_bfd = NULL;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
|
|
|
|
if (!dyld_bfd)
|
2012-07-18 21:38:39 +02:00
|
|
|
|
{
|
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2009-10-14 15:15:34 +02:00
|
|
|
|
|
2011-09-27 17:30:18 +02:00
|
|
|
|
/* We find the dynamic linker's base address by examining
|
|
|
|
|
the current pc (which should point at the entry point for the
|
|
|
|
|
dynamic linker) and subtracting the offset of the entry point. */
|
|
|
|
|
load_addr = (regcache_read_pc (get_current_regcache ())
|
|
|
|
|
- bfd_get_start_address (dyld_bfd));
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
|
|
|
|
/* Now try to set a breakpoint in the dynamic linker. */
|
2012-05-29 14:59:53 +02:00
|
|
|
|
info->all_image_addr =
|
2009-02-04 09:47:56 +01:00
|
|
|
|
lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
|
2009-10-14 15:15:34 +02:00
|
|
|
|
|
2012-07-18 21:38:39 +02:00
|
|
|
|
do_cleanups (cleanup);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (info->all_image_addr == 0)
|
2009-02-04 09:47:56 +01:00
|
|
|
|
return;
|
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
info->all_image_addr += load_addr;
|
2011-09-27 17:30:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
2015-11-23 11:45:05 +01:00
|
|
|
|
/* Extract dyld_all_image_addr reading it from
|
2011-09-27 17:30:18 +02:00
|
|
|
|
TARGET_OBJECT_DARWIN_DYLD_INFO. */
|
|
|
|
|
|
|
|
|
|
static void
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_solib_read_all_image_info_addr (struct darwin_info *info)
|
2011-09-27 17:30:18 +02:00
|
|
|
|
{
|
2015-11-23 11:45:05 +01:00
|
|
|
|
gdb_byte buf[8];
|
2011-09-27 17:30:18 +02:00
|
|
|
|
LONGEST len;
|
* gdbarch.sh (target_gdbarch): Remove macro.
(get_target_gdbarch): Rename to target_gdbarch.
* gdbarch.c, gdbarch.h: Rebuild.
* ada-tasks.c, aix-thread.c, amd64-linux-nat.c, arch-utils.c,
arm-tdep.c, auxv.c, breakpoint.c, bsd-uthread.c, corefile.c,
darwin-nat-info.c, dcache.c, dsrec.c, exec.c, fbsd-nat.c,
filesystem.c, gcore.c, gnu-nat.c, i386-darwin-nat.c, i386-nat.c,
ia64-vms-tdep.c, inf-ptrace.c, infcmd.c, jit.c, linux-nat.c,
linux-tdep.c, linux-thread-db.c, m32r-rom.c, memattr.c,
mep-tdep.c, microblaze-tdep.c, mips-linux-nat.c,
mips-linux-tdep.c, mips-tdep.c, monitor.c, moxie-tdep.c,
nto-procfs.c, nto-tdep.c, ppc-linux-nat.c, proc-service.c,
procfs.c, progspace.c, ravenscar-thread.c, record.c,
remote-m32r-sdi.c, remote-mips.c, remote-sim.c, remote.c,
rl78-tdep.c, rs6000-nat.c, rx-tdep.c, s390-nat.c, sol-thread.c,
solib-darwin.c, solib-dsbt.c, solib-frv.c, solib-ia64-hpux.c,
solib-irix.c, solib-pa64.c, solib-som.c, solib-spu.c,
solib-sunos.c, solib-svr4.c, solib.c, spu-linux-nat.c,
spu-multiarch.c, spu-tdep.c, symfile-mem.c, symfile.c, symtab.c,
target-descriptions.c, target.c, target.h, tracepoint.c,
windows-nat.c, windows-tdep.c, xcoffsolib.c, cli/cli-dump.c,
common/agent.c, mi/mi-interp.c, python/py-finishbreakpoint.c,
python/py-inferior.c, python/python.c: Update.
2012-11-09 20:58:03 +01:00
|
|
|
|
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
2015-11-23 11:45:05 +01:00
|
|
|
|
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
|
|
|
|
|
|
|
|
|
|
/* Sanity check. */
|
2015-12-11 18:06:35 +01:00
|
|
|
|
if (TYPE_LENGTH (ptr_type) > sizeof (buf))
|
2015-11-23 11:45:05 +01:00
|
|
|
|
return;
|
2011-09-27 17:30:18 +02:00
|
|
|
|
|
|
|
|
|
len = target_read (¤t_target, TARGET_OBJECT_DARWIN_DYLD_INFO, NULL,
|
2015-12-11 18:06:35 +01:00
|
|
|
|
buf, 0, TYPE_LENGTH (ptr_type));
|
2015-11-23 11:45:05 +01:00
|
|
|
|
if (len <= 0)
|
2011-09-27 17:30:18 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2015-11-23 11:45:05 +01:00
|
|
|
|
/* The use of BIG endian is intended, as BUF is a raw stream of bytes. This
|
|
|
|
|
makes the support of remote protocol easier. */
|
|
|
|
|
info->all_image_addr = extract_unsigned_integer (buf, len, BFD_ENDIAN_BIG);
|
2011-09-27 17:30:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Shared library startup support. See documentation in solib-svr4.c. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
darwin_solib_create_inferior_hook (int from_tty)
|
|
|
|
|
{
|
2012-05-29 14:59:53 +02:00
|
|
|
|
struct darwin_info *info = get_darwin_info ();
|
2012-12-18 07:19:54 +01:00
|
|
|
|
CORE_ADDR load_addr;
|
2012-05-29 14:59:53 +02:00
|
|
|
|
|
|
|
|
|
info->all_image_addr = 0;
|
2011-09-27 17:30:18 +02:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_solib_read_all_image_info_addr (info);
|
2011-09-27 17:30:18 +02:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (info->all_image_addr == 0)
|
|
|
|
|
darwin_solib_get_all_image_info_addr_at_init (info);
|
2011-09-27 17:30:18 +02:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
if (info->all_image_addr == 0)
|
2011-09-27 17:30:18 +02:00
|
|
|
|
return;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2012-05-29 14:59:53 +02:00
|
|
|
|
darwin_load_image_infos (info);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
|
2012-12-18 07:19:54 +01:00
|
|
|
|
if (!darwin_dyld_version_ok (info))
|
2014-03-17 14:01:02 +01:00
|
|
|
|
{
|
|
|
|
|
warning (_("unhandled dyld version (%d)"), info->all_image.version);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2012-12-18 07:19:54 +01:00
|
|
|
|
|
2015-11-23 11:45:05 +01:00
|
|
|
|
/* Add the breakpoint which is hit by dyld when the list of solib is
|
|
|
|
|
modified. */
|
2012-12-18 07:19:54 +01:00
|
|
|
|
create_solib_event_breakpoint (target_gdbarch (), info->all_image.notifier);
|
|
|
|
|
|
2015-11-23 11:45:05 +01:00
|
|
|
|
if (info->all_image.count != 0)
|
|
|
|
|
{
|
|
|
|
|
/* Possible relocate the main executable (PIE). */
|
|
|
|
|
load_addr = darwin_read_exec_load_addr_from_dyld (info);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Possible issue:
|
|
|
|
|
Do not break on the notifier if dyld is not initialized (deduced from
|
|
|
|
|
count == 0). In that case, dyld hasn't relocated itself and the
|
|
|
|
|
notifier may point to a wrong address. */
|
|
|
|
|
|
|
|
|
|
load_addr = darwin_read_exec_load_addr_at_init (info);
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-18 07:19:54 +01:00
|
|
|
|
if (load_addr != 0 && symfile_objfile != NULL)
|
|
|
|
|
{
|
2014-04-18 11:03:46 +02:00
|
|
|
|
CORE_ADDR vmaddr;
|
2012-12-18 07:19:54 +01:00
|
|
|
|
|
|
|
|
|
/* Find the base address of the executable. */
|
2014-04-18 11:03:46 +02:00
|
|
|
|
vmaddr = bfd_mach_o_get_base_address (exec_bfd);
|
2012-12-18 07:19:54 +01:00
|
|
|
|
|
|
|
|
|
/* Relocate. */
|
|
|
|
|
if (vmaddr != load_addr)
|
|
|
|
|
objfile_rebase (symfile_objfile, load_addr - vmaddr);
|
|
|
|
|
}
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
darwin_clear_solib (void)
|
|
|
|
|
{
|
2012-05-29 14:59:53 +02:00
|
|
|
|
struct darwin_info *info = get_darwin_info ();
|
|
|
|
|
|
|
|
|
|
info->all_image_addr = 0;
|
|
|
|
|
info->all_image.version = 0;
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
darwin_free_so (struct so_list *so)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The section table is built from bfd sections using bfd VMAs.
|
|
|
|
|
Relocate these VMAs according to solib info. */
|
2009-10-13 12:31:40 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
static void
|
|
|
|
|
darwin_relocate_section_addresses (struct so_list *so,
|
2009-05-23 01:49:14 +02:00
|
|
|
|
struct target_section *sec)
|
2009-02-04 09:47:56 +01:00
|
|
|
|
{
|
|
|
|
|
sec->addr += so->lm_info->lm_addr;
|
|
|
|
|
sec->endaddr += so->lm_info->lm_addr;
|
|
|
|
|
|
|
|
|
|
/* Best effort to set addr_high/addr_low. This is used only by
|
|
|
|
|
'info sharedlibary'. */
|
|
|
|
|
if (so->addr_high == 0)
|
|
|
|
|
{
|
|
|
|
|
so->addr_low = sec->addr;
|
|
|
|
|
so->addr_high = sec->endaddr;
|
|
|
|
|
}
|
|
|
|
|
if (sec->endaddr > so->addr_high)
|
|
|
|
|
so->addr_high = sec->endaddr;
|
|
|
|
|
if (sec->addr < so->addr_low)
|
|
|
|
|
so->addr_low = sec->addr;
|
|
|
|
|
}
|
|
|
|
|
|
Replace the block_found global with explicit data-flow
As Pedro suggested on gdb-patches@ (see
https://sourceware.org/ml/gdb-patches/2015-05/msg00714.html), this
change makes symbol lookup functions return a structure that includes
both the symbol found and the block in which it was found. This makes
it possible to get rid of the block_found global variable and thus makes
block hunting explicit.
gdb/
* ada-exp.y (write_object_renaming): Replace struct
ada_symbol_info with struct block_symbol. Update field
references accordingly.
(block_lookup, select_possible_type_sym): Likewise.
(find_primitive_type): Likewise. Also update call to
ada_lookup_symbol to extract the symbol itself.
(write_var_or_type, write_name_assoc): Likewise.
* ada-lang.h (struct ada_symbol_info): Remove.
(ada_lookup_symbol_list): Replace struct ada_symbol_info with
struct block_symbol.
(ada_lookup_encoded_symbol, user_select_syms): Likewise.
(ada_lookup_symbol): Return struct block_symbol instead of a
mere symbol.
* ada-lang.c (defns_collected): Replace struct ada_symbol_info
with struct block_symbol.
(resolve_subexp, ada_resolve_function, sort_choices,
user_select_syms, is_nonfunction, add_defn_to_vec,
num_defns_collected, defns_collected,
symbols_are_identical_enums, remove_extra_symbols,
remove_irrelevant_renamings, add_lookup_symbol_list_worker,
ada_lookup_symbol_list, ada_iterate_over_symbols,
ada_lookup_encoded_symbol, get_var_value): Likewise.
(ada_lookup_symbol): Return a block_symbol instead of a mere
symbol. Replace struct ada_symbol_info with struct
block_symbol.
(ada_lookup_symbol_nonlocal): Likewise.
(standard_lookup): Make block passing explicit through
lookup_symbol_in_language.
* ada-tasks.c (get_tcb_types_info): Update the calls to
lookup_symbol_in_language to extract the mere symbol out of the
returned value.
(ada_tasks_inferior_data_sniffer): Likewise.
* ax-gdb.c (gen_static_field): Likewise for the call to
lookup_symbol.
(gen_maybe_namespace_elt): Deal with struct symbol_in_block from
lookup functions.
(gen_expr): Likewise.
* c-exp.y: Likewise. Remove uses of block_found.
(lex_one_token, classify_inner_name, c_print_token): Likewise.
(classify_name): Likewise. Rename the "sym" local variable to
"bsym".
* c-valprint.c (print_unpacked_pointer): Likewise.
* compile/compile-c-symbols.c (convert_symbol_sym): Promote the
"sym" parameter from struct symbol * to struct block_symbol.
Use it to remove uses of block_found. Deal with struct
symbol_in_block from lookup functions.
(gcc_convert_symbol): Likewise. Update the call to
convert_symbol_sym.
* compile/compile-object-load.c (compile_object_load): Deal with
struct symbol_in_block from lookup functions.
* cp-namespace.c (cp_lookup_nested_symbol_1,
cp_lookup_nested_symbol, cp_lookup_bare_symbol,
cp_search_static_and_baseclasses,
cp_lookup_symbol_in_namespace, cp_lookup_symbol_via_imports,
cp_lookup_symbol_imports_or_template,
cp_lookup_symbol_via_all_imports, cp_lookup_symbol_namespace,
lookup_namespace_scope, cp_lookup_nonlocal,
find_symbol_in_baseclass): Return struct symbol_in_block instead
of mere symbols and deal with struct symbol_in_block from lookup
functions.
* cp-support.c (inspect_type, replace_typedefs,
cp_lookup_rtti_type): Deal with struct symbol_in_block from
lookup functions.
* cp-support.h (cp_lookup_symbol_nonlocal,
cp_lookup_symbol_from_namespace,
cp_lookup_symbol_imports_or_template, cp_lookup_nested_symbol):
Return struct symbol_in_block instead of mere symbols.
* d-exp.y (d_type_from_name, d_module_from_name, push_variable,
push_module_name):
Deal with struct symbol_in_block from lookup functions. Remove
uses of block_found.
* eval.c (evaluate_subexp_standard): Update call to
cp_lookup_symbol_namespace.
* f-exp.y: Deal with struct symbol_in_block from lookup
functions. Remove uses of block_found.
(yylex): Likewise.
* gdbtypes.c (lookup_typename, lookup_struct, lookup_union,
lookup_enum, lookup_template_type, check_typedef): Deal with
struct symbol_in_block from lookup functions.
* guile/scm-frame.c (gdbscm_frame_read_var): Likewise.
* guile/scm-symbol.c (gdbscm_lookup_symbol): Likewise.
(gdbscm_lookup_global_symbol): Likewise.
* gnu-v3-abi.c (gnuv3_get_typeid_type): Likewise.
* go-exp.y: Likewise. Remove uses of block_found.
(package_name_p, classify_packaged_name, classify_name):
Likewise.
* infrun.c (insert_exception_resume_breakpoint): Likewise.
* jv-exp.y (push_variable): Likewise.
* jv-lang.c (java_lookup_class, get_java_object_type): Likewise.
* language.c (language_bool_type): Likewise.
* language.h (struct language_defn): Update
la_lookup_symbol_nonlocal to return a struct symbol_in_block
rather than a mere symbol.
* linespec.c (find_label_symbols): Deal with struct
symbol_in_block from lookup functions.
* m2-exp.y: Likewise. Remove uses of block_found.
(yylex): Likewise.
* mi/mi-cmd-stack.c (list_args_or_locals): Likewise.
* objc-lang.c (lookup_struct_typedef, find_imps): Likewise.
* p-exp.y: Likewise. Remove uses of block_found.
(yylex): Likewise.
* p-valprint.c (pascal_val_print): Likewise.
* parse.c (write_dollar_variable): Likewise. Remove uses of
block_found.
* parser-defs.h (struct symtoken): Turn the SYM field into a
struct symbol_in_block.
* printcmd.c (address_info): Deal with struct symbol_in_block
from lookup functions.
* python/py-frame.c (frapy_read_var): Likewise.
* python/py-symbol.c (gdbpy_lookup_symbol,
gdbpy_lookup_global_symbol): Likewise.
* skip.c (skip_function_command): Likewise.
* solib-darwin.c (darwin_lookup_lib_symbol): Return a struct
symbol_in_block instead of a mere symbol.
* solib-spu.c (spu_lookup_lib_symbol): Likewise.
* solib-svr4.c (elf_lookup_lib_symbol): Likewise.
* solib.c (solib_global_lookup): Likewise.
* solist.h (solib_global_lookup): Likewise.
(struct target_so_ops): Update lookup_lib_global_symbol to
return a struct symbol_in_block rather than a mere symbol.
* source.c (select_source_symtab): Deal with struct
symbol_in_block from lookup functions.
* stack.c (print_frame_args, iterate_over_block_arg_vars):
Likewise.
* symfile.c (set_initial_language): Likewise.
* symtab.c (SYMBOL_LOOKUP_FAILED): Turn into a struct
symbol_in_block.
(SYMBOL_LOOKUP_FAILED_P): New predicate as a macro.
(struct symbol_cache_slot): Turn the FOUND field into a struct
symbol_in_block.
(block_found): Remove.
(eq_symbol_entry): Update to deal with struct symbol_in_block in
cache slots.
(symbol_cache_lookup): Return a struct symbol_in_block rather
than a mere symbol.
(symbol_cache_mark_found): Add a BLOCK parameter to fill
appropriately the cache slots. Update callers.
(symbol_cache_dump): Update cache slots handling to the type
change.
(lookup_symbol_in_language, lookup_symbol, lookup_language_this,
lookup_symbol_aux, lookup_local_symbol,
lookup_symbol_in_objfile, lookup_global_symbol_from_objfile,
lookup_symbol_in_objfile_symtabs,
lookup_symbol_in_objfile_from_linkage_name,
lookup_symbol_via_quick_fns, basic_lookup_symbol_nonlocal,
lookup_symbol_in_static_block, lookup_static_symbol,
lookup_global_symbol):
Return a struct symbol_in_block rather than a mere symbol. Deal
with struct symbol_in_block from other lookup functions. Remove
uses of block_found.
(lookup_symbol_in_block): Remove uses of block_found.
(struct global_sym_lookup_data): Turn the RESULT field into a
struct symbol_in_block.
(lookup_symbol_global_iterator_cb): Update references to the
RESULT field.
(search_symbols): Deal with struct symbol_in_block from lookup
functions.
* symtab.h (struct symbol_in_block): New structure.
(block_found): Remove.
(lookup_symbol_in_language, lookup_symbol,
basic_lookup_symbol_nonlocal, lookup_symbol_in_static_block,
looku_static_symbol, lookup_global_symbol,
lookup_symbol_in_block, lookup_language_this,
lookup_global_symbol_from_objfile): Return a struct
symbol_in_block rather than just a mere symbol. Update comments
to remove mentions of block_found.
* valops.c (find_function_in_inferior,
value_struct_elt_for_reference, value_maybe_namespace_elt,
value_of_this): Deal with struct symbol_in_block from lookup
functions.
* value.c (value_static_field, value_fn_field): Likewise.
2015-07-21 17:02:15 +02:00
|
|
|
|
static struct block_symbol
|
2014-12-05 19:11:53 +01:00
|
|
|
|
darwin_lookup_lib_symbol (struct objfile *objfile,
|
2009-02-04 09:47:56 +01:00
|
|
|
|
const char *name,
|
|
|
|
|
const domain_enum domain)
|
|
|
|
|
{
|
Replace the block_found global with explicit data-flow
As Pedro suggested on gdb-patches@ (see
https://sourceware.org/ml/gdb-patches/2015-05/msg00714.html), this
change makes symbol lookup functions return a structure that includes
both the symbol found and the block in which it was found. This makes
it possible to get rid of the block_found global variable and thus makes
block hunting explicit.
gdb/
* ada-exp.y (write_object_renaming): Replace struct
ada_symbol_info with struct block_symbol. Update field
references accordingly.
(block_lookup, select_possible_type_sym): Likewise.
(find_primitive_type): Likewise. Also update call to
ada_lookup_symbol to extract the symbol itself.
(write_var_or_type, write_name_assoc): Likewise.
* ada-lang.h (struct ada_symbol_info): Remove.
(ada_lookup_symbol_list): Replace struct ada_symbol_info with
struct block_symbol.
(ada_lookup_encoded_symbol, user_select_syms): Likewise.
(ada_lookup_symbol): Return struct block_symbol instead of a
mere symbol.
* ada-lang.c (defns_collected): Replace struct ada_symbol_info
with struct block_symbol.
(resolve_subexp, ada_resolve_function, sort_choices,
user_select_syms, is_nonfunction, add_defn_to_vec,
num_defns_collected, defns_collected,
symbols_are_identical_enums, remove_extra_symbols,
remove_irrelevant_renamings, add_lookup_symbol_list_worker,
ada_lookup_symbol_list, ada_iterate_over_symbols,
ada_lookup_encoded_symbol, get_var_value): Likewise.
(ada_lookup_symbol): Return a block_symbol instead of a mere
symbol. Replace struct ada_symbol_info with struct
block_symbol.
(ada_lookup_symbol_nonlocal): Likewise.
(standard_lookup): Make block passing explicit through
lookup_symbol_in_language.
* ada-tasks.c (get_tcb_types_info): Update the calls to
lookup_symbol_in_language to extract the mere symbol out of the
returned value.
(ada_tasks_inferior_data_sniffer): Likewise.
* ax-gdb.c (gen_static_field): Likewise for the call to
lookup_symbol.
(gen_maybe_namespace_elt): Deal with struct symbol_in_block from
lookup functions.
(gen_expr): Likewise.
* c-exp.y: Likewise. Remove uses of block_found.
(lex_one_token, classify_inner_name, c_print_token): Likewise.
(classify_name): Likewise. Rename the "sym" local variable to
"bsym".
* c-valprint.c (print_unpacked_pointer): Likewise.
* compile/compile-c-symbols.c (convert_symbol_sym): Promote the
"sym" parameter from struct symbol * to struct block_symbol.
Use it to remove uses of block_found. Deal with struct
symbol_in_block from lookup functions.
(gcc_convert_symbol): Likewise. Update the call to
convert_symbol_sym.
* compile/compile-object-load.c (compile_object_load): Deal with
struct symbol_in_block from lookup functions.
* cp-namespace.c (cp_lookup_nested_symbol_1,
cp_lookup_nested_symbol, cp_lookup_bare_symbol,
cp_search_static_and_baseclasses,
cp_lookup_symbol_in_namespace, cp_lookup_symbol_via_imports,
cp_lookup_symbol_imports_or_template,
cp_lookup_symbol_via_all_imports, cp_lookup_symbol_namespace,
lookup_namespace_scope, cp_lookup_nonlocal,
find_symbol_in_baseclass): Return struct symbol_in_block instead
of mere symbols and deal with struct symbol_in_block from lookup
functions.
* cp-support.c (inspect_type, replace_typedefs,
cp_lookup_rtti_type): Deal with struct symbol_in_block from
lookup functions.
* cp-support.h (cp_lookup_symbol_nonlocal,
cp_lookup_symbol_from_namespace,
cp_lookup_symbol_imports_or_template, cp_lookup_nested_symbol):
Return struct symbol_in_block instead of mere symbols.
* d-exp.y (d_type_from_name, d_module_from_name, push_variable,
push_module_name):
Deal with struct symbol_in_block from lookup functions. Remove
uses of block_found.
* eval.c (evaluate_subexp_standard): Update call to
cp_lookup_symbol_namespace.
* f-exp.y: Deal with struct symbol_in_block from lookup
functions. Remove uses of block_found.
(yylex): Likewise.
* gdbtypes.c (lookup_typename, lookup_struct, lookup_union,
lookup_enum, lookup_template_type, check_typedef): Deal with
struct symbol_in_block from lookup functions.
* guile/scm-frame.c (gdbscm_frame_read_var): Likewise.
* guile/scm-symbol.c (gdbscm_lookup_symbol): Likewise.
(gdbscm_lookup_global_symbol): Likewise.
* gnu-v3-abi.c (gnuv3_get_typeid_type): Likewise.
* go-exp.y: Likewise. Remove uses of block_found.
(package_name_p, classify_packaged_name, classify_name):
Likewise.
* infrun.c (insert_exception_resume_breakpoint): Likewise.
* jv-exp.y (push_variable): Likewise.
* jv-lang.c (java_lookup_class, get_java_object_type): Likewise.
* language.c (language_bool_type): Likewise.
* language.h (struct language_defn): Update
la_lookup_symbol_nonlocal to return a struct symbol_in_block
rather than a mere symbol.
* linespec.c (find_label_symbols): Deal with struct
symbol_in_block from lookup functions.
* m2-exp.y: Likewise. Remove uses of block_found.
(yylex): Likewise.
* mi/mi-cmd-stack.c (list_args_or_locals): Likewise.
* objc-lang.c (lookup_struct_typedef, find_imps): Likewise.
* p-exp.y: Likewise. Remove uses of block_found.
(yylex): Likewise.
* p-valprint.c (pascal_val_print): Likewise.
* parse.c (write_dollar_variable): Likewise. Remove uses of
block_found.
* parser-defs.h (struct symtoken): Turn the SYM field into a
struct symbol_in_block.
* printcmd.c (address_info): Deal with struct symbol_in_block
from lookup functions.
* python/py-frame.c (frapy_read_var): Likewise.
* python/py-symbol.c (gdbpy_lookup_symbol,
gdbpy_lookup_global_symbol): Likewise.
* skip.c (skip_function_command): Likewise.
* solib-darwin.c (darwin_lookup_lib_symbol): Return a struct
symbol_in_block instead of a mere symbol.
* solib-spu.c (spu_lookup_lib_symbol): Likewise.
* solib-svr4.c (elf_lookup_lib_symbol): Likewise.
* solib.c (solib_global_lookup): Likewise.
* solist.h (solib_global_lookup): Likewise.
(struct target_so_ops): Update lookup_lib_global_symbol to
return a struct symbol_in_block rather than a mere symbol.
* source.c (select_source_symtab): Deal with struct
symbol_in_block from lookup functions.
* stack.c (print_frame_args, iterate_over_block_arg_vars):
Likewise.
* symfile.c (set_initial_language): Likewise.
* symtab.c (SYMBOL_LOOKUP_FAILED): Turn into a struct
symbol_in_block.
(SYMBOL_LOOKUP_FAILED_P): New predicate as a macro.
(struct symbol_cache_slot): Turn the FOUND field into a struct
symbol_in_block.
(block_found): Remove.
(eq_symbol_entry): Update to deal with struct symbol_in_block in
cache slots.
(symbol_cache_lookup): Return a struct symbol_in_block rather
than a mere symbol.
(symbol_cache_mark_found): Add a BLOCK parameter to fill
appropriately the cache slots. Update callers.
(symbol_cache_dump): Update cache slots handling to the type
change.
(lookup_symbol_in_language, lookup_symbol, lookup_language_this,
lookup_symbol_aux, lookup_local_symbol,
lookup_symbol_in_objfile, lookup_global_symbol_from_objfile,
lookup_symbol_in_objfile_symtabs,
lookup_symbol_in_objfile_from_linkage_name,
lookup_symbol_via_quick_fns, basic_lookup_symbol_nonlocal,
lookup_symbol_in_static_block, lookup_static_symbol,
lookup_global_symbol):
Return a struct symbol_in_block rather than a mere symbol. Deal
with struct symbol_in_block from other lookup functions. Remove
uses of block_found.
(lookup_symbol_in_block): Remove uses of block_found.
(struct global_sym_lookup_data): Turn the RESULT field into a
struct symbol_in_block.
(lookup_symbol_global_iterator_cb): Update references to the
RESULT field.
(search_symbols): Deal with struct symbol_in_block from lookup
functions.
* symtab.h (struct symbol_in_block): New structure.
(block_found): Remove.
(lookup_symbol_in_language, lookup_symbol,
basic_lookup_symbol_nonlocal, lookup_symbol_in_static_block,
looku_static_symbol, lookup_global_symbol,
lookup_symbol_in_block, lookup_language_this,
lookup_global_symbol_from_objfile): Return a struct
symbol_in_block rather than just a mere symbol. Update comments
to remove mentions of block_found.
* valops.c (find_function_in_inferior,
value_struct_elt_for_reference, value_maybe_namespace_elt,
value_of_this): Deal with struct symbol_in_block from lookup
functions.
* value.c (value_static_field, value_fn_field): Likewise.
2015-07-21 17:02:15 +02:00
|
|
|
|
return (struct block_symbol) {NULL, NULL};
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bfd *
|
|
|
|
|
darwin_bfd_open (char *pathname)
|
|
|
|
|
{
|
|
|
|
|
char *found_pathname;
|
|
|
|
|
int found_file;
|
|
|
|
|
bfd *abfd;
|
|
|
|
|
bfd *res;
|
|
|
|
|
|
|
|
|
|
/* Search for shared library file. */
|
|
|
|
|
found_pathname = solib_find (pathname, &found_file);
|
|
|
|
|
if (found_pathname == NULL)
|
|
|
|
|
perror_with_name (pathname);
|
|
|
|
|
|
|
|
|
|
/* Open bfd for shared library. */
|
|
|
|
|
abfd = solib_bfd_fopen (found_pathname, found_file);
|
|
|
|
|
|
2012-11-28 19:48:38 +01:00
|
|
|
|
res = gdb_bfd_mach_o_fat_extract (abfd, bfd_object,
|
|
|
|
|
gdbarch_bfd_arch_info (target_gdbarch ()));
|
2009-02-04 09:47:56 +01:00
|
|
|
|
if (!res)
|
|
|
|
|
{
|
2012-07-18 21:42:26 +02:00
|
|
|
|
make_cleanup_bfd_unref (abfd);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
error (_("`%s': not a shared-library: %s"),
|
2012-07-18 21:34:57 +02:00
|
|
|
|
bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
|
2009-02-04 09:47:56 +01:00
|
|
|
|
}
|
2012-11-28 19:48:38 +01:00
|
|
|
|
|
2013-12-13 18:21:37 +01:00
|
|
|
|
/* The current filename for fat-binary BFDs is a name generated
|
|
|
|
|
by BFD, usually a string containing the name of the architecture.
|
|
|
|
|
Reset its value to the actual filename. */
|
2014-01-06 17:24:41 +01:00
|
|
|
|
xfree (bfd_get_filename (res));
|
|
|
|
|
res->filename = xstrdup (pathname);
|
2013-12-13 18:21:37 +01:00
|
|
|
|
|
2012-11-28 19:48:38 +01:00
|
|
|
|
gdb_bfd_unref (abfd);
|
2009-02-04 09:47:56 +01:00
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct target_so_ops darwin_so_ops;
|
|
|
|
|
|
2012-03-02 01:06:13 +01:00
|
|
|
|
/* -Wmissing-prototypes */
|
|
|
|
|
extern initialize_file_ftype _initialize_darwin_solib;
|
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
void
|
|
|
|
|
_initialize_darwin_solib (void)
|
|
|
|
|
{
|
2012-05-29 14:59:53 +02:00
|
|
|
|
solib_darwin_pspace_data
|
* auto-load.c (_initialize_auto_load): Update.
* solib-svr4.c (_initialize_svr4_solib): Update
* solib-dsbt.c (_initialize_dsbt_solib): Update.
* solib-darwin.c (_initialize_darwin_solib): Update.
* registry.h: New file.
* python/py-progspace.c (gdbpy_initialize_pspace): Update.
* python/py-inferior.c (gdbpy_initialize_inferior): Update.
* progspace.h: Include registry.h. Use DECLARE_REGISTRY.
(register_program_space_data_with_cleanup)
(register_program_space_data, program_space_alloc_data)
(clear_program_space_data, set_program_space_data)
(program_space_data): Don't declare.
* progspace.c: Use DEFINE_REGISTRY.
(struct program_space_data, struct
program_space_data_registration, struct
program_space_data_registry, program_space_data_registry)
(register_program_space_data_with_cleanup)
(register_program_space_data, program_space_alloc_data)
(program_space_free_data, clear_program_space_data)
(set_program_space_data, program_space_data): Remove.
* objfiles.h: Include registry.h. Use DECLARE_REGISTRY.
(struct objfile) <data, num_data>: Replace with REGISTRY_FIELDS.
(register_objfile_data_with_cleanup, register_objfile_data)
(clear_objfile_data, set_objfile_data, objfile_data): Don't
declare.
* objfiles.c: Use DEFINE_REGISTRY.
(struct objfile_data, struct objfile_data_registration, struct
objfile_data_registry, objfile_data_registry)
(register_objfile_data_with_cleanup, register_objfile_data)
(objfile_alloc_data, objfile_free_data, clear_objfile_data)
(set_objfile_data, objfile_data): Remove.
(_initialize_objfiles): Update.
* jit.c (_initialize_jit): Update.
* inflow.c (_initialize_inflow): Update.
* inferior.h: Include registry.h. Use DECLARE_REGISTRY.
(struct inferior) <data, num_data>: Replace with REGISTRY_FIELDS.
(register_inferior_data_with_cleanup, register_inferior_data)
(clear_inferior_data, set_inferior_data, inferior_data): Don't
declare.
* inferior.c: Use DEFINE_REGISTRY.
(struct inferior_data, struct inferior_data_registration, struct
inferior_data_registry, inferior_data_registry)
(register_inferior_data_with_cleanup, register_inferior_data)
(inferior_alloc_data, inferior_free_data clear_inferior_data)
(set_inferior_data, inferior_data): Remove.
* auxv.c (_initialize_auxv): Update.
* ada-lang.c (_initialize_ada_language): Update.
* breakpoint.c (_initialize_breakpoint): Update.
* i386-nat.c (i386_use_watchpoints): Update.
2012-08-22 17:17:21 +02:00
|
|
|
|
= register_program_space_data_with_cleanup (NULL,
|
|
|
|
|
darwin_pspace_data_cleanup);
|
2012-05-29 14:59:53 +02:00
|
|
|
|
|
2009-02-04 09:47:56 +01:00
|
|
|
|
darwin_so_ops.relocate_section_addresses = darwin_relocate_section_addresses;
|
|
|
|
|
darwin_so_ops.free_so = darwin_free_so;
|
|
|
|
|
darwin_so_ops.clear_solib = darwin_clear_solib;
|
|
|
|
|
darwin_so_ops.solib_create_inferior_hook = darwin_solib_create_inferior_hook;
|
|
|
|
|
darwin_so_ops.special_symbol_handling = darwin_special_symbol_handling;
|
|
|
|
|
darwin_so_ops.current_sos = darwin_current_sos;
|
|
|
|
|
darwin_so_ops.open_symbol_file_object = open_symbol_file_object;
|
|
|
|
|
darwin_so_ops.in_dynsym_resolve_code = darwin_in_dynsym_resolve_code;
|
|
|
|
|
darwin_so_ops.lookup_lib_global_symbol = darwin_lookup_lib_symbol;
|
|
|
|
|
darwin_so_ops.bfd_open = darwin_bfd_open;
|
|
|
|
|
}
|