From patchwork Wed May 23 00:14:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 918654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; 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.b="XNEtEpPk"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40rD8X0sQbz9s2L for ; Wed, 23 May 2018 10:36:12 +1000 (AEST) Received: from localhost ([::1]:58590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLHlB-0005aS-Pq for incoming@patchwork.ozlabs.org; Tue, 22 May 2018 20:36:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLHT7-0008CA-0R for qemu-devel@nongnu.org; Tue, 22 May 2018 20:17:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLHT5-0000pV-0G for qemu-devel@nongnu.org; Tue, 22 May 2018 20:17:28 -0400 Received: from mail-pf0-x22d.google.com ([2607:f8b0:400e:c00::22d]:34877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLHT4-0000pD-QZ for qemu-devel@nongnu.org; Tue, 22 May 2018 20:17:26 -0400 Received: by mail-pf0-x22d.google.com with SMTP id x9-v6so9564576pfm.2 for ; Tue, 22 May 2018 17:17:26 -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=j6uZUiwW75Z2bsNGRTLl3FFvrfGANRIRByiK/sKs898=; b=XNEtEpPk+7aWU3V3Sk5XL7iOVlLpoeDYnVQtpIdKQPrH8xkKZAc4hIqqOaMu2vWlYY Aa9VCzVCY7p0BKlGV+pLIrd18o1X9hXs6Yk35zaFWb0+in5Kt5gXBdLM0G+q3qBYx3zO mEcXitFGq7zHTW75Xtfxv4Piglng1RIKQpwF26/P6avoHgq3KJhbUi8oBYGyirT0UY34 VcYKvHKjbv1sIjT+SgZ4uRnpginPMevtTBairf3K3UFzle/0BZ+fvTwB3t9e3yLpc0wk 6wXcYiqNMSLVTmxfJ+AqkHFv9a43iY4G9gp7BNnZ5lDTA6dzFF+MuttD8F7V1Posz3xp STkA== 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=j6uZUiwW75Z2bsNGRTLl3FFvrfGANRIRByiK/sKs898=; b=dRJZ5fOV3xiGfDjyTGrxZ5wDxOhoNVWlfWGlierM1+qD6YI4pEpEAexW1an171CBff 8LI3JHZ6Ttr8OeqsqJ8VX48t//b5DxnIYPGJyTzmNSNF03BVwpEuLQfnV3CyLCo/wNlQ KoDwykO9d+0vMY7/2QDy7/ugYZvtqLHD+uVygNLI+i2uNtBb3bCYvCHEgiTISDtJYFeX jsJ7wFybx5XF56rGzlFPag5g+0Ly3nWG9SOD2pGFqG80SnT1RZnDifQCiDwfVZDBY34E p+2WLT4YZ3OTzGiliMbJqBAFhLfG06adEawSmOt/Xm+cR51OXJeYvU4IssqBvfoXVH3Z KXZg== X-Gm-Message-State: ALKqPwcjKyheMbAEM6EiiDrAj3Ypo0qJiDPxfy4GMxddq4HLsFmZECvr CE+hyBK5VZt7frt4AOVR+idPCldREdI= X-Google-Smtp-Source: AB8JxZrmr9wbNJHofZSu6d9n+6793DJsCNyH8yfbxw0f/PR6d+sVfCZBg26b1GDlhDtkHWy51x+eXg== X-Received: by 2002:a65:6119:: with SMTP id z25-v6mr477391pgu.139.1527034645883; Tue, 22 May 2018 17:17:25 -0700 (PDT) Received: from localhost.localdomain (122-58-167-22-fibre.bb.spark.co.nz. [122.58.167.22]) by smtp.gmail.com with ESMTPSA id j1-v6sm28935626pfh.95.2018.05.22.17.17.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 17:17:25 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 23 May 2018 12:14:58 +1200 Message-Id: <1527034517-7851-12-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1527034517-7851-1-git-send-email-mjc@sifive.com> References: <1527034517-7851-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::22d Subject: [Qemu-devel] [PATCH v1 11/30] RISC-V: Split out mstatus_fs from tb_flags X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Richard Henderson , Michael Clark , Alistair Francis , patches@groups.riscv.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Cc: Richard Henderson Signed-off-by: Michael Clark Reviewed-by: Michael Clark Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- target/riscv/cpu.h | 6 +++--- target/riscv/translate.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 3a3d91447736..242a8fcbe180 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -276,8 +276,8 @@ void QEMU_NORETURN do_raise_exception_err(CPURISCVState *env, target_ulong cpu_riscv_get_fflags(CPURISCVState *env); void cpu_riscv_set_fflags(CPURISCVState *env, target_ulong); -#define TB_FLAGS_MMU_MASK 3 -#define TB_FLAGS_FP_ENABLE MSTATUS_FS +#define TB_FLAGS_MMU_MASK 3 +#define TB_FLAGS_MSTATUS_FS MSTATUS_FS static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) @@ -285,7 +285,7 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, *pc = env->pc; *cs_base = 0; #ifdef CONFIG_USER_ONLY - *flags = TB_FLAGS_FP_ENABLE; + *flags = TB_FLAGS_MSTATUS_FS; #else *flags = cpu_mmu_index(env, 0) | (env->mstatus & MSTATUS_FS); #endif diff --git a/target/riscv/translate.c b/target/riscv/translate.c index ee2bbc55b051..466b9551cbd9 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -44,7 +44,7 @@ typedef struct DisasContext { /* pc_succ_insn points to the instruction following base.pc_next */ target_ulong pc_succ_insn; uint32_t opcode; - uint32_t flags; + uint32_t mstatus_fs; uint32_t mem_idx; /* Remember the rounding mode encoded in the previous fp instruction, which we have already installed into env->fp_status. Or -1 for @@ -656,7 +656,7 @@ static void gen_fp_load(DisasContext *ctx, uint32_t opc, int rd, { TCGv t0; - if (!(ctx->flags & TB_FLAGS_FP_ENABLE)) { + if (ctx->mstatus_fs == 0) { gen_exception_illegal(ctx); return; } @@ -686,7 +686,7 @@ static void gen_fp_store(DisasContext *ctx, uint32_t opc, int rs1, { TCGv t0; - if (!(ctx->flags & TB_FLAGS_FP_ENABLE)) { + if (ctx->mstatus_fs == 0) { gen_exception_illegal(ctx); return; } @@ -945,7 +945,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, { TCGv t0 = NULL; - if (!(ctx->flags & TB_FLAGS_FP_ENABLE)) { + if (ctx->mstatus_fs == 0) { goto do_illegal; } @@ -1810,8 +1810,8 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) DisasContext *ctx = container_of(dcbase, DisasContext, base); ctx->pc_succ_insn = ctx->base.pc_first; - ctx->flags = ctx->base.tb->flags; ctx->mem_idx = ctx->base.tb->flags & TB_FLAGS_MMU_MASK; + ctx->mstatus_fs = ctx->base.tb->flags & TB_FLAGS_MSTATUS_FS; ctx->frm = -1; /* unknown rounding mode */ }