From patchwork Wed Jan 18 22:38:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 9524877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CC59E6020B for ; Wed, 18 Jan 2017 22:42:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDE6728540 for ; Wed, 18 Jan 2017 22:42:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B131C28639; Wed, 18 Jan 2017 22:42:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 30F6F28540 for ; Wed, 18 Jan 2017 22:42:26 +0000 (UTC) Received: from localhost ([::1]:44792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTyvx-0000DP-2w for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Jan 2017 17:42:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTysp-0006Gn-Q1 for qemu-devel@nongnu.org; Wed, 18 Jan 2017 17:39:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTysn-0002WW-DJ for qemu-devel@nongnu.org; Wed, 18 Jan 2017 17:39:11 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cTysn-0002WF-6x for qemu-devel@nongnu.org; Wed, 18 Jan 2017 17:39:09 -0500 Received: by mail-wm0-x244.google.com with SMTP id c85so7555544wmi.1 for ; Wed, 18 Jan 2017 14:39:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i+SdjefrIEFcAwJbEUUJFXxziaV0tqrRHKzaF36z+Cc=; b=Om7HSXeroHWHxDPil5NeD5Pl0cdqp555qWmNodldNVlwt3QDQOZywGucenNWK+mbl/ PddxOj9sQ4vUHOgqZ7ylfIzf6E3LKQOs7/2aExtMRmf0oID7hCxPEqtruI6R+tYRZaPa RnIbQ4/rvPcLgBSqLmIfs9eREkmhm7lI3+SfSw665oBVfsILSEVY8YiaBHFGtxWDu2Kb idW7gGkEDf7bVpsR/L9nQaJvpUjIg5AEl+WJ1H9HDPA+b5BqyFnKVY5vBHbagIYs++Lg nWkne0GibAEyh3sR9Un2/m4Ett06yU+qVe3YPbSpLOtz0BatHe+BLuYxg/2nV1SyLPwq bi7A== 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=i+SdjefrIEFcAwJbEUUJFXxziaV0tqrRHKzaF36z+Cc=; b=CGZLWCTKNJBnZq8I2+QEYFTXK7xR1uwNmGQfy5t3umxI0p8HoBmQL6Jch7pKaTRSFA N7pPCa+MFBFwgtoO5gVRkEdfhuJCZdSwO5/Ug7kGOEyXpXnEZJggRmLTg9oyYG0TMxkW lohmJXGJrwI4UMCRX5pGWPfyBDz8vvG8rEaajQ0P5agh4xkSbClgd3Eo8kR4cYqIEcF7 BAiE2wcdiM2zWxl6eiqk7h1e4jJJhJNOrI4zW1j3BNjswfRl2XciaJdjjnxRWk+pcNke eSWQnbu8dWHO/o/n/RlJOM5aBc+TBZgdTNVD4LKrn00nFGznWuV/YIqeN1JZ21JzNta1 RmcQ== X-Gm-Message-State: AIkVDXJ/CPKfXWzLx/ZXsMijfp/2rsp3VXz+j0kxXFJ6RNxkHNj6p/oUVZvf5E9iQGayFA== X-Received: by 10.28.127.13 with SMTP id a13mr4364090wmd.96.1484779148093; Wed, 18 Jan 2017 14:39:08 -0800 (PST) Received: from localhost (x4e33e2b8.dyn.telefonica.de. [78.51.226.184]) by smtp.gmail.com with ESMTPSA id r6sm7961963wmd.4.2017.01.18.14.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jan 2017 14:39:07 -0800 (PST) From: Artyom Tarasenko To: peter.maydell@linaro.org Date: Wed, 18 Jan 2017 23:38:15 +0100 Message-Id: <1484779123-18968-3-git-send-email-atar4qemu@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484779123-18968-1-git-send-email-atar4qemu@gmail.com> References: <1484779123-18968-1-git-send-email-atar4qemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 02/30] target-sparc: store cpu super- and hypervisor flags in TB 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: mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org, Artyom Tarasenko , rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Suggested-by: Richard Henderson Signed-off-by: Artyom Tarasenko --- target/sparc/cpu.h | 17 +++++++++++++++++ target/sparc/translate.c | 24 +++++++++++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index e815a19..1e65c94 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -670,6 +670,11 @@ static inline int cpu_supervisor_mode(CPUSPARCState *env1) { return env1->pstate & PS_PRIV; } +#else +static inline int cpu_supervisor_mode(CPUSPARCState *env1) +{ + return env1->psrs; +} #endif static inline int cpu_mmu_index(CPUSPARCState *env, bool ifetch) @@ -736,6 +741,8 @@ trap_state* cpu_tsptr(CPUSPARCState* env); #define TB_FLAG_MMU_MASK 7 #define TB_FLAG_FPU_ENABLED (1 << 4) #define TB_FLAG_AM_ENABLED (1 << 5) +#define TB_FLAG_SUPER (1 << 6) +#define TB_FLAG_HYPER (1 << 7) #define TB_FLAG_ASI_SHIFT 24 static inline void cpu_get_tb_cpu_state(CPUSPARCState *env, target_ulong *pc, @@ -745,7 +752,17 @@ static inline void cpu_get_tb_cpu_state(CPUSPARCState *env, target_ulong *pc, *pc = env->pc; *cs_base = env->npc; flags = cpu_mmu_index(env, false); +#ifndef CONFIG_USER_ONLY + if (cpu_supervisor_mode(env)) { + flags |= TB_FLAG_SUPER; + } +#endif #ifdef TARGET_SPARC64 +#ifndef CONFIG_USER_ONLY + if (cpu_hypervisor_mode(env)) { + flags |= TB_FLAG_HYPER; + } +#endif if (env->pstate & PS_AM) { flags |= TB_FLAG_AM_ENABLED; } diff --git a/target/sparc/translate.c b/target/sparc/translate.c index ead585e..729f4e2 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -72,9 +72,16 @@ typedef struct DisasContext { target_ulong jump_pc[2]; /* used when JUMP_PC pc value is used */ int is_br; int mem_idx; - int fpu_enabled; - int address_mask_32bit; - int singlestep; + bool fpu_enabled; + bool address_mask_32bit; + bool singlestep; +#ifndef CONFIG_USER_ONLY + bool supervisor; +#ifdef TARGET_SPARC64 + bool hypervisor; +#endif +#endif + uint32_t cc_op; /* current CC operation */ struct TranslationBlock *tb; sparc_def_t *def; @@ -283,10 +290,11 @@ static void gen_move_Q(DisasContext *dc, unsigned int rd, unsigned int rs) #define hypervisor(dc) 0 #endif #else -#define supervisor(dc) (dc->mem_idx >= MMU_KERNEL_IDX) #ifdef TARGET_SPARC64 -#define hypervisor(dc) (dc->mem_idx == MMU_HYPV_IDX) +#define hypervisor(dc) (dc->hypervisor) +#define supervisor(dc) (dc->supervisor | dc->hypervisor) #else +#define supervisor(dc) (dc->supervisor) #endif #endif @@ -5710,9 +5718,15 @@ void gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb) dc->fpu_enabled = tb_fpu_enabled(tb->flags); dc->address_mask_32bit = tb_am_enabled(tb->flags); dc->singlestep = (cs->singlestep_enabled || singlestep); +#ifndef CONFIG_USER_ONLY + dc->supervisor = (tb->flags & TB_FLAG_SUPER) != 0; +#endif #ifdef TARGET_SPARC64 dc->fprs_dirty = 0; dc->asi = (tb->flags >> TB_FLAG_ASI_SHIFT) & 0xff; +#ifndef CONFIG_USER_ONLY + dc->hypervisor = (tb->flags & TB_FLAG_HYPER) != 0; +#endif #endif num_insns = 0;