From patchwork Tue Mar 3 00:48:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 1247982 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=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=dt9vrbrL; 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 48Wdtt2hkYz9sSL for ; Tue, 3 Mar 2020 11:59:02 +1100 (AEDT) Received: from localhost ([::1]:40458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8vtk-00036I-6X for incoming@patchwork.ozlabs.org; Mon, 02 Mar 2020 19:59:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45295) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8vkn-0002P4-50 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8vkm-0004RZ-4I for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:45 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:38468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8vkl-0004RD-Ue for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:44 -0500 Received: by mail-pf1-x433.google.com with SMTP id q9so560097pfs.5 for ; Mon, 02 Mar 2020 16:49:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding:cc:from:to; bh=p/aHvK4Ow3ycdFh8n3Jb7MsDbfRWgHzYPLH7LzUr5BY=; b=dt9vrbrLfbbL/2xf5fuMrXyA192F+47JRTaFVyaK9Ncr4NeeVU8cl2E8pwib0KXQG/ /jnS17zYQsH//CG4tUbWbPFaJiJgafbDAMtnLj6oMAnRpXYB4Rr467xRG0vY90uMoje4 anV61bQAQsvVSmmq5z4T8k1IVnwcb/v8+xP6THZMiMbLI+h9nJI4xUzRBK9Z1k95QWa9 +NgITLtrJ6GRqNTGdPhvDlQ3k/fPqwKn3Hnq8+9kHxXlfE/QNyW3X6ezIM7FoY7PxjNa /QkFZH4IMm5sceC/ZTww5jOpu7fEGPTaeSdF4fU4c+jmx+MNp3UrO/+cWOt0rybcICIJ r+Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:cc:from:to; bh=p/aHvK4Ow3ycdFh8n3Jb7MsDbfRWgHzYPLH7LzUr5BY=; b=WoUokPZvdsqSQrcUibl2bfGwg+rIcWm8B03PezPbeo96ol/+vVxbaiU38EUNM4kdGW x9kkiv9Zqvr0aU/6yYKZUp6IFX9YoScU3G310EhoKwtnPcPKZnxTm/dcXc6ENUzNey4i ntgUyIHq//RUy6sc2mHBmY12ugI/bdGFbjhhBR6n5n5mN+KPzFlGS4He/J/WI/QMpVsJ /Iz7ZWKBuxSCwGHBUObxIZiD1I6RR5jhFLcBs2DkjjECaAwePMgBo5Sb2dxsRHsNam94 T89JSQz9SVC+BLuUXzqwClZHBt9R1bDiqDhsAlrZQydwaqYN5R5vlKN3M9AInwiPuRUD je8w== X-Gm-Message-State: ANhLgQ1mPY48i1hwsobBjarAt/B4IrVZ63ESij2ETWkLJp2lLiXakDKO 3wdoRKUFrfBo86xdhRVTqtq1KQ== X-Google-Smtp-Source: ADFU+vv96l6UZqK/+eeM++pmgQdQxUmvygEPEeNsj0eHzkhc8DX9fqavMgAFP/ekSt6eiJSIvg3xbA== X-Received: by 2002:aa7:8687:: with SMTP id d7mr1622724pfo.164.1583196582854; Mon, 02 Mar 2020 16:49:42 -0800 (PST) Received: from localhost ([2620:0:1000:2514:23a5:d584:6a92:3e3c]) by smtp.gmail.com with ESMTPSA id v8sm289539pjr.10.2020.03.02.16.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 16:49:42 -0800 (PST) Subject: [PULL 25/38] target/riscv: Only set TB flags with FP status if enabled Date: Mon, 2 Mar 2020 16:48:35 -0800 Message-Id: <20200303004848.136788-26-palmerdabbelt@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog In-Reply-To: <20200303004848.136788-1-palmerdabbelt@google.com> References: <20200303004848.136788-1-palmerdabbelt@google.com> MIME-Version: 1.0 Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Alistair Francis , Palmer Dabbelt From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::433 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt Signed-off-by: Palmer Dabbelt --- target/riscv/cpu.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 5b889a0065..aa04e5cca7 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -332,7 +332,10 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, #ifdef CONFIG_USER_ONLY *flags = TB_FLAGS_MSTATUS_FS; #else - *flags = cpu_mmu_index(env, 0) | (env->mstatus & MSTATUS_FS); + *flags = cpu_mmu_index(env, 0); + if (riscv_cpu_fp_enabled(env)) { + *flags |= env->mstatus & MSTATUS_FS; + } #endif }