From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17491 invoked by alias); 3 Jul 2013 00:26:53 -0000 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 Received: (qmail 17480 invoked by uid 89); 3 Jul 2013 00:26:52 -0000 X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_BJ,TW_BM,TW_YM autolearn=no version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 03 Jul 2013 00:26:51 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UuAuI-0007T7-08 from Yao_Qi@mentor.com ; Tue, 02 Jul 2013 17:26:50 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 2 Jul 2013 17:26:50 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.2.247.3; Tue, 2 Jul 2013 17:26:49 -0700 Message-ID: <51D36FB3.4070006@codesourcery.com> Date: Wed, 03 Jul 2013 00:26:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Tom Tromey CC: Subject: Re: [PATCH] Fix up msymbol type of dll trampoline to mst_solib_trampoline References: <1372043502-4618-1-git-send-email-yao@codesourcery.com> <874ncjmgkl.fsf@fleche.redhat.com> <51CD0054.9040401@codesourcery.com> <87ehbmkzqr.fsf@fleche.redhat.com> In-Reply-To: <87ehbmkzqr.fsf@fleche.redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-SW-Source: 2013-07/txt/msg00100.txt.bz2 On 06/28/2013 11:43 PM, Tom Tromey wrote: > It seems to me that it would be more efficient to keep a hash table of > minsyms under construction, and then do this lookup when entering a new > minsym. This would avoid repeated loops over all minsyms being defined. > > That is, if the new symbol is _imp_x, look up x. If the symbol is x, > look up _imp_x. Then modify a symbol if needed. In the updated patch, I use hash table when looking for up minsyms, but in a little different way. After currently constructing minsyms are installed to OBJFILE, there is a hash table built, we can use that one, instead of maintaining a separate one. That is, after the hash table of minsyms of OBJFILE is built up, we can iterate all minsyms, if symbol is _imp_x, look up x in the hash table. If found, modify the found's type. Regression tested on i686-pc-mingw32. The following fail is fixed. FAIL: gdb.base/solib-symbol.exp: foo in libmd -- Yao (齐尧) gdb: 2013-07-03 Yao Qi * coffread.c (coff_symfile_read): Iterate over minimal symbols, if the name is prefixed by "__imp_" or "_imp_", look for minimal symbol without prefix. If found, set its type to 'mst_solib_trampoline'. --- gdb/coffread.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/gdb/coffread.c b/gdb/coffread.c index bf39085..f9bb59f 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -650,6 +650,36 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags) install_minimal_symbols (objfile); + if (pe_file) + { + int i; + + for (i = objfile->minimal_symbol_count; i > 0; i--) + { + struct minimal_symbol *msym = &objfile->msymbols[i]; + const char *name = SYMBOL_LINKAGE_NAME (msym); + + /* If the minimal symbols whose name are prefixed by "__imp_" + or "_imp_", get rid of the prefix, and search the minimal + symbol in OBJFILE. Note that 'maintenance print msymbols' + shows that type of these "_imp_XXXX" symbols is mst_data. */ + if (MSYMBOL_TYPE (msym) == mst_data + && (strncmp (name, "__imp_", 6) == 0 + || strncmp (name, "_imp_", 5) == 0)) + { + const char *name1 = (name[1] == '_' ? &name[7] : &name[6]); + struct minimal_symbol *found; + + found = lookup_minimal_symbol (name1, NULL, objfile); + /* If found, there are symbols named "_imp_foo" and "foo" + respectively in OBJFILE. Set the type of symbol "foo" + as 'mst_solib_trampoline'. */ + if (found != NULL && MSYMBOL_TYPE (found) == mst_text) + MSYMBOL_TYPE (found) = mst_solib_trampoline; + } + } + } + /* Free the installed minimal symbol data. */ do_cleanups (cleanup_minimal_symbols); -- 1.7.7.6