projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dwarf2_physname patchset:
[deliverable/binutils-gdb.git]
/
gdb
/
solib-darwin.c
diff --git
a/gdb/solib-darwin.c
b/gdb/solib-darwin.c
index 17f9547272ce4de97bb6f62bb10b37806e13b701..4cf657b67632fe1937234ab5f1a47c0d179af302 100644
(file)
--- a/
gdb/solib-darwin.c
+++ b/
gdb/solib-darwin.c
@@
-1,6
+1,6
@@
/* Handle Darwin shared libraries for GDB, the GNU Debugger.
/* Handle Darwin shared libraries for GDB, the GNU Debugger.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009
, 2010
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-52,7
+52,8
@@
struct gdb_dyld_image_info
unsigned long mtime;
};
unsigned long mtime;
};
-/* Content of inferior dyld_all_image_infos structure. */
+/* Content of inferior dyld_all_image_infos structure.
+ See /usr/include/mach-o/dyld_images.h for the documentation. */
struct gdb_dyld_all_image_infos
{
/* Version (1). */
struct gdb_dyld_all_image_infos
{
/* Version (1). */
@@
-66,7
+67,8
@@
struct gdb_dyld_all_image_infos
};
/* Current all_image_infos version. */
};
/* Current all_image_infos version. */
-#define DYLD_VERSION 1
+#define DYLD_VERSION_MIN 1
+#define DYLD_VERSION_MAX 7
/* Address of structure dyld_all_image_infos in inferior. */
static CORE_ADDR dyld_all_image_addr;
/* Address of structure dyld_all_image_infos in inferior. */
static CORE_ADDR dyld_all_image_addr;
@@
-74,11
+76,22
@@
static CORE_ADDR dyld_all_image_addr;
/* Gdb copy of dyld_all_info_infos. */
static struct gdb_dyld_all_image_infos dyld_all_image;
/* Gdb copy of dyld_all_info_infos. */
static struct gdb_dyld_all_image_infos dyld_all_image;
+/* Return non-zero if the version in dyld_all_image is known. */
+
+static int
+darwin_dyld_version_ok (void)
+{
+ return dyld_all_image.version >= DYLD_VERSION_MIN
+ && dyld_all_image.version <= DYLD_VERSION_MAX;
+}
+
/* Read dyld_all_image from inferior. */
/* Read dyld_all_image from inferior. */
+
static void
darwin_load_image_infos (void)
{
gdb_byte buf[24];
static void
darwin_load_image_infos (void)
{
gdb_byte buf[24];
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
int len;
struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr;
int len;
@@
-97,11
+110,11
@@
darwin_load_image_infos (void)
return;
/* Extract the fields. */
return;
/* Extract the fields. */
- dyld_all_image.version = extract_unsigned_integer (buf, 4);
- if (
dyld_all_image.version != DYLD_VERSION
)
+ dyld_all_image.version = extract_unsigned_integer (buf, 4
, byte_order
);
+ if (
!darwin_dyld_version_ok ()
)
return;
return;
- dyld_all_image.count = extract_unsigned_integer (buf + 4, 4);
+ dyld_all_image.count = extract_unsigned_integer (buf + 4, 4
, byte_order
);
dyld_all_image.info = extract_typed_address (buf + 8, ptr_type);
dyld_all_image.notifier = extract_typed_address
(buf + 8 + ptr_type->length, ptr_type);
dyld_all_image.info = extract_typed_address (buf + 8, ptr_type);
dyld_all_image.notifier = extract_typed_address
(buf + 8 + ptr_type->length, ptr_type);
@@
-124,6
+137,7
@@
struct darwin_so_list
};
/* Lookup the value for a specific symbol. */
};
/* Lookup the value for a specific symbol. */
+
static CORE_ADDR
lookup_symbol_from_bfd (bfd *abfd, char *symname)
{
static CORE_ADDR
lookup_symbol_from_bfd (bfd *abfd, char *symname)
{
@@
-140,7
+154,7
@@
lookup_symbol_from_bfd (bfd *abfd, char *symname)
symbol_table = (asymbol **) xmalloc (storage_needed);
number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
symbol_table = (asymbol **) xmalloc (storage_needed);
number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
-
+
for (i = 0; i < number_of_symbols; i++)
{
asymbol *sym = symbol_table[i];
for (i = 0; i < number_of_symbols; i++)
{
asymbol *sym = symbol_table[i];
@@
-158,27
+172,20
@@
lookup_symbol_from_bfd (bfd *abfd, char *symname)
}
/* Return program interpreter string. */
}
/* Return program interpreter string. */
+
static gdb_byte *
find_program_interpreter (void)
{
gdb_byte *buf = NULL;
static gdb_byte *
find_program_interpreter (void)
{
gdb_byte *buf = NULL;
- /* If we have an exec_bfd,
use its section table
. */
+ /* If we have an exec_bfd,
get the interpreter from the load commands
. */
if (exec_bfd)
{
if (exec_bfd)
{
- struct bfd_section *dylinker_sect;
-
- dylinker_sect = bfd_get_section_by_name (exec_bfd, "LC_LOAD_DYLINKER");
- if (dylinker_sect != NULL)
- {
- int sect_size = bfd_section_size (exec_bfd, dylinker_sect);
+ bfd_mach_o_load_command *cmd;
- buf = xmalloc (sect_size);
- if (bfd_get_section_contents (exec_bfd, dylinker_sect,
- buf, 0, sect_size))
- return buf;
- xfree (buf);
- }
+ if (bfd_mach_o_lookup_command (exec_bfd,
+ BFD_MACH_O_LC_LOAD_DYLINKER, &cmd) == 1)
+ return cmd->command.dylinker.name_str;
}
/* If we didn't find it, read from memory.
}
/* If we didn't find it, read from memory.
@@
-189,6
+196,7
@@
find_program_interpreter (void)
/* 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. */
/* 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. */
+
static int
open_symbol_file_object (void *from_ttyp)
{
static int
open_symbol_file_object (void *from_ttyp)
{
@@
-196,6
+204,7
@@
open_symbol_file_object (void *from_ttyp)
}
/* Build a list of currently loaded shared objects. See solib-svr4.c */
}
/* Build a list of currently loaded shared objects. See solib-svr4.c */
+
static struct so_list *
darwin_current_sos (void)
{
static struct so_list *
darwin_current_sos (void)
{
@@
-210,7
+219,7
@@
darwin_current_sos (void)
/* Be sure image infos are loaded. */
darwin_load_image_infos ();
/* Be sure image infos are loaded. */
darwin_load_image_infos ();
- if (
dyld_all_image.version != DYLD_VERSION
)
+ if (
!darwin_dyld_version_ok ()
)
return NULL;
image_info_size = ptr_len * 3;
return NULL;
image_info_size = ptr_len * 3;
@@
-268,6
+277,7
@@
darwin_current_sos (void)
/* Return 1 if PC lies in the dynamic symbol resolution code of the
run time loader. */
/* Return 1 if PC lies in the dynamic symbol resolution code of the
run time loader. */
+
int
darwin_in_dynsym_resolve_code (CORE_ADDR pc)
{
int
darwin_in_dynsym_resolve_code (CORE_ADDR pc)
{
@@
-276,14
+286,16
@@
darwin_in_dynsym_resolve_code (CORE_ADDR pc)
/* No special symbol handling. */
/* No special symbol handling. */
+
static void
darwin_special_symbol_handling (void)
{
}
/* Shared library startup support. See documentation in solib-svr4.c */
static void
darwin_special_symbol_handling (void)
{
}
/* Shared library startup support. See documentation in solib-svr4.c */
+
static void
static void
-darwin_solib_create_inferior_hook (
void
)
+darwin_solib_create_inferior_hook (
int from_tty
)
{
struct minimal_symbol *msymbol;
char **bkpt_namep;
{
struct minimal_symbol *msymbol;
char **bkpt_namep;
@@
-297,10
+309,6
@@
darwin_solib_create_inferior_hook (void)
bfd *dyld_bfd = NULL;
struct inferior *inf = current_inferior ();
bfd *dyld_bfd = NULL;
struct inferior *inf = current_inferior ();
- /* First, remove all the solib event breakpoints. Their addresses
- may have changed since the last time we ran the program. */
- remove_solib_event_breakpoints ();
-
/* Find the program interpreter. */
interp_name = find_program_interpreter ();
if (!interp_name)
/* Find the program interpreter. */
interp_name = find_program_interpreter ();
if (!interp_name)
@@
-323,10
+331,7
@@
darwin_solib_create_inferior_hook (void)
}
}
if (!dyld_bfd)
}
}
if (!dyld_bfd)
- {
- xfree (interp_name);
- return;
- }
+ return;
if (!inf->attach_flag)
{
if (!inf->attach_flag)
{
@@
-339,18
+344,16
@@
darwin_solib_create_inferior_hook (void)
else
{
/* FIXME: todo.
else
{
/* FIXME: todo.
- Get address of __DATA.__dyld in exec_bfd, read address at offset 0
+ Get address of __DATA.__dyld in exec_bfd, read address at offset 0
.
*/
*/
- xfree (interp_name);
return;
}
/* Now try to set a breakpoint in the dynamic linker. */
dyld_all_image_addr =
lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
return;
}
/* Now try to set a breakpoint in the dynamic linker. */
dyld_all_image_addr =
lookup_symbol_from_bfd (dyld_bfd, "_dyld_all_image_infos");
-
+
bfd_close (dyld_bfd);
bfd_close (dyld_bfd);
- xfree (interp_name);
if (dyld_all_image_addr == 0)
return;
if (dyld_all_image_addr == 0)
return;
@@
-359,7
+362,7
@@
darwin_solib_create_inferior_hook (void)
darwin_load_image_infos ();
darwin_load_image_infos ();
- if (d
yld_all_image.version == DYLD_VERSION
)
+ if (d
arwin_dyld_version_ok ()
)
create_solib_event_breakpoint (target_gdbarch, dyld_all_image.notifier);
}
create_solib_event_breakpoint (target_gdbarch, dyld_all_image.notifier);
}
@@
-377,6
+380,7
@@
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. */
/* The section table is built from bfd sections using bfd VMAs.
Relocate these VMAs according to solib info. */
+
static void
darwin_relocate_section_addresses (struct so_list *so,
struct target_section *sec)
static void
darwin_relocate_section_addresses (struct so_list *so,
struct target_section *sec)
@@
-400,7
+404,6
@@
darwin_relocate_section_addresses (struct so_list *so,
static struct symbol *
darwin_lookup_lib_symbol (const struct objfile *objfile,
const char *name,
static struct symbol *
darwin_lookup_lib_symbol (const struct objfile *objfile,
const char *name,
- const char *linkage_name,
const domain_enum domain)
{
return NULL;
const domain_enum domain)
{
return NULL;
This page took
0.027949 seconds
and
4
git commands to generate.