From patchwork Wed Dec 5 14:29:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 30549 Received: (qmail 27739 invoked by alias); 5 Dec 2018 14:30:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 18836 invoked by uid 89); 5 Dec 2018 14:30:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*Ad:U*jimw, sk:riscv_a, Floating X-HELO: mail-wr1-f66.google.com Received: from mail-wr1-f66.google.com (HELO mail-wr1-f66.google.com) (209.85.221.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 05 Dec 2018 14:30:22 +0000 Received: by mail-wr1-f66.google.com with SMTP id p4so19900345wrt.7 for ; Wed, 05 Dec 2018 06:30:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id; bh=3NqumV9W3CdKbWpws0uMMJl7h25h02ctTK9quyr0WPI=; b=Mw2o4t1CqvWxO6rAMq9wBOLsEqF7gNzOz056DjeXlNrJR7t8vP2935evRcaoJDXhll TLlWkGa5r7BBK6Zel9GNdpgpbEjC27OoylrXnce96CmlBHtPm4X3JVPMD1ZrymJI/nEr Ke29g7UU4YBsFCetlbKsi5H4cgsCkPcj3kZds5lC9NbL1X4QqDyS5/kztyUfXNXSiEM7 MlR7Qjsb9ltRnfo658cKzAccyWPy8dopLoN8kDoteJi60R4iaaSzc6fXX2GitiRJqygr AA/4HoS1GQBJJaQkqEykFiI7IEXaI3qyKAB6sXJKJ/2y6dQjDHLWUEdKowfTV5wP+2r0 lfYg== Return-Path: Received: from localhost (host86-156-236-210.range86-156.btcentralplus.com. [86.156.236.210]) by smtp.gmail.com with ESMTPSA id v1sm23027638wrw.90.2018.12.05.06.30.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 06:30:05 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: jimw@sifive.com, palmer@sifive.com, jhb@FreeBSD.org, Andrew Burgess Subject: [PATCH] gdb/riscv: Handle passing variadic floating point arguments Date: Wed, 5 Dec 2018 14:29:58 +0000 Message-Id: <20181205142958.27614-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes This commit fixes some test failures in gdb.base/varargs.exp when running on targets with floating point hardware. Floating point unnamed (variadic) arguments should be passed in integer registers according to the abi. After this commit I see no failures in gdb.base/varargs.exp on 32 or 64 bit targets with floating point hardware. gdb/ChangeLog: * riscv-tdep.c (riscv_call_arg_scalar_float): Unnamed (variadic) arguments are passed in integer registers. (riscv_call_arg_complex_float): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/riscv-tdep.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da4d61dc856..127cef66d36 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-12-05 Andrew Burgess + + * riscv-tdep.c (riscv_call_arg_scalar_float): Unnamed (variadic) + arguments are passed in integer registers. + (riscv_call_arg_complex_float): Likewise. + 2018-12-05 Andrew Burgess * riscv-tdep.c (riscv_features_from_gdbarch_info): New function. diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index d812b7c8693..fafb0d15d8a 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -1935,7 +1935,7 @@ static void riscv_call_arg_scalar_float (struct riscv_arg_info *ainfo, struct riscv_call_info *cinfo) { - if (ainfo->length > cinfo->flen) + if (ainfo->length > cinfo->flen || ainfo->is_unnamed) return riscv_call_arg_scalar_int (ainfo, cinfo); else { @@ -1955,7 +1955,8 @@ riscv_call_arg_complex_float (struct riscv_arg_info *ainfo, struct riscv_call_info *cinfo) { if (ainfo->length <= (2 * cinfo->flen) - && riscv_arg_regs_available (&cinfo->float_regs) >= 2) + && riscv_arg_regs_available (&cinfo->float_regs) >= 2 + && !ainfo->is_unnamed) { bool result; int len = ainfo->length / 2;