From patchwork Wed Mar 7 22:41:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 26238 Received: (qmail 101910 invoked by alias); 7 Mar 2018 22:41:41 -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 99705 invoked by uid 89); 7 Mar 2018 22:41:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, 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=Hx-languages-length:1853 X-HELO: mail-wr0-f193.google.com Received: from mail-wr0-f193.google.com (HELO mail-wr0-f193.google.com) (209.85.128.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 07 Mar 2018 22:41:33 +0000 Received: by mail-wr0-f193.google.com with SMTP id k9so3776543wre.9 for ; Wed, 07 Mar 2018 14:41:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=a4PvG4iFmMDrB5vxGHl6MnZKvIVTSUNPSWKCePMhnYU=; b=D9Z+M1YVDiGbA1c1fcZ2Ub5/hsBrj1GN54214ovXMIQChW0AOvC/KnG9Tpu4gv70IZ lVhwt+tpqS8dGNudhyWb/laNH2tBvt3oV31q4tfZsqeZsJ4YIPJw7R7HwR9yYylX3L0E xR/ypIaIk6mkcWjGmLgAa1EgJD4YqC6QK0EFMmLe0QXOPzvKVFv3i37HKF55exo7FDBx h1VPIKmnRm9j47sUeLP9f++/Fq6wQEARjMZRX/Ivrwa/j6KZ5cUQdSbamqo3Kzr9ufLF evfmEcsFViSxSMPLyODCCPtbo6DL2XrsEa9hECC7h9h4U80f4I9BL0pzi+n07vA2AUTy hJ/Q== X-Gm-Message-State: APf1xPC7xXJNzGMsRNHgVeW5KH1RNI3gbtIeox6qTNMkG5R930qcRT3a chaix6TgNmU4xoXVl7HGcKeHFw9G X-Google-Smtp-Source: AG47ELt3k3WmZ6fs1RbkvMLw0jg+zoKxi/Dy0ReFLk7uBJN0Uxny5NKbGLx/qPQDJ/WLBWe2ZQLCfQ== X-Received: by 10.223.158.208 with SMTP id b16mr19465409wrf.274.1520462484967; Wed, 07 Mar 2018 14:41:24 -0800 (PST) Received: from localhost ([176.123.41.197]) by smtp.gmail.com with ESMTPSA id a67sm33992047wrc.13.2018.03.07.14.41.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Mar 2018 14:41:24 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH] gdb: Fix riscv ARI issues Date: Wed, 7 Mar 2018 22:41:21 +0000 Message-Id: <20180307224121.19941-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes Fixes some ARI issues in recently added riscv code, the ARI email is: https://sourceware.org/ml/gdb-patches/2018-03/msg00156.html gdb/ChangeLog: * riscv-tdep.c (riscv_register_name): Use xsnprintf instead of sprintf. (riscv_insn::fetch_instruction): Use gdb_assert instead of internal_error. (riscv_print_arg_location): Use gdb_assert_not_reached instead of error. (riscv_push_dummy_call): Likewise. --- gdb/ChangeLog | 10 ++++++++++ gdb/riscv-tdep.c | 14 ++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 11b12279321..d84e7aba76a 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -481,7 +481,7 @@ riscv_register_name (struct gdbarch *gdbarch, int regnum) { static char buf[20]; - sprintf (buf, "csr%d", regnum - RISCV_FIRST_CSR_REGNUM); + xsnprintf (buf, 20, "csr%d", regnum - RISCV_FIRST_CSR_REGNUM); return buf; } @@ -1049,12 +1049,10 @@ riscv_insn::fetch_instruction (struct gdbarch *gdbarch, /* If we need more, grab it now. */ instlen = riscv_insn_length (buf[0]); + gdb_assert (instlen <= sizeof (buf)); *len = instlen; - if (instlen > sizeof (buf)) - internal_error (__FILE__, __LINE__, - _("%s: riscv_insn_length returned %i"), - __func__, instlen); - else if (instlen > 2) + + if (instlen > 2) { status = target_read_memory (addr + 2, buf + 2, instlen - 2); if (status) @@ -2009,7 +2007,7 @@ riscv_print_arg_location (ui_file *stream, struct gdbarch *gdbarch, break; default: - error ("unknown argument location type"); + gdb_assert_not_reached ("unknown argument location type"); } } @@ -2149,7 +2147,7 @@ riscv_push_dummy_call (struct gdbarch *gdbarch, break; default: - error ("unknown argument location type"); + gdb_assert_not_reached ("unknown argument location type"); } if (second_arg_length > 0)