From patchwork Wed Jul 22 09:15:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 1333697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=nUzdYpN9; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BBVRB52YMz9sRN for ; Wed, 22 Jul 2020 19:24:38 +1000 (AEST) Received: from localhost ([::1]:34432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyAzM-0002za-CJ for incoming@patchwork.ozlabs.org; Wed, 22 Jul 2020 05:24:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyAtM-0007Cj-9z for qemu-devel@nongnu.org; Wed, 22 Jul 2020 05:18:24 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:40585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jyAtK-0005M0-Gs for qemu-devel@nongnu.org; Wed, 22 Jul 2020 05:18:23 -0400 Received: by mail-pf1-x436.google.com with SMTP id u5so858682pfn.7 for ; Wed, 22 Jul 2020 02:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0BTSvnm6ouC9jlpI1w689nf30Q81rAaMwIj+C2UZaE0=; b=nUzdYpN9SOZXZcpwHxirXodG3i6bh8MxKAgnqQuNGSyypaTAnIISxy2ViZgH6RsS4Q PQnYxWiiEDUhG2caVctABuy5bex6bgBoemZpq7kH8BZr74T5/cxA10/JJXrsGaJIxeJQ UKwtqPt9qDA2LkOMviojJaXpO/N1aqY0+/1Hy0wfd9GieVsYzCeBf9sTPTfrYVLhiWlm M9xrOL1Luxw6jQbAQZ+Il74vGu7G7VbMw+2utZYI9XM0eDUXuyFgZtw5lzAHdf5tGP3o Ji6S1qgDHMmgWUHwciKtFe2OZtC/YIcHZbugAWdKUKzeMGhIKUEOnbtVuwQFrtDqdcad nJww== 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:in-reply-to :references; bh=0BTSvnm6ouC9jlpI1w689nf30Q81rAaMwIj+C2UZaE0=; b=MLmZzdYelP1h0KaiUbS+RBefwcCK09Eus/mP1B7VECCt/fzoRmmU2/QkdwLFc/z5SL wfQQF36jd3bS+VmVAxYrJtJxnOy1srMHwg0PkWtGOICKwCH6EalNcx+hXu09XjjuR+nn bmVjgEjA/FN90SIufEupFmOVp735axt6J548eZKMeuApXHrljimlNPePb2+caqrBZ+I7 L3sOqNRSEyrQrq+/EzYfEytoD2ezAjOxV2l0vnwkJJGMlSWAmWMgwP8GX7ITuSgjD2CZ vxaYB5shVjE05Cnn79f5XWLhp5gsWO0clAp84iSxJ4oLMFlnuxMVSamW1sOE3yELyDWq oP2w== X-Gm-Message-State: AOAM531FovpYwOwPl7m+kXN6DkHGsTTs7PBkFHrn3dPBs/Qh9sIk7/Z2 JwNaNvGMp2Xnb1FmIG1nYVeXVCvK7H8= X-Google-Smtp-Source: ABdhPJzoJ3jpu2gMr23wCIGloRNrgpIsJ2+v3IOQoisBILOkqmt4IYkR95cczVCL8YIRw9y4TEz4fg== X-Received: by 2002:a63:6dc7:: with SMTP id i190mr25839985pgc.304.1595409501160; Wed, 22 Jul 2020 02:18:21 -0700 (PDT) Received: from frankchang-ThinkPad-T490.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id c125sm22301879pfa.119.2020.07.22.02.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 02:18:20 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v2 12/76] target/riscv: rvv-0.9: add vcsr register Date: Wed, 22 Jul 2020 17:15:35 +0800 Message-Id: <20200722091641.8834-13-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200722091641.8834-1-frank.chang@sifive.com> References: <20200722091641.8834-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=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: , Cc: Sagar Karandikar , Frank Chang , Bastian Koppelmann , Alistair Francis , Palmer Dabbelt , LIU Zhiwei Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: LIU Zhiwei Signed-off-by: LIU Zhiwei Signed-off-by: Frank Chang Reviewed-by: Richard Henderson --- target/riscv/cpu_bits.h | 7 +++++++ target/riscv/csr.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 5b0be0bb88..7afdd4814b 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -60,9 +60,16 @@ #define CSR_VSTART 0x008 #define CSR_VXSAT 0x009 #define CSR_VXRM 0x00a +#define CSR_VCSR 0x00f #define CSR_VL 0xc20 #define CSR_VTYPE 0xc21 +/* VCSR fields */ +#define VCSR_VXSAT_SHIFT 0 +#define VCSR_VXSAT (0x1 << VCSR_VXSAT_SHIFT) +#define VCSR_VXRM_SHIFT 1 +#define VCSR_VXRM (0x3 << VCSR_VXRM_SHIFT) + /* User Timers and Counters */ #define CSR_CYCLE 0xc00 #define CSR_TIME 0xc01 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 33c77be06e..e05acb5a24 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -252,6 +252,26 @@ static int write_vstart(CPURISCVState *env, int csrno, target_ulong val) return 0; } +static int read_vcsr(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val = (env->vxrm << VCSR_VXRM_SHIFT) | (env->vxsat << VCSR_VXSAT_SHIFT); + return 0; +} + +static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) +{ +#if !defined(CONFIG_USER_ONLY) + if (!env->debugger && !riscv_cpu_vector_enabled(env)) { + return -1; + } + env->mstatus |= MSTATUS_VS; +#endif + + env->vxrm = (val & VCSR_VXRM) >> VCSR_VXRM_SHIFT; + env->vxsat = (val & VCSR_VXSAT) >> VCSR_VXSAT_SHIFT; + return 0; +} + /* User Timers and Counters */ static int read_instret(CPURISCVState *env, int csrno, target_ulong *val) { @@ -1270,6 +1290,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_VSTART] = { vs, read_vstart, write_vstart }, [CSR_VXSAT] = { vs, read_vxsat, write_vxsat }, [CSR_VXRM] = { vs, read_vxrm, write_vxrm }, + [CSR_VCSR] = { vs, read_vcsr, write_vcsr }, [CSR_VL] = { vs, read_vl }, [CSR_VTYPE] = { vs, read_vtype }, /* User Timers and Counters */