This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[darwin]: simplify solib-darwin.c
- From: Tristan Gingold <gingold at adacore dot com>
- To: "<gdb-patches at sourceware dot org> ml" <gdb-patches at sourceware dot org>
- Date: Fri, 18 Apr 2014 11:12:17 +0200
- Subject: [darwin]: simplify solib-darwin.c
- Authentication-results: sourceware.org; auth=none
Hi,
function bfd_mach_o_get_base_address (to extract load address) has
recently by added in bfd/mach-o.c, so we can use it to simplify
a little bit solib-darwin.c
Tested on a simply example and committed on trunk.
Tristan.
gdb/
* solib-darwin.c (darwin_solib_create_inferior_hook): Simplify
code by using bfd_mach_o_get_base_address.
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index a9989ea..03b51d5 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -524,26 +524,10 @@ darwin_solib_create_inferior_hook (int from_tty)
load_addr = darwin_read_exec_load_addr (info);
if (load_addr != 0 && symfile_objfile != NULL)
{
- CORE_ADDR vmaddr = 0;
- struct mach_o_data_struct *md = bfd_mach_o_get_data (exec_bfd);
- unsigned int i, num;
+ CORE_ADDR vmaddr;
/* Find the base address of the executable. */
- for (i = 0; i < md->header.ncmds; i++)
- {
- struct bfd_mach_o_load_command *cmd = &md->commands[i];
-
- if (cmd->type != BFD_MACH_O_LC_SEGMENT
- && cmd->type != BFD_MACH_O_LC_SEGMENT_64)
- continue;
- if (cmd->command.segment.fileoff == 0
- && cmd->command.segment.vmaddr != 0
- && cmd->command.segment.filesize != 0)
- {
- vmaddr = cmd->command.segment.vmaddr;
- break;
- }
- }
+ vmaddr = bfd_mach_o_get_base_address (exec_bfd);
/* Relocate. */
if (vmaddr != load_addr)