From be0555d585b332fd0496affe559c0a5a4e7e5644 Mon Sep 17 00:00:00 2001 From: Shubhodeep Roy Choudhury Date: Fri, 16 Mar 2018 13:46:20 +0530 Subject: [PATCH] Fix for issue #183: No illegal instruction exception for c.sxxi instructions encoded with zero shift amount --- riscv/insns/c_slli.h | 2 +- riscv/insns/c_srai.h | 2 +- riscv/insns/c_srli.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/riscv/insns/c_slli.h b/riscv/insns/c_slli.h index 24fbb13..19d7908 100644 --- a/riscv/insns/c_slli.h +++ b/riscv/insns/c_slli.h @@ -1,3 +1,3 @@ require_extension('C'); -require(insn.rvc_zimm() < xlen); +require(insn.rvc_zimm() < xlen && insn.rvc_zimm() > 0); WRITE_RD(sext_xlen(RVC_RS1 << insn.rvc_zimm())); diff --git a/riscv/insns/c_srai.h b/riscv/insns/c_srai.h index f6638b1..7b594e9 100644 --- a/riscv/insns/c_srai.h +++ b/riscv/insns/c_srai.h @@ -1,3 +1,3 @@ require_extension('C'); -require(insn.rvc_zimm() < xlen); +require(insn.rvc_zimm() < xlen && insn.rvc_zimm() > 0); WRITE_RVC_RS1S(sext_xlen(sext_xlen(RVC_RS1S) >> insn.rvc_zimm())); diff --git a/riscv/insns/c_srli.h b/riscv/insns/c_srli.h index f410fef..008ae62 100644 --- a/riscv/insns/c_srli.h +++ b/riscv/insns/c_srli.h @@ -1,3 +1,3 @@ require_extension('C'); -require(insn.rvc_zimm() < xlen); +require(insn.rvc_zimm() < xlen && insn.rvc_zimm() > 0); WRITE_RVC_RS1S(sext_xlen(zext_xlen(RVC_RS1S) >> insn.rvc_zimm())); -- 2.30.2