From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05679C433DB for ; Wed, 31 Mar 2021 02:20:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4DFC9619BB for ; Wed, 31 Mar 2021 02:20:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DFC9619BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRQSe-00006F-8A for qemu-devel@archiver.kernel.org; Tue, 30 Mar 2021 22:20:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRQRX-0007e6-T6; Tue, 30 Mar 2021 22:18:51 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:34775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRQRW-0004kG-D8; Tue, 30 Mar 2021 22:18:51 -0400 Received: by mail-ej1-x62a.google.com with SMTP id b7so27708353ejv.1; Tue, 30 Mar 2021 19:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=q44kQ6H/QJ3ONt0zZiwt63N3MoHJrKyZ/y+04+ZwvJM=; b=G0apw0MrhthdLyX5Y/XpFLDZIRtY8QNMLDkES376TwDUvXxfm4Hhe7yyPAyT1vnmxG eBSejJLCIOpieiEPgAEg67iXJxNXU1hoeaLDF3ZcBmxiaZG5r8oY7B+uxahPJaB4sdJy 5re//SSOd7u+N7O+Xw4FWi9QtNR2qBYE99DfYNLC3uI/GvfyWYa5pvJ8Cs+OPtbDZoC5 rSz5xcHg+Rd8SPrWrSNoOW580RXjrDfEZuzl4/DdGOIh5WL9cvffNYOVscWjWh+oDzD7 Wp2vOqQTzmUxvsEwcuqYuVE6W/y+MSzKdbv71uFGGYD0MthMZ3fs8IhfJFlmONI8gigV k83Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q44kQ6H/QJ3ONt0zZiwt63N3MoHJrKyZ/y+04+ZwvJM=; b=PlaqdKXwLFLkHoytl/MEPpmCArEvpY+tAN63i+Dz0J7MJVcQjGfik4Fw5pfj7i/x0n toLJXqn1IJbVkGv6Kp+aRzB6qlnfWVqr72LI+Cy5edolwh/aSfyOIcqGzawCgK290683 LXQkzWMmGVi16/vQShVpXoAxUfp9oLhDaUD+hRVKS+XqnK5BPS5cKTXUuMuiEfTvqfPF MGu6ryAvkRUxpEeisBwtzPENYfAxPcfGBHcJVDBn8Hv88hBsMRqzZNjAWi6OEVCPyOYb W67b96/c20zk5MCdE24d9tKaQGDFiIkYa7Ylesg1dU0fSEMSpmidO5WinoJvDQfUUraL GtIQ== X-Gm-Message-State: AOAM533Xe9rC6eNVK/SbDoHROAzdGCOUmRDIyvxdm8sWKejIdnL9SimZ 2Upwd6ntaU/wl/U8x9aylg6qfQRXLYY= X-Google-Smtp-Source: ABdhPJx1vTK8DIa2znDXNhCMSE4SCu3f9xRCsCmZsNn5SHMQGw70dKSgO5eaoE1NLQV5/p461f6rRQ== X-Received: by 2002:a17:906:5689:: with SMTP id am9mr1076578ejc.298.1617157128757; Tue, 30 Mar 2021 19:18:48 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a26sm496211edm.15.2021.03.30.19.18.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:18:48 -0700 (PDT) From: Bin Meng To: Alistair Francis , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH 2/2] target/riscv: csr: Remove redundant check in fp csr read/write routines Date: Wed, 31 Mar 2021 10:18:25 +0800 Message-Id: <20210331021825.537484-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210331021825.537484-1-bmeng.cn@gmail.com> References: <20210331021825.537484-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The following check: if (!env->debugger && !riscv_cpu_fp_enabled(env)) { return -RISCV_EXCP_ILLEGAL_INST; } is redundant in fflags/frm/fcsr read/write routines, as the check was already done in fs(). Signed-off-by: Bin Meng --- target/riscv/csr.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 2bad396f64..7c24318f75 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -193,11 +193,6 @@ static int pmp(CPURISCVState *env, int csrno) /* User Floating-Point CSRs */ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val) { -#if !defined(CONFIG_USER_ONLY) - if (!env->debugger && !riscv_cpu_fp_enabled(env)) { - return -RISCV_EXCP_ILLEGAL_INST; - } -#endif *val = riscv_cpu_get_fflags(env); return 0; } @@ -205,9 +200,6 @@ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val) static int write_fflags(CPURISCVState *env, int csrno, target_ulong val) { #if !defined(CONFIG_USER_ONLY) - if (!env->debugger && !riscv_cpu_fp_enabled(env)) { - return -RISCV_EXCP_ILLEGAL_INST; - } env->mstatus |= MSTATUS_FS; #endif riscv_cpu_set_fflags(env, val & (FSR_AEXC >> FSR_AEXC_SHIFT)); @@ -216,11 +208,6 @@ static int write_fflags(CPURISCVState *env, int csrno, target_ulong val) static int read_frm(CPURISCVState *env, int csrno, target_ulong *val) { -#if !defined(CONFIG_USER_ONLY) - if (!env->debugger && !riscv_cpu_fp_enabled(env)) { - return -RISCV_EXCP_ILLEGAL_INST; - } -#endif *val = env->frm; return 0; } @@ -228,9 +215,6 @@ static int read_frm(CPURISCVState *env, int csrno, target_ulong *val) static int write_frm(CPURISCVState *env, int csrno, target_ulong val) { #if !defined(CONFIG_USER_ONLY) - if (!env->debugger && !riscv_cpu_fp_enabled(env)) { - return -RISCV_EXCP_ILLEGAL_INST; - } env->mstatus |= MSTATUS_FS; #endif env->frm = val & (FSR_RD >> FSR_RD_SHIFT); @@ -239,11 +223,6 @@ static int write_frm(CPURISCVState *env, int csrno, target_ulong val) static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val) { -#if !defined(CONFIG_USER_ONLY) - if (!env->debugger && !riscv_cpu_fp_enabled(env)) { - return -RISCV_EXCP_ILLEGAL_INST; - } -#endif *val = (riscv_cpu_get_fflags(env) << FSR_AEXC_SHIFT) | (env->frm << FSR_RD_SHIFT); if (vs(env, csrno) >= 0) { @@ -256,9 +235,6 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val) static int write_fcsr(CPURISCVState *env, int csrno, target_ulong val) { #if !defined(CONFIG_USER_ONLY) - if (!env->debugger && !riscv_cpu_fp_enabled(env)) { - return -RISCV_EXCP_ILLEGAL_INST; - } env->mstatus |= MSTATUS_FS; #endif env->frm = (val & FSR_RD) >> FSR_RD_SHIFT; -- 2.25.1