From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by sourceware.org (Postfix) with ESMTPS id 8F031384F01E for ; Fri, 6 May 2022 21:16:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F031384F01E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f52.google.com with SMTP id q23so11514952wra.1 for ; Fri, 06 May 2022 14:16:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=it7vOdJ+viGeViWaCJe6ODdIClsxdEmfFnotMlQBBGM=; b=uz/Uv9JNpipeKE0g65RSVIA9x08R3o/cKMJq7GxAiB2x4RvwtGQrOEMN62eMPi7+Jl ksAVOX+2eU1dOPWI7FfWkudn+WJ80XAngbDYsX13eH1AVSw4sIF7r57ikADCtlHzeq/g LxLkHUSs2rm2HX+4jpXxFaLcSSTCju072qB/tHXkQbCfUf/3rHszJLsV/bGn0mcWDE0H swtVymIc4Far27e436lC0N+quIZy0Moefo0T9ITh468JCU4ApEbtHNFJGVjxudzmbWos 5ss79qJPta7P2tqxje7+ditQuoS1XgUavVQDIz1EKX0WAF++6AZYtZn44tPjv9Z4i2pV mL1A== X-Gm-Message-State: AOAM532o/VUD4tSBQ1wRpJCFn7nBPgbI1w8wyO4XJWQQi4ciZ6vkXoxB JswIdv2yY5JNRcb4Ig0M3xM= X-Google-Smtp-Source: ABdhPJy3cbMT6P+tGPMY/NsVCBUzSfQAEP9DUBDwXLDQ4VXpntLfU0iN43vfUsrlMHU5E8gzMdxtCQ== X-Received: by 2002:a5d:4f05:0:b0:20a:dd25:5725 with SMTP id c5-20020a5d4f05000000b0020add255725mr4230088wru.546.1651871765427; Fri, 06 May 2022 14:16:05 -0700 (PDT) Received: from ?IPV6:2001:8a0:f924:2600:209d:85e2:409e:8726? ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id bj20-20020a0560001e1400b0020c5253d8edsm4259636wrb.57.2022.05.06.14.16.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 May 2022 14:16:04 -0700 (PDT) Message-ID: <70a877cc-2f35-3924-6717-9d519c2730c5@palves.net> Date: Fri, 6 May 2022 22:16:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH] PowerPC: fix for gdb.base/eh_return.exp Content-Language: en-US To: Kevin Buettner , Carl Love via Gdb-patches Cc: Rogerio Alves References: <76bea9ad010a71ea5e2c7fd78f818bdb399810a6.camel@us.ibm.com> <20220506110826.5e16c8b6@f35-zws-1> From: Pedro Alves In-Reply-To: <20220506110826.5e16c8b6@f35-zws-1> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2022 21:16:10 -0000 On 2022-05-06 19:08, Kevin Buettner via Gdb-patches wrote: > Hi Carl, > > On Thu, 05 May 2022 13:07:29 -0700 > Carl Love via Gdb-patches wrote: > >> PowerPC: fix for gdb.base/eh_return.exp >> >> The expect file does a disassembly of function eh2 to get the address of >> the last instruction of function eh2. The last instruction on PowerPC is >> followed by three .long entries. This requires a different pattern >> matching for PowerPC versus other architectures. >> >> This patch adds the needed gdb_test_multiple match statement for the >> PowerPC disassembly code. >> >> This patch fixes the one test failure on PowerPC. >> >> The patch has been tested on Power 10 and Intel 64. >> --- >> gdb/testsuite/gdb.base/eh_return.exp | 16 ++++++++++++++++ >> 1 file changed, 16 insertions(+) >> >> diff --git a/gdb/testsuite/gdb.base/eh_return.exp b/gdb/testsuite/gdb.base/eh_return.exp >> index df55dbc72da..ce46a3623d9 100644 >> --- a/gdb/testsuite/gdb.base/eh_return.exp >> +++ b/gdb/testsuite/gdb.base/eh_return.exp >> @@ -27,6 +27,22 @@ set address -1 >> >> # Get the address of the last insn in function eh2. >> gdb_test_multiple "disassemble eh2" "" { >> + -re "($hex)\[^\r\n\]*blr.*" { >> + # The dissassebmly on Powerpc looks like: >> + # Dump of assembler code for function eh2: >> + # 0x00000000100009e0 <+0>: lis r2,4098 >> + # ... >> + # 0x0000000010000b04 <+292>: add r1,r1,r10 >> + # 0x0000000010000b08 <+296>: blr >> + # 0x0000000010000b0c <+300>: .long 0x0 >> + # 0x0000000010000b10 <+304>: .long 0x1000000 >> + # 0x0000000010000b14 <+308>: .long 0x1000180 >> + # End of assembler dump. >> + # >> + # Powerpc needs the address for the blr instruction above. >> + set address $expect_out(1,string) >> + pass $gdb_test_name >> + } >> -re -wrap "($hex)\[^\r\n\]*\r\nEnd of assembler dump." { >> set address $expect_out(1,string) >> pass $gdb_test_name >> -- > > I'd prefer to see a solution which doesn't explicitly test for PPC's blr > or any other architecture specific instruction. > > It seems to me that the problem results from the .long entries > following the last executable instruction. My guess is that these > would be problematic on other architectures too. I think it'd > be better to write an RE which skips all trailing occurrences of > $hex\[^\r\n\]*\.long\[^\r\n\]* . Do you know why those .long are there in the first place? Kind of looks like data in the middle of text? I wonder whether that's a GDB bug or normal...