From patchwork Tue Jan 21 23:22:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Wilson X-Patchwork-Id: 1226830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-517946-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=gah6fKs+; dkim=pass (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=bod7FY4g; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 482Phk2pgvz9sNx for ; Wed, 22 Jan 2020 10:22:44 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=S5D8NMLCtNcu rmY83VjVM5CFizWYYUDO/LwSE8UfXclnDMq8Bday5NNWvgYj9DX9eLvmCXIgbxi5 Is28t0jjHad6+FzP8HlAPmITj0Ykv7wQro5zW7VE40raOKl+gWXCf304leH2G+cx HP2wzrFwMbfmkv5n6rr5Ioi1r81ASS4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=gQtRt2px7G0YhmulE7 PUQxS5leg=; b=gah6fKs+eFpHCraB69O9INdeqlH0UQfHLFc0VZYb88puuyuYLK VFS96dSoNGcJB9058D6VtG6ykKoc5SKaQnj3tnQM1ajC1s5f27uFzYA2RZeBaSkA YEcQgYCFUtNe9lPmSm0JRY7FvmZZXhnC2iSMcnsR8VK8H4rrsi1FkH+cw= Received: (qmail 76445 invoked by alias); 21 Jan 2020 23:22:36 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 76429 invoked by uid 89); 21 Jan 2020 23:22:35 -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.1 spammy= X-HELO: mail-pj1-f67.google.com Received: from mail-pj1-f67.google.com (HELO mail-pj1-f67.google.com) (209.85.216.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Jan 2020 23:22:25 +0000 Received: by mail-pj1-f67.google.com with SMTP id bg7so2382002pjb.5 for ; Tue, 21 Jan 2020 15:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id; bh=F3u/kjauCiXOB8bZtmZRwusPM6Fa5jQ7U/l/y4V2GB4=; b=bod7FY4glVo6H0RRQp242+NxXTAt3yKTv8jsIOmvGsUp3DutzUn5vAaIdqRthT/LUH LsMP3o77U40NQkEYV0cFTpJ2jTa+6jea2W1w9oe6q2KIr99tNA9B8nA0FBJRxYtd/DTL 8sfu0Emy/o1xqP+Rr4DNpaGItRGC9SgMh0HAIJ3dIoT6zKCuE5yBSsk1SucZZJybhBL6 XROLM4NvpcduRL3jnL+4c+zhJOxCi3Cugu0SPYWeblWTWp6/7+hj1u11KkPH+o+YtLEr gBl+sx3ct+5AYBJCUApuLITOlpBu09nKnrTOmMahVNbchq8GEGuxFdhv8VAp5Sehvm0y FjOA== Received: from rohan.hsd1.ca.comcast.net ([2601:646:c180:b150:ad15:9ffc:9cc5:6ff]) by smtp.gmail.com with ESMTPSA id v4sm45862365pgo.63.2020.01.21.15.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 15:22:22 -0800 (PST) From: Jim Wilson To: gcc-patches@gcc.gnu.org Cc: Jim Wilson Subject: [PATCH] RISC-V: Fix rtl checking enabled failure with -msave-restore. Date: Tue, 21 Jan 2020 15:22:17 -0800 Message-Id: <20200121232217.22353-1-jimw@sifive.com> X-IsSubscribed: yes Found with an rtl checking enabled build and check. This triggered failures in the gcc.target/riscv/save-restore* tests. We are using XINT to access an XWINT value; INTVAL is the preferred solution. Since existing tests trigger it we don't need a new one. Tested with riscv32-elf and riscv64-linux cross builds and checks with no regressions. Committed. Jim gcc/ * config/riscv/riscv-sr.c (riscv_sr_match_prologue): Use INTVAL instead of XINT. --- gcc/config/riscv/riscv-sr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/config/riscv/riscv-sr.c b/gcc/config/riscv/riscv-sr.c index e3180efcbcc..744d0c48c33 100644 --- a/gcc/config/riscv/riscv-sr.c +++ b/gcc/config/riscv/riscv-sr.c @@ -115,7 +115,7 @@ riscv_sr_match_prologue (rtx_insn **body) && GET_CODE (XVECEXP (PATTERN (insn), 0, 0)) == UNSPEC_VOLATILE && (GET_CODE (XVECEXP (XVECEXP (PATTERN (insn), 0, 0), 0, 0)) == CONST_INT) - && XINT (XVECEXP (XVECEXP (PATTERN (insn), 0, 0), 0, 0), 0) == 2) + && INTVAL (XVECEXP (XVECEXP (PATTERN (insn), 0, 0), 0, 0)) == 2) return insn; return NULL;