From patchwork Thu Feb 13 18:14:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 38049 Received: (qmail 91204 invoked by alias); 13 Feb 2020 18:14:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 91186 invoked by uid 89); 13 Feb 2020 18:14:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: sonic314-20.consmr.mail.ir2.yahoo.com Received: from sonic314-20.consmr.mail.ir2.yahoo.com (HELO sonic314-20.consmr.mail.ir2.yahoo.com) (77.238.177.146) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 13 Feb 2020 18:14:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s2048; t=1581617692; bh=s1BEQtMl8SMYQ4/x6604fSpCc1q1hcztCsaKv4QdgH4=; h=From:To:Subject:Date:References:From:Subject; b=ahCZy1IAlfWKR0Rw2AihRLtfp5oAAzziHrCmXRZdEpvOp/Eqa+dMiR0ommuinPzLrO7tHW+ZxxKwDCFDP2j/Q3N+cbXM3EstEByyHLYrhX0zqreGrd/vt+VjAN6QGA7Lqa8fnQq/fUWxBDXWGplOx13NngQz/V8dKw+qgNPCocq4Ppoe9OeeDc8Gx/Ufumn4yioZ0o7gw/YHQ0BqHY+MQbQdm3Opf0w1/kKP5PIuWFX+AfWaBp0/5V2joM5IPHZVZelLq1VN8hHJLq4JDcksQja8LWIbUa740fZRML/zy5YmrkXH0hEda4iPjxX1b3+VNIvi8gQdntBdjSrS+1lznA== Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ir2.yahoo.com with HTTP; Thu, 13 Feb 2020 18:14:52 +0000 Received: by smtp425.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 412b563f740fa96677e99a8c82faf0ac; Thu, 13 Feb 2020 18:14:50 +0000 (UTC) X-Patchwork-Original-From: "Hannes Domani via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Hannes Domani To: gdb-patches@sourceware.org Subject: [PATCH v2] Rebase executable to match relocated base address Date: Thu, 13 Feb 2020 19:14:30 +0100 Message-Id: <20200213181430.11259-1-ssbssa@yahoo.de> MIME-Version: 1.0 References: <20200213181430.11259-1-ssbssa.ref@yahoo.de> Content-Length: 2813 X-IsSubscribed: yes Windows executables linked with -dynamicbase get a new base address when loaded, which makes debugging impossible if the executable isn't also rebased in gdb. The new base address is read from the Process Environment Block. --- v2: This version now no longer needs the fake auxv entry. --- gdb/windows-tdep.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c index 6eef3fbd96..29c0a828a7 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -34,6 +34,9 @@ #include "solib.h" #include "solib-target.h" #include "gdbcore.h" +#include "coff/internal.h" +#include "libcoff.h" +#include "solist.h" /* Windows signal numbers differ between MinGW flavors and between those and Cygwin. The below enumeration was gleaned from the @@ -812,6 +815,50 @@ windows_get_siginfo_type (struct gdbarch *gdbarch) return siginfo_type; } +/* Implement the "solib_create_inferior_hook" target_so_ops method. */ + +static void +windows_solib_create_inferior_hook (int from_tty) +{ + CORE_ADDR exec_base = 0; + + /* Find base address of main executable in + TIB->process_environment_block->image_base_address. */ + struct gdbarch *gdbarch = target_gdbarch (); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + int ptr_bytes; + int peb_offset; /* Offset of process_environment_block in TIB. */ + int base_offset; /* Offset of image_base_address in PEB. */ + if (gdbarch_ptr_bit (gdbarch) == 32) + { + ptr_bytes = 4; + peb_offset = 48; + base_offset = 8; + } + else + { + ptr_bytes = 8; + peb_offset = 96; + base_offset = 16; + } + CORE_ADDR tlb; + gdb_byte buf[8]; + if (target_get_tib_address (inferior_ptid, &tlb) + && !target_read_memory (tlb + peb_offset, buf, ptr_bytes)) + { + CORE_ADDR peb = extract_unsigned_integer (buf, ptr_bytes, byte_order); + if (!target_read_memory (peb + base_offset, buf, ptr_bytes)) + exec_base = extract_unsigned_integer (buf, ptr_bytes, byte_order); + } + + if (symfile_objfile && exec_base) + { + CORE_ADDR vmaddr = pe_data (exec_bfd)->pe_opthdr.ImageBase; + if (vmaddr != exec_base) + objfile_rebase (symfile_objfile, exec_base - vmaddr); + } +} + /* To be called from the various GDB_OSABI_CYGWIN handlers for the various Windows architectures and machine types. */ @@ -830,6 +877,8 @@ windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_gdb_signal_to_target (gdbarch, windows_gdb_signal_to_target); + solib_target_so_ops.solib_create_inferior_hook + = windows_solib_create_inferior_hook; set_solib_ops (gdbarch, &solib_target_so_ops); set_gdbarch_get_siginfo_type (gdbarch, windows_get_siginfo_type);