From patchwork Tue Mar 14 13:37:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66371 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5981A3858C1F for ; Tue, 14 Mar 2023 13:38:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5981A3858C1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678801094; bh=Ozjleg4kg166A8i3X2otuDgHzI/3dkz+DwSB2bI9FQc=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=G6itg0uhUQ8BpyZMYewAostjOUsQRTSJA2W8EtgrcIvbNT3P4MY/8C5TjP6aYphm/ FWOp2maGLcF/AZWzs/ZEPccbkR4f3P5DC5vve5xm+4sowfrGAB1ias62VI8XiGB+qk vkQ7Y/TV0hwxbbq61OFV9V+9xhCMclrfHO4RGlto= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by sourceware.org (Postfix) with ESMTPS id 373E03858C5F for ; Tue, 14 Mar 2023 13:37:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 373E03858C5F Received: by mail-io1-xd2e.google.com with SMTP id m22so6403771ioy.4 for ; Tue, 14 Mar 2023 06:37:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678801040; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ozjleg4kg166A8i3X2otuDgHzI/3dkz+DwSB2bI9FQc=; b=2oPmRcYImxve5gdPgpUuBkhkOF4IuiOYDqhOqksgTWi1uruTt79nVcdOl3CoBrGXQX p2tOeNpUiT/A0lVVxaV2r9Ob0pVPb0ER+GJicjWIbfBbH2JRbCzp3W4Jnzh5nCY6zCkq XlO5hTo4Ciup/qjLWzN0brNnh6IrCbHItptjMCmTOLAsa9Y6TxjyRT2sM7f5vG62T/cb zMcIAiBXizegIpd6MTRgwiWwfNFWiEEWFngEZv5nHWuixFHVJOkj+MSobY4ru+jptFvn oBsHm79mWnbn4wMo7sQyFNTHT94HTP4ncSlX0J6wjQvTz6eo7cyPUW2Av1LDT89WYZ6o rcZA== X-Gm-Message-State: AO0yUKVJTSzv/rO5sUOPSP8aNRMS2qgVwU930b+3+LwtT7USINkotuTd dJhhRiD4nwrZCiM8brgMo3LP2hkeMlXeyBKxEco= X-Google-Smtp-Source: AK7set/k77oYBWL/j+tlAaCGj2BEy8pgatZdq7qR03c7HoiFyiaqx8w/M9EhJYAbeypmdVtBco11ZQ== X-Received: by 2002:a6b:da17:0:b0:74c:8f71:dde7 with SMTP id x23-20020a6bda17000000b0074c8f71dde7mr23106159iob.19.1678801040423; Tue, 14 Mar 2023 06:37:20 -0700 (PDT) Received: from localhost.localdomain (71-211-185-113.hlrn.qwest.net. [71.211.185.113]) by smtp.gmail.com with ESMTPSA id d7-20020a6b7d47000000b0071664d0a4d7sm809045ioq.49.2023.03.14.06.37.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 06:37:20 -0700 (PDT) Date: Tue, 14 Mar 2023 07:37:18 -0600 Subject: [PATCH 3/3] Use entry values for 32-bit PPC struct return MIME-Version: 1.0 Message-Id: <20230314-submit-ppc-finish-fixes-v1-3-5f2f461b52f8@adacore.com> References: <20230314-submit-ppc-finish-fixes-v1-0-5f2f461b52f8@adacore.com> In-Reply-To: <20230314-submit-ppc-finish-fixes-v1-0-5f2f461b52f8@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" AdaCore has a local patch for PPC "finish", but last year, Ulrich Weigand pointed out that this patch was incorrect. It may work for simple functions like the one in the internal test, but nothing guarantees that r3 will be preserved by the callee, so checking r3 on exit is not always correct. This patch fixes the problem using the same approach as PPC64: use the entry value of r3, if available. Ulrich confirmed this matches the PPC32 ABI. --- gdb/ppc-sysv-tdep.c | 3 +-- gdb/ppc-tdep.h | 4 +++- gdb/rs6000-tdep.c | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c index ab859fbe143..66630793e86 100644 --- a/gdb/ppc-sysv-tdep.c +++ b/gdb/ppc-sysv-tdep.c @@ -2159,8 +2159,7 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct value *function, } CORE_ADDR -ppc64_sysv_get_return_buf_addr (struct type *val_type, - frame_info_ptr cur_frame) +ppc_sysv_get_return_buf_addr (struct type *val_type, frame_info_ptr cur_frame) { /* The PowerPC ABI specifies aggregates that are not returned by value are returned in a storage buffer provided by the caller. The diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h index fe41baef149..3c7948cc4ba 100644 --- a/gdb/ppc-tdep.h +++ b/gdb/ppc-tdep.h @@ -175,7 +175,9 @@ extern void ppc_collect_vsxregset (const struct regset *regset, const struct regcache *regcache, int regnum, void *vsxregs, size_t len); -extern CORE_ADDR ppc64_sysv_get_return_buf_addr (type*, frame_info_ptr); +/* Implementation of the gdbarch get_return_buf_addr hook. */ + +extern CORE_ADDR ppc_sysv_get_return_buf_addr (type*, frame_info_ptr); /* Private data that this module attaches to struct gdbarch. */ diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index d1a16b3430b..16adefb9f9b 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -8265,12 +8265,11 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) if (wordsize == 8) { set_gdbarch_return_value (gdbarch, ppc64_sysv_abi_return_value); - set_gdbarch_get_return_buf_addr (gdbarch, - ppc64_sysv_get_return_buf_addr); set_gdbarch_update_call_site_pc (gdbarch, ppc64_update_call_site_pc); } else set_gdbarch_return_value (gdbarch, ppc_sysv_abi_return_value); + set_gdbarch_get_return_buf_addr (gdbarch, ppc_sysv_get_return_buf_addr); /* Set lr_frame_offset. */ if (wordsize == 8)