From patchwork Mon Mar 27 10:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 66936 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 13FA83858C53 for ; Mon, 27 Mar 2023 10:14:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13FA83858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679912048; bh=77b3CLo6HqK8mvrDWsDtIpWV8inQ669kt6L6PZ7U/7s=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=G+/xZtxvt26nAVbU6M2txp71FQ4heoXHujAXW6+VXSi/blFRppNZq4iShdfZtTdY0 oav32vCHlGd1tAapAVecfbdZGiYNqi13qwYCF5LlNaPD/LmqcApXFT5lsfUHfQrR8F uezn5tjtph5djhx/nFzvhKJiJX5V73fipwh2+VcA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DFA8D3858D39 for ; Mon, 27 Mar 2023 10:13:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFA8D3858D39 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-669-GZzQdJFDMyejH5pDjyfWjw-1; Mon, 27 Mar 2023 06:06:33 -0400 X-MC-Unique: GZzQdJFDMyejH5pDjyfWjw-1 Received: by mail-wr1-f72.google.com with SMTP id bn9-20020a056000060900b002cfe8493fe6so672056wrb.4 for ; Mon, 27 Mar 2023 03:06:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679911572; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=77b3CLo6HqK8mvrDWsDtIpWV8inQ669kt6L6PZ7U/7s=; b=dDiyxtIyBNYUX2kzyTZqvKxoN+mHNWgUu297WASJbIVCLohgsgWTYbtsx5A3p5pySf 8oafKZIvd6REa4meKv4lEr15qjKSy+AceB+QYYhQOhWNBkB8LxUPKza28q6U9SpUstn7 jWiPCQrAbvqwfO1ObUDA5DQffKQ67k8y+15AwyKw6WGzIAAfDq0TEAetj0YgwdNCjU1q +Z2UOEw3I8wNWHeqZnAeN+w3aFK0FPxv25IJ5vMg2sQRvG/tdwgV8HLdWk4hy123fmz3 zOxsBdsmm1a7YvFg2K5nH0CHeYGbdLeCycw176Ix92p/7+tVFk6uRg8HhnZgnUknY/Sk HPkQ== X-Gm-Message-State: AAQBX9eKWsN16Sjp7Hqf5kKCIfLWuxdZfNQdLf77n4wtR5CHdWH0Ldmj pAh+YzHxJp6wz+ULaUUtJNdJqQcPtGjFROFNqoEVBBUXFOw6W/EojAWttakOwTlpO8F2rh1VUcT /4snXjjBY2Rs8oU50M5LwaG+KiMDKvbbJcWPo3r17gi9aSI5z7vBKqh9yED41OUfzQ/ckO+Q8G8 9BzlLkrw== X-Received: by 2002:a5d:5391:0:b0:2ce:a85f:1313 with SMTP id d17-20020a5d5391000000b002cea85f1313mr8147760wrv.35.1679911571925; Mon, 27 Mar 2023 03:06:11 -0700 (PDT) X-Google-Smtp-Source: AKy350asXQuDnMycrPHID1ueO8kYd6R2fgAhE5Uaq9LjUoXbLDreBxInUW/yD3RXqkfx6jaq8KF3zQ== X-Received: by 2002:a5d:5391:0:b0:2ce:a85f:1313 with SMTP id d17-20020a5d5391000000b002cea85f1313mr8147741wrv.35.1679911571508; Mon, 27 Mar 2023 03:06:11 -0700 (PDT) Received: from localhost (95.72.115.87.dyn.plus.net. [87.115.72.95]) by smtp.gmail.com with ESMTPSA id l12-20020adfe9cc000000b002cea8e3bd54sm24705901wrn.53.2023.03.27.03.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 03:06:11 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb/riscv: Support c.li in prologue unwinder Date: Mon, 27 Mar 2023 11:06:08 +0100 Message-Id: <87cf5601a8e0bbec24f14d03fac0d3240e79d5c1.1679911542.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I was seeing some failures in gdb.threads/omp-par-scope.exp when run on a riscv64 target. It turns out the cause of the problem is that I didn't have debug information installed for libgomp.so, which this test makes use of. The test requires GDB to backtrace through a libgomp function, and the riscv prologue unwinder was failing to unwind this particular stack frame. The reason for the failure to unwind was that the function prologue includes a c.li (compressed load immediate) instruction, and the riscv prologue scanning unwinder doesn't know what to do with this instruction, though the unwinder does understand c.lui (compressed load unsigned immediate). This commit adds support for c.li. After this GDB is able to unwind through libgomp, and I no longer see any unexpected failures in gdb.threads/omp-par-scope.exp. I've also included a new test in gdb.arch/ which specifically checks for our c.li support. --- gdb/riscv-tdep.c | 8 +++- .../riscv64-unwind-prologue-with-c_li-foo.s | 47 +++++++++++++++++++ .../riscv64-unwind-prologue-with-c_li.c | 29 ++++++++++++ .../riscv64-unwind-prologue-with-c_li.exp | 42 +++++++++++++++++ 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li-foo.s create mode 100644 gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.c create mode 100644 gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.exp base-commit: 1770eca698ad0018cd504b9744306fc9928d9a86 diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 8024ffed3c2..a9c5418a7d9 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -1529,6 +1529,7 @@ class riscv_insn ADDW, AUIPC, LUI, + LI, SD, SW, LD, @@ -1901,6 +1902,8 @@ riscv_insn::decode (struct gdbarch *gdbarch, CORE_ADDR pc) m_rd = decode_register_index (ival, OP_SH_CRS1S); m_imm.s = EXTRACT_CITYPE_LUI_IMM (ival); } + else if (is_c_li_insn (ival)) + decode_ci_type_insn (LI, ival); /* C_SD and C_FSW have the same opcode. C_SD is RV64 and RV128 only, and C_FSW is RV32 only. */ else if (xlen != 4 && is_c_sd_insn (ival)) @@ -2053,10 +2056,11 @@ riscv_scan_prologue (struct gdbarch *gdbarch, gdb_assert (insn.rd () < RISCV_NUM_INTEGER_REGS); regs[insn.rd ()] = pv_constant (cur_pc + insn.imm_signed ()); } - else if (insn.opcode () == riscv_insn::LUI) + else if (insn.opcode () == riscv_insn::LUI + || insn.opcode () == riscv_insn::LI) { /* Handle: lui REG, n - Where REG is not gp register. */ + or: li REG, n */ gdb_assert (insn.rd () < RISCV_NUM_INTEGER_REGS); regs[insn.rd ()] = pv_constant (insn.imm_signed ()); } diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li-foo.s b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li-foo.s new file mode 100644 index 00000000000..787aacdd8f3 --- /dev/null +++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li-foo.s @@ -0,0 +1,47 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + + +/* Simple asm function that makes use of c.li and c.lui in the + function prologue before the return address and frame pointers are + written the stack. This ensures that GDB's prologue unwinder can + understand these instructions. */ + + .option pic + .text + + .globl foo + .type foo, @function +foo: + addi sp,sp,-32 + sd s1,8(sp) + + c.li s1,-4 + c.lui s1,4 + + sd fp,24(sp) + sd ra,16(sp) + addi fp,sp,32 + + call bar@plt + + ld s1,8(sp) + ld ra,16(sp) + ld fp,24(sp) + addi sp,sp,32 + jr ra + + .size foo, .-foo + .section .note.GNU-stack,"",@progbits diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.c b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.c new file mode 100644 index 00000000000..d3a0cb3ff40 --- /dev/null +++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.c @@ -0,0 +1,29 @@ +/* Copyright 2023 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* See riscv64-unwind-prologue-with-c_li-asm.s. */ +extern int foo (void); + +int +bar (void) +{ + return 0; +} + +int +main (void) +{ + return foo (); +} diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.exp b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.exp new file mode 100644 index 00000000000..069effa2b87 --- /dev/null +++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-c_li.exp @@ -0,0 +1,42 @@ +# Copyright 2023 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This tests GDB's ability to use the RISC-V prologue scanner in order +# to unwind through a function that uses the compressed 'c.li' +# instruction in its prologue. + +require {istarget "riscv64-*-*"} + +standard_testfile .c -foo.s + +if {[prepare_for_testing "failed to prepare" $testfile \ + "$srcfile $srcfile2" nodebug]} { + return -1 +} + +if {![runto_main]} { + return 0 +} + +gdb_breakpoint "bar" +gdb_continue_to_breakpoint "bar" +gdb_test "bt" \ + [multi_line \ + "#0\[ \t\]*$hex in bar \\\(\\\)" \ + "#1\[ \t\]*$hex in foo \\\(\\\)" \ + "#2\[ \t\]*$hex in main \\\(\\\)"] \ + "Backtrace to the main frame" +gdb_test "finish" "foo \\\(\\\)" "finish bar" +gdb_test "finish" "main \\\(\\\)" "finish foo"