From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19205 invoked by alias); 12 Sep 2013 07:28:20 -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 19193 invoked by uid 89); 12 Sep 2013 07:28:20 -0000 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Sep 2013 07:28:20 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RDNS_NONE,SPF_HELO_FAIL autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VK1K4-0000nh-3N from Hui_Zhu@mentor.com ; Thu, 12 Sep 2013 00:28:16 -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); Thu, 12 Sep 2013 00:28:16 -0700 Received: from [127.0.0.1] (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; Thu, 12 Sep 2013 00:28:15 -0700 Message-ID: <52316D0C.9000707@mentor.com> Date: Thu, 12 Sep 2013 07:28:00 -0000 From: Hui Zhu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Yao Qi CC: Hui Zhu , gdb-patches ml Subject: Re: [PATCH] Fix gdb.base/shreloc.exp: (msymbol) relocated functions have different addresses fail in cygwin References: <522DD104.6090808@codesourcery.com> <52315FC6.4000005@mentor.com> <523163DF.3020707@codesourcery.com> In-Reply-To: <523163DF.3020707@codesourcery.com> Content-Type: multipart/mixed; boundary="------------020809080009040700020608" X-IsSubscribed: yes X-SW-Source: 2013-09/txt/msg00371.txt.bz2 --------------020809080009040700020608 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1385 Hi Yao, Thanks for your review. On 09/12/13 14:49, Yao Qi wrote: > On 09/12/2013 02:31 PM, Hui Zhu wrote: >> -proc get_msym_addrs { var msymfile } { >> +proc get_msym_addrs { var msymfile { plus_var "" } } { > > 'plus_var' is not good candidate for parameter name. I'd call it 'mst' > or 'msym_type'. Fixed. > >> # Extract the list of values for symbols matching var in the >> # minimal symbol output file >> >> global gdb_prompt hex >> set result "" >> >> - send_gdb "shell grep -E \" ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" >> + if { "${plus_var}" == "" } { >> + send_gdb "shell grep -E \" ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" >> + } else { >> + send_gdb "shell grep -E \" ${plus_var} .* ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" >> + } > > This condition checking is not necessary, we can do > > send_gdb "shell grep -E \"${plus_var} ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n" Because for the output format is: [ 7] T 0x2aaaaacd058a fn_1 section .text shreloc1.c It need a ".*" after "T". So I change "T" to "T.*" to handle it. Post a new version according to your comments. Best, Hui 2013-09-12 Hui Zhu * gdb.base/shreloc.exp (get_msym_addrs): Add argument "msym_type". (check_different): Ditto. ((msymbol) relocated functions have different addresses): Add argument 'T.*' when call check_different. --------------020809080009040700020608 Content-Type: text/plain; charset="us-ascii"; name="fix-cygwin-shreloc.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="fix-cygwin-shreloc.txt" Content-length: 2062 LS0tIGEvZ2RiL3Rlc3RzdWl0ZS9nZGIuYmFzZS9zaHJlbG9jLmV4cAorKysg Yi9nZGIvdGVzdHN1aXRlL2dkYi5iYXNlL3NocmVsb2MuZXhwCkBAIC0xNTcs MTQgKzE1NywxNCBAQCBwcm9jIHNlbmRfZ2RiX2Rpc2NhcmQgeyBjb21tYW5k IH0gewogICAgIH0KIH0KIAotcHJvYyBnZXRfbXN5bV9hZGRycyB7IHZhciBt c3ltZmlsZSB9IHsKK3Byb2MgZ2V0X21zeW1fYWRkcnMgeyB2YXIgbXN5bWZp bGUgeyBtc3ltX3R5cGUgIiIgfSB9IHsKICAgICAjIEV4dHJhY3QgdGhlIGxp c3Qgb2YgdmFsdWVzIGZvciBzeW1ib2xzIG1hdGNoaW5nIHZhciBpbiB0aGUK ICAgICAjIG1pbmltYWwgc3ltYm9sIG91dHB1dCBmaWxlCiAKICAgICBnbG9i YWwgZ2RiX3Byb21wdCBoZXgKICAgICBzZXQgcmVzdWx0ICIiCiAKLSAgICBz ZW5kX2dkYiAic2hlbGwgZ3JlcCAtRSBcIiAke3Zhcn0oXFsgXHRcXSsuKik/ XCRcIiAke21zeW1maWxlfVxuIgorICAgIHNlbmRfZ2RiICJzaGVsbCBncmVw IC1FIFwiJHttc3ltX3R5cGV9ICR7dmFyfShcWyBcdFxdKy4qKT9cJFwiICR7 bXN5bWZpbGV9XG4iCiAKICAgICB3aGlsZSAxIHsKIAlnZGJfZXhwZWN0IHsK QEAgLTIwMSwxMCArMjAxLDEwIEBAIHByb2MgY2hlY2tfc2FtZSB7dmFyIG1z eW1maWxlfSB7CiAgICAgfQogfQogCi1wcm9jIGNoZWNrX2RpZmZlcmVudCB7 dmFyIG1zeW1maWxlfSB7Citwcm9jIGNoZWNrX2RpZmZlcmVudCB7dmFyIG1z eW1maWxlIHsgbXN5bV90eXBlICIiIH0gfSB7CiAgICAgIyBDaGVjayB0aGF0 IHRoZSBtaW5pbWFsIHN5bWJvbCB2YWx1ZXMgbWF0Y2hpbmcgdmFyIGFyZSBk aWZmZXJlbnQKIAotICAgIHNldCBhZGRyX2xpc3QgW2xzb3J0IFtnZXRfbXN5 bV9hZGRycyAiJHt2YXJ9IiAiJHttc3ltZmlsZX0iXV0KKyAgICBzZXQgYWRk cl9saXN0IFtsc29ydCBbZ2V0X21zeW1fYWRkcnMgIiR7dmFyfSIgIiR7bXN5 bWZpbGV9IiAiJHttc3ltX3R5cGV9Il1dCiAgICAgc2V0IHByZXYgIiIKIAog ICAgIGlmIHsgW2xsZW5ndGggJHthZGRyX2xpc3R9XSA8IDIgfSB7CkBAIC0y MzYsNyArMjM2LDkgQEAgaWYgW3NlbmRfZ2RiX2Rpc2NhcmQgIm1haW50IHBy aW50IG1zeW1ibwogCWZhaWwgIihtc3ltYm9sKSByZWxvY2F0ZWQgZXh0ZXJu IHZhcnMgaGF2ZSBkaWZmZXJlbnQgYWRkcmVzc2VzIgogICAgIH0KIAotICAg IGlmIHtbY2hlY2tfZGlmZmVyZW50ICJmbl9cWzEyXF0iICIke21zeW1maWxl fSJdfSB7CisgICAgIyBNc3ltYm9sIHR5cGUgb2YgInJlbG9jYXRlZCBmdW5j dGlvbiIgc2hvdWxkIGJlICdUJywgc28gd2UganVzdAorICAgICMgY2hlY2sg J1QnIHR5cGUuCisgICAgaWYge1tjaGVja19kaWZmZXJlbnQgImZuX1xbMTJc XSIgIiR7bXN5bWZpbGV9IiAiVC4qIl19IHsKIAlwYXNzICIobXN5bWJvbCkg cmVsb2NhdGVkIGZ1bmN0aW9ucyBoYXZlIGRpZmZlcmVudCBhZGRyZXNzZXMi CiAgICAgfSBlbHNlIHsKIAlmYWlsICIobXN5bWJvbCkgcmVsb2NhdGVkIGZ1 bmN0aW9ucyBoYXZlIGRpZmZlcmVudCBhZGRyZXNzZXMiCg== --------------020809080009040700020608--