From patchwork Mon Jan 23 09:03:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 13111789 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8FD87C38142 for ; Mon, 23 Jan 2023 09:06:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJslm-000187-7L; Mon, 23 Jan 2023 04:05:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJslh-00017M-Qw for qemu-devel@nongnu.org; Mon, 23 Jan 2023 04:05:34 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJsld-0003q4-Lf for qemu-devel@nongnu.org; Mon, 23 Jan 2023 04:05:32 -0500 Received: by mail-wr1-x434.google.com with SMTP id h12so6090901wrv.10 for ; Mon, 23 Jan 2023 01:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8spMprAsa6MCDDlueScecGJZmjzYC45CUjlzeSiGbvw=; b=Me8RZhnnAW/q1wRaMAqB2blaKMubDBwL49QrlR/hfuFrOGw/KnuYha9Y2E1QuMW8eY kK9+G9P2doFJst10IHfE/jJ9GRASt29FgAy+A7bN04TKHxLgOKV+P3nXP92vPpwNP8gp 9l9QtfWQBgwI5MO7ncJYhAdc0K2f1r6o2GXDYoTw64QEPBmf0xogUQ5rvcUZHL1aLR3p jxVXGuNO9/2FtXT88F7s34t1RKkFTxaMsAvdnFlKZAsKEZ1yxaPIoAkrgq4Ya7vwlyWU 4lPxpB7RWD4PtGHDqb6xbXAwPwnWakxv6sQ+9ZOlAmWHztjHXu8/PWIpgMuaQsB3clpv VIvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8spMprAsa6MCDDlueScecGJZmjzYC45CUjlzeSiGbvw=; b=AukXJEZxHXJisGqpAzJkJQaZLeJLUIQPANFdEdSaolCnmDpdTpyNClD44I0mitueOe edxx9pPGCNF/rE1ofYe+Qk9TisPZWBhJ+lGEZIyRD91FHRzNPPKaGHR3WF+B0RIDRveg 7DrDeLPGt6F1GyaC5tuQoC05qBsfiwvJd/QfoqCuEKOy2MkAsk94LHlS6KSnhz2jbPvE ONWmCtZpjuNkaiecsLGcg0P2qJaC9Crjcm9UgKemOa0bOxhrz+5/xqCyTaPSAUTZkAGm h7YPVyIMeA6NEfornFJyBWh3NLTD6WNMPUDmlMGPZqn9Awce4v5vF9+5O+l0cMlTGgie lM3A== X-Gm-Message-State: AFqh2kptl0aPb/Orl5g7l8L8KjZNW4txpq519ukRhPwsh+AwKJFO/b7U sjGd/ZJLBoi1ddoHEAJ6CftiXA== X-Google-Smtp-Source: AMrXdXvtHyd1eUX/ehqKeFeoqQUSVyfsytqHWT11mpw4NqyEkE4/4E925rGFx3FrDKtqRnz2queV5w== X-Received: by 2002:adf:f501:0:b0:2ba:dce5:ee28 with SMTP id q1-20020adff501000000b002badce5ee28mr20090467wro.18.1674464728211; Mon, 23 Jan 2023 01:05:28 -0800 (PST) Received: from alex-rivos.ba.rivosinc.com (lfbn-lyo-1-450-160.w2-7.abo.wanadoo.fr. [2.7.42.160]) by smtp.gmail.com with ESMTPSA id t13-20020adfe10d000000b002b6bcc0b64dsm29827405wrz.4.2023.01.23.01.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 01:05:27 -0800 (PST) From: Alexandre Ghiti To: Palmer Dabbelt , Alistair Francis , Bin Meng , Andrew Jones , Frank Chang , qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: Alexandre Ghiti Subject: [PATCH v6 2/5] riscv: Change type of valid_vm_1_10_[32|64] to bool Date: Mon, 23 Jan 2023 10:03:21 +0100 Message-Id: <20230123090324.732681-3-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230123090324.732681-1-alexghiti@rivosinc.com> References: <20230123090324.732681-1-alexghiti@rivosinc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alexghiti@rivosinc.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org This array is actually used as a boolean so swap its current char type to a boolean and at the same time, change the type of validate_vm to bool since it returns valid_vm_1_10_[32|64]. Signed-off-by: Alexandre Ghiti Reviewed-by: Andrew Jones Reviewed-by: Alistair Francis --- target/riscv/csr.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 0db2c233e5..6b157806a5 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -1117,16 +1117,16 @@ static const target_ulong hip_writable_mask = MIP_VSSIP; static const target_ulong hvip_writable_mask = MIP_VSSIP | MIP_VSTIP | MIP_VSEIP; static const target_ulong vsip_writable_mask = MIP_VSSIP; -static const char valid_vm_1_10_32[16] = { - [VM_1_10_MBARE] = 1, - [VM_1_10_SV32] = 1 +static const bool valid_vm_1_10_32[16] = { + [VM_1_10_MBARE] = true, + [VM_1_10_SV32] = true }; -static const char valid_vm_1_10_64[16] = { - [VM_1_10_MBARE] = 1, - [VM_1_10_SV39] = 1, - [VM_1_10_SV48] = 1, - [VM_1_10_SV57] = 1 +static const bool valid_vm_1_10_64[16] = { + [VM_1_10_MBARE] = true, + [VM_1_10_SV39] = true, + [VM_1_10_SV48] = true, + [VM_1_10_SV57] = true }; /* Machine Information Registers */ @@ -1209,7 +1209,7 @@ static RISCVException read_mstatus(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } -static int validate_vm(CPURISCVState *env, target_ulong vm) +static bool validate_vm(CPURISCVState *env, target_ulong vm) { if (riscv_cpu_mxl(env) == MXL_RV32) { return valid_vm_1_10_32[vm & 0xf]; @@ -2648,7 +2648,8 @@ static RISCVException read_satp(CPURISCVState *env, int csrno, static RISCVException write_satp(CPURISCVState *env, int csrno, target_ulong val) { - target_ulong vm, mask; + target_ulong mask; + bool vm; if (!riscv_feature(env, RISCV_FEATURE_MMU)) { return RISCV_EXCP_NONE;