From patchwork Wed Jan 11 20:19:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 9511211 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 90DA3606E1 for ; Wed, 11 Jan 2017 20:30:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D53728694 for ; Wed, 11 Jan 2017 20:30:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E10A28697; Wed, 11 Jan 2017 20:30:09 +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 C040328694 for ; Wed, 11 Jan 2017 20:30:06 +0000 (UTC) Received: from localhost ([::1]:56880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRPX3-0006zo-SD for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Jan 2017 15:30:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRPNs-0006Ke-VM for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRPNr-0000vU-Un for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:36 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cRPNr-0000vC-I4 for qemu-devel@nongnu.org; Wed, 11 Jan 2017 15:20:35 -0500 Received: by mail-wm0-x241.google.com with SMTP id l2so566593wml.2 for ; Wed, 11 Jan 2017 12:20:35 -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 :in-reply-to:references; bh=LprzCQYUcglIpaKB793BDazwSolYTWxWz274meKRI+0=; b=rJQoDfLUtfnRc94nsu/nWXDLSemClW7qnKKBNPdI7fDJmlBu2QNE7sCdeWYu7mZfIZ ebB6n6qun6Qstft/exWfCqE9eywr3ohXmK1o48FWspKq47B9wBCybswU6T/QiKbqx8J2 nDSBjm7bOAB9jk782rBLWvgPZ5KMMS92cwjVVpfxSOH/oZoJciPSvIIvzWamHXzbjvmp x/Xjndku48tuHopDu1qDp0Ol9chLbfrQ1Fg8Fau2KoyF5yE2hnV9G+Il0FShQRLEtQ/z YQgcHx7sSMrKtSPL6n3t3gjQMIfXa3S1PFY7bpGQY1WkgH72gHbEiCNbUy9+fR9Fnmr9 aLGg== 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:in-reply-to:references; bh=LprzCQYUcglIpaKB793BDazwSolYTWxWz274meKRI+0=; b=kDpzCKaHpJCr1oJVIjOP2lApdyfoWc+NKuoqNQvSiAO8w/9QeX+zOoBlb9h4Aj/ECN cU5OtKW5JAWx9Vs52CllWHl0ODvupxp47k4/iLVxrO7CxqXLaeJ6QvYdw2f3iXKCOCwV kTr/u0qjEsJl4L1IMim97IJS6qEBqOwgXIxbX1spiZqgoHdYNBbEjJokkjiyTyX19RKi I3EP8nP7hnFMWLjYI4vKORIfbHNNOwoiaBOGlsBT5wnstkOgohQQ4WvKFlPDOxMVCToh YfU9AZmfVX0LlWB2oLK7YGb0U2vsV8WG+6uWsEtPtCtvdxQUQ/m05UZBcUe5crpNLTHy DjHw== X-Gm-Message-State: AIkVDXIOljXJ0EWKT0BHwz51nxBNsboR0wsBifGbg8H//C773hyxoK56zxNvCr79X0d8AQ== X-Received: by 10.28.185.193 with SMTP id j184mr988514wmf.86.1484166034589; Wed, 11 Jan 2017 12:20:34 -0800 (PST) Received: from localhost (x55b4b54a.dyn.telefonica.de. [85.180.181.74]) by smtp.gmail.com with ESMTPSA id o132sm10604186wmo.17.2017.01.11.12.20.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jan 2017 12:20:33 -0800 (PST) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Wed, 11 Jan 2017 21:19:33 +0100 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH v2 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 , Artyom Tarasenko , Richard Henderson 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 e0b2806..68e39bc 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -667,6 +667,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) @@ -733,6 +738,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, @@ -742,7 +749,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 2205f89..0b0cde1 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;