From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 58417 invoked by alias); 13 Mar 2017 21:49:01 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 57093 invoked by uid 89); 13 Mar 2017 21:48:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy=U*andrew, sk:andrew@ X-HELO: mail-pg0-f65.google.com Received: from mail-pg0-f65.google.com (HELO mail-pg0-f65.google.com) (74.125.83.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Mar 2017 21:48:46 +0000 Received: by mail-pg0-f65.google.com with SMTP id b5so19821697pgg.1 for ; Mon, 13 Mar 2017 14:48:47 -0700 (PDT) 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=aWcnxKetTZSJhmvL1o6pVorDGTuPC3uUl5lYWVebW6Y=; b=LZRARXOwkUxVotRX6l1m8Bny1KedPtqQiFopYDZKGxzRTEXQg61RI0JOcIz3bI6Ggw eVzOv9fsw6YlDLd2+1zpfOEoj0LoSvxIC4e0gXqFYX4FVKVzxsNr2rGw+bnKOhGaspFD HUKxxom1MgtpjEViknys7kiuK7D0gOQ5HFIW+V8C758rAiG/3nZelft5mVAAqzpPXeH7 x4jmElBpbvzqzPfoNa8J5NESYlg3q3MEkQKKO8TWzWgE7+vJIrlp1r8wT3qlqCboOHcb vfOao7yHQYhBnK697n8yvXedrn2ATDsLJbsrmr5mOVX7YAzaELQjR7s9uasjY47m04q6 hHDQ== X-Gm-Message-State: AMke39nSkyj8QXbrBZ6SKkwlort383wR5+BHD5ePaw5sB+X/b3tsNVS+8m4rkQEziuOOyw== X-Received: by 10.98.1.10 with SMTP id 10mr39959311pfb.117.1489441725861; Mon, 13 Mar 2017 14:48:45 -0700 (PDT) Received: from localhost ([216.38.154.21]) by smtp.gmail.com with ESMTPSA id o26sm34663689pgd.25.2017.03.13.14.48.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 14:48:45 -0700 (PDT) From: Palmer Dabbelt To: binutils@sourceware.org Cc: Andrew Waterman Subject: [PATCH] Fix [dis]assembly of srai/srli Date: Mon, 13 Mar 2017 21:49:00 -0000 Message-Id: <20170313214812.4550-1-palmer@dabbelt.com> X-IsSubscribed: yes X-SW-Source: 2017-03/txt/msg00193.txt.bz2 From: Andrew Waterman These were simple copy/paste errors from the compressed left shift pattern, which can't have a 0-register. --- opcodes/ChangeLog | 7 +++++++ opcodes/riscv-opc.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index f9f2c04..622ccf4 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +2017-03-13 Andrew Waterman + + * riscv-opc.c (riscv_opcodes) : Use match_opcode. + Likewise. + Likewise. + Likewise. + 2017-03-09 H.J. Lu * i386-gen.c (opcode_modifiers): Replace S with Load. diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 61d0159..1bb90ee 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -210,14 +210,14 @@ const struct riscv_opcode riscv_opcodes[] = {"sll", "C", "d,CU,C>", MATCH_C_SLLI, MASK_C_SLLI, match_rd_nonzero, INSN_ALIAS }, {"sll", "I", "d,s,t", MATCH_SLL, MASK_SLL, match_opcode, 0 }, {"sll", "I", "d,s,>", MATCH_SLLI, MASK_SLLI, match_opcode, INSN_ALIAS }, -{"srli", "C", "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_rd_nonzero, INSN_ALIAS }, +{"srli", "C", "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_opcode, INSN_ALIAS }, {"srli", "I", "d,s,>", MATCH_SRLI, MASK_SRLI, match_opcode, 0 }, -{"srl", "C", "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_rd_nonzero, INSN_ALIAS }, +{"srl", "C", "Cs,Cw,C>", MATCH_C_SRLI, MASK_C_SRLI, match_opcode, INSN_ALIAS }, {"srl", "I", "d,s,t", MATCH_SRL, MASK_SRL, match_opcode, 0 }, {"srl", "I", "d,s,>", MATCH_SRLI, MASK_SRLI, match_opcode, INSN_ALIAS }, -{"srai", "C", "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_rd_nonzero, INSN_ALIAS }, +{"srai", "C", "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_opcode, INSN_ALIAS }, {"srai", "I", "d,s,>", MATCH_SRAI, MASK_SRAI, match_opcode, 0 }, -{"sra", "C", "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_rd_nonzero, INSN_ALIAS }, +{"sra", "C", "Cs,Cw,C>", MATCH_C_SRAI, MASK_C_SRAI, match_opcode, INSN_ALIAS }, {"sra", "I", "d,s,t", MATCH_SRA, MASK_SRA, match_opcode, 0 }, {"sra", "I", "d,s,>", MATCH_SRAI, MASK_SRAI, match_opcode, INSN_ALIAS }, {"sub", "C", "Cs,Cw,Ct", MATCH_C_SUB, MASK_C_SUB, match_opcode, INSN_ALIAS }, -- 2.10.2