Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pkTyT-00019X-U0 for mharc-qemu-riscv@gnu.org; Thu, 06 Apr 2023 14:04:41 -0400 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 1pkTyQ-00016M-TS for qemu-riscv@nongnu.org; Thu, 06 Apr 2023 14:04:38 -0400 Received: from mail-oa1-x34.google.com ([2001:4860:4864:20::34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkTyN-0000g8-DB for qemu-riscv@nongnu.org; Thu, 06 Apr 2023 14:04:37 -0400 Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-17ab3a48158so43245330fac.1 for ; Thu, 06 Apr 2023 11:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1680804273; 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=kV7z09+98ddMxW+lPuQeVv6kSGaKTK/aK1AU+q2WtVg=; b=Kc2V2GluUYxAHaM2MKAM7W7YcaF9LBCB0VP8U6/Xz23vrxV7CbGe+wprANq8TLWRVr Sav8M6JkuoMKUA0HmegQ+JBB9W57s98KwmP8zdF0Xi9RHgstVMf0XApYwR/dULz///zc Vbb1XznUWqdMNK+vP5/eidZWC85mTW1lQ5PdSssOuyk6y/C2rRcN2v8VSKXtksiqmewK 8xT3Qa3uPb199w9DjZXOtqb6d96WzY7P+apTosKZDT5nYxu+uK0GVYFJYJBV96yeKdUw fl5hJkYDY08fZmCNMRd2XdphyXnhqzrSkcGPLkScMQnA9U6v7Wcwp+eV3fxCYjIqAm7C ba6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680804273; 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=kV7z09+98ddMxW+lPuQeVv6kSGaKTK/aK1AU+q2WtVg=; b=AM81Za4yOZULoDM1hqHWE6iEMkz6vOVRkorlRiQRqVvzU56qvaiIjdKpJu4U3ju51M 1w1tayc13YixoHW3ryzDUG//NjyojDtg6PdC8iRlb4dB54P2JiDIzTP5thQgsrOK9CuU p986mSTV1tQayW2c4/iIltEgRjGrZzXhOf9DgvkOnxneWx/Pn2jwSehdvssFklc6gpI/ ycyjpT213k70yUPKtpJ+czsPJ0q+gbrzz1nqWSsABmOYFSNWpFO7lPO0DgvReG66nkca GZjMD0/l4IisXU7YgO5SPm4SdDwjdHQgV7dKuY8AH6GLmgJCBF41D8rx2E+btfLB1jbn Tkdg== X-Gm-Message-State: AAQBX9fcDxJxzAdbSg0bsk19KzPYVUc5calFzMLOCybwHIlCv87+yo4X AJL1tKSpxWXSJTjNpBJuZDv9jw== X-Google-Smtp-Source: AKy350YV90xy+hlW+GBPL8Fm7T+FEq4HIs8ZCtkBbRtEByD9QtN90D2Biavx8j6Gz7eJAPznvKbWiA== X-Received: by 2002:a05:6870:b489:b0:176:53a1:b65c with SMTP id y9-20020a056870b48900b0017653a1b65cmr148750oap.11.1680804273439; Thu, 06 Apr 2023 11:04:33 -0700 (PDT) Received: from grind.. ([191.255.108.232]) by smtp.gmail.com with ESMTPSA id g4-20020a056870d20400b0018045663fc5sm906309oac.48.2023.04.06.11.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 11:04:33 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH v4 11/20] target/riscv: remove cpu->cfg.ext_m Date: Thu, 6 Apr 2023 15:03:42 -0300 Message-Id: <20230406180351.570807-12-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406180351.570807-1-dbarboza@ventanamicro.com> References: <20230406180351.570807-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4860:4864:20::34; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x34.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, 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-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2023 18:04:39 -0000 Create a new "m" RISCVCPUMisaExtConfig property that will update env->misa_ext* with RVM. Instances of cpu->cfg.ext_m and similar are replaced with riscv_has_ext(env, RVM). Remove the old "m" property and 'ext_m' from RISCVCPUConfig. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 10 +++++----- target/riscv/cpu.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 33db4fa4b2..24640450c7 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -817,13 +817,13 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) CPURISCVState *env = &cpu->env; /* Do some ISA extension error checking */ - if (cpu->cfg.ext_g && !(riscv_has_ext(env, RVI) && cpu->cfg.ext_m && + if (cpu->cfg.ext_g && !(riscv_has_ext(env, RVI) && + riscv_has_ext(env, RVM) && riscv_has_ext(env, RVA) && riscv_has_ext(env, RVF) && riscv_has_ext(env, RVD) && cpu->cfg.ext_icsr && cpu->cfg.ext_ifencei)) { warn_report("Setting G will also set IMAFD_Zicsr_Zifencei"); - cpu->cfg.ext_m = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_ifencei = true; @@ -1153,7 +1153,7 @@ static void riscv_cpu_sync_misa_cfg(CPURISCVState *env) if (riscv_has_ext(env, RVE)) { ext |= RVE; } - if (riscv_cpu_cfg(env)->ext_m) { + if (riscv_has_ext(env, RVM)) { ext |= RVM; } if (riscv_has_ext(env, RVA)) { @@ -1505,6 +1505,8 @@ static const RISCVCPUMisaExtConfig misa_ext_cfgs[] = { .misa_bit = RVI, .enabled = true}, {.name = "e", .description = "Base integer instruction set (embedded)", .misa_bit = RVE, .enabled = false}, + {.name = "m", .description = "Integer multiplication and division", + .misa_bit = RVM, .enabled = true}, }; static void riscv_cpu_add_misa_properties(Object *cpu_obj) @@ -1528,7 +1530,6 @@ static void riscv_cpu_add_misa_properties(Object *cpu_obj) static Property riscv_cpu_extensions[] = { /* Defaults for standard extensions */ DEFINE_PROP_BOOL("g", RISCVCPU, cfg.ext_g, false), - DEFINE_PROP_BOOL("m", RISCVCPU, cfg.ext_m, true), DEFINE_PROP_BOOL("s", RISCVCPU, cfg.ext_s, true), DEFINE_PROP_BOOL("u", RISCVCPU, cfg.ext_u, true), DEFINE_PROP_BOOL("v", RISCVCPU, cfg.ext_v, false), @@ -1645,7 +1646,6 @@ static void register_cpu_props(Object *obj) * later on. */ if (cpu->env.misa_ext != 0) { - cpu->cfg.ext_m = misa_ext & RVM; cpu->cfg.ext_v = misa_ext & RVV; cpu->cfg.ext_s = misa_ext & RVS; cpu->cfg.ext_u = misa_ext & RVU; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 2b42de60b1..71540a33ec 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -423,7 +423,6 @@ typedef struct { struct RISCVCPUConfig { bool ext_g; - bool ext_m; bool ext_s; bool ext_u; bool ext_h; -- 2.39.2