From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16919 invoked by alias); 14 Mar 2012 13:36:17 -0000 Received: (qmail 16827 invoked by uid 22791); 14 Mar 2012 13:36:15 -0000 X-SWARE-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN X-Spam-Check-By: sourceware.org Received: from outdoor.onevision.de (HELO outdoor.onevision.de) (212.77.172.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 14 Mar 2012 13:36:02 +0000 Received: from sanders.onevision.de (moonrace [212.77.172.62]) by outdoor.onevision.de (8.14.3/8.13.7/ROSCH/DDB) with ESMTP id q2EDZuPT007002 for ; Wed, 14 Mar 2012 14:36:01 +0100 Received: from [192.168.5.32] ([192.168.5.32]) by sanders.onevision.de (Lotus Domino Release 8.5.1FP3) with ESMTP id 2012031414355124-114812 ; Wed, 14 Mar 2012 14:35:51 +0100 Message-ID: <4F609EB7.2020801@onevision.com> Date: Wed, 14 Mar 2012 13:36:00 -0000 From: Roland Schwingel User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: [PATCH] Add dll trampoline code handling for windows 64bit Content-Type: multipart/mixed; boundary="------------010009000709090507020802" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-03/txt/msg00476.txt.bz2 This is a multi-part message in MIME format. --------------010009000709090507020802 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-length: 1251 Hi... When single stepping a 64bit windows application gdb at present does not step into functions residing in a dll. This is due to the fact that handling of dll trampoline code for win64 is missing. I added a new function to amd64-windows-tdep.c to handle this similar to the existing function (i386_pe_skip_trampoline_code()). With some differences: - On 32bit windows dll trampoline code is expressed as jmp *(dest) while on 64bit windows this is expressed as jmp *(%rip). Took care of this. - The jump destination is on 64bit windows of course 8 byte long. I could not find a function that transforms this into a CORE_ADDR like read_memory_unsigned_integer() it is doing in the 32bit case. So I did the transformation on my own. While this is high performant it might not be the "official" gdb way. If someone can give me a hint on how to the transformation the "official" way I will adjust my patch - if wished. Now single stepping into dll code works. ChangeLog: 2012-03-14 Roland Schwingel * amd64-windows-tdep.c: #include "frame.h" (amd64_windows_skip_trampoline_code): New function. (amd64_windows_init_abi): Add trampoline registration. Roland --------------010009000709090507020802 Content-Transfer-Encoding: 7bit Content-Type: text/plain; name="amd64-windows-tdep.c.patch" Content-Disposition: attachment; filename="amd64-windows-tdep.c.patch" Content-length: 2086 --- amd64-windows-tdep.c_orig 2012-03-02 01:06:12.000000000 +0100 +++ amd64-windows-tdep.c 2012-03-14 13:31:39.815727600 +0100 @@ -23,6 +23,7 @@ #include "gdbtypes.h" #include "gdbcore.h" #include "regcache.h" +#include "frame.h" /* The registers used to pass integer arguments during a function call. */ static int amd64_windows_dummy_call_integer_regs[] = @@ -153,12 +154,59 @@ return pc; } +/* Stuff for WIN64 PE style DLL's but is pretty generic really. */ + +static CORE_ADDR +amd64_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) +{ + struct gdbarch *gdbarch = get_frame_arch (frame); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + + /* check for jmp *(%rip) */ + if (pc && read_memory_unsigned_integer (pc, 2, byte_order) == 0x25ff) + { + unsigned long indirect = + read_memory_unsigned_integer (pc + 2, 4, byte_order); + struct minimal_symbol *indsym = + indirect ? lookup_minimal_symbol_by_pc (pc + indirect) : 0; + const char *symname = + indsym ? SYMBOL_LINKAGE_NAME (indsym) : 0; + + if (symname) + { + if (strncmp (symname, "__imp_", 6) == 0 + || strncmp (symname, "_imp_", 5) == 0) + { + CORE_ADDR destination; + gdb_byte *pos, addr[8]; + + read_memory (pc + indirect, addr, 8); + pos = (gdb_byte *) &destination; + pos[0] = addr[6]; + pos[1] = addr[7]; + pos[2] = addr[0]; + pos[3] = addr[1]; + pos[4] = addr[2]; + pos[5] = addr[3]; + pos[6] = addr[4]; + pos[7] = addr[5]; + + return destination; + } + } + } + return 0; /* Not a trampoline. */ +} static void amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + /* register trampoline handling code */ + set_gdbarch_skip_trampoline_code (gdbarch, + amd64_windows_skip_trampoline_code); + amd64_init_abi (info, gdbarch); /* On Windows, "long"s are only 32bit. */ --------------010009000709090507020802--