From patchwork Fri Mar 1 20:04:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 159509 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1143142jad; Fri, 1 Mar 2019 12:08:11 -0800 (PST) X-Google-Smtp-Source: APXvYqy9d+HaD82z+Gu3Sbko74J8HH5g1nLY4+Aihkm00yIDgGmuHfrkgm0jsbo6ffs3i0Wa2eU4 X-Received: by 2002:a81:3083:: with SMTP id w125mr5155107yww.170.1551470891142; Fri, 01 Mar 2019 12:08:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551470891; cv=none; d=google.com; s=arc-20160816; b=U/86uQ3Pp4/+M+1wk9RQZQjiuNCa+r38PCH9SuP4sFv9n/l7tVjuMHOn8iNF+fzWIu yC/XUA3bHMvf72a+nhfQQ8Jnay+OTx2iStp3X3MCnAKw/LWoSZFm3m7kxZrTVQIH/EdX 4SvePplTybO+IcT6F+WY81R7tfOm2BKCcLC2eZ4DyDtViQ1RSek28y6WTTXoMp1cCpaP lwqBO7UnkX9stzbVw42Kl9s+WYv9qydZb9oF2xjx1L1bQwGNR3i9ZwD16HCrGZ2p6geA qqkCwBmZU1g/ZYBMuGZQk5PTboXRNXWdlNQcLehP9R9T8YI8bAKMnKu4i5SLqwpPpH7R lkHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=5II3W0GCv38vy4xT1Ex+ISMHLuNEGK1jNjKYydxihwE=; b=k4aTNXFtKL3XJKN9xpHYs6Ihqn1cDQar/7lpxCPmoTlu3MzZj+d+7J7GY83XAkQ/zy JHhXKo55FYIrzz46upCQ69uC/eR4FuLVaDBt4OXuPyZk6DDetWS0Z5ejF0cM+jr5Phw4 w+euRPVgWUMaoW8cno6tLcz2gAUDf905YGGxQHCcA/aOEraDNL74lJLrIqP6chnDEA+z HoCuyaYFIsw3pHZ30OSZ4zvSrQIwVsVC45JCLPARcyNXWkRuFY+xkZH69/pBJWEo5Fww xuwjDYiQzSeSZAemaWQ361ytgfw7Co1+XogqxnaVp1bB4ywIeaLyP34jSu7H74VJ6WMO 8l2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MerERbua; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 14si6726117ywr.321.2019.03.01.12.08.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Mar 2019 12:08:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MerERbua; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:43463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoS2-0006eD-Gs for patch@linaro.org; Fri, 01 Mar 2019 15:08:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzoPL-0004HR-S5 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzoPH-0001mG-T4 for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:21 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:41668) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzoPG-0001g0-CA for qemu-devel@nongnu.org; Fri, 01 Mar 2019 15:05:19 -0500 Received: by mail-pl1-x62a.google.com with SMTP id y5so11968509plk.8 for ; Fri, 01 Mar 2019 12:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5II3W0GCv38vy4xT1Ex+ISMHLuNEGK1jNjKYydxihwE=; b=MerERbuaofV26kXjUh1K6BayADEgmgDlWIYurPPlBSxNoH/lzMh0UWecdxMeInrsA6 82AlH/vRCtbgC17BeVNK9RW1c8aTRwQVZn7CqFHA+EcCf/7H9gNoNFqa0tSV7guN8zp/ jHoG8sEITstUzBn0FVXyZfYPJEtDKZpvYgU+iBrq7A7QhVlU3G+Z+NyVtRc7OIoN77S2 cL+K7jD9aBHu5YVg1tE9qJdN0H67cSZ/cFpFyb7kk3O+Vkry/9VIxtFliMnwfBt6JksK eH2z/BmSKdoX8ge0J2JGfLoNBDGt6NYJ0Yb705xfLIkx5+vG8EIvlWUMxQlagacNjiB8 uV0g== 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=5II3W0GCv38vy4xT1Ex+ISMHLuNEGK1jNjKYydxihwE=; b=fOxHAvW2HkP8Kk0uGuAqv5/2fDktSeyDhPK9PpH2ZkMSqBc31o8Or6hhn21DV4L3qh VTaezCXYTUb8SCWGeWolNayxjJtb2wNt9vk/ZpBd8u9VWaPhRhdW2p0kiUmpNG7nBHJG xA4CDQb1cQuItlajZtb9bN7PYYoBoIwCpw76iYcVeaWAOpihTwU1xv9KMVOLzIhZKOYw bwpnKksa5zyV07dMykuIJSVo8yS8rMusWc5avvywZ6LoDbHOVT3FNVLwk9Ps2YI9tDfI BTl4bA6lWaxxCc1Jxq6U7veOur9Ti7TQxd6z7m3EODxmIt7tXyRgTEHoZmclHBuiHpSB 46Zw== X-Gm-Message-State: APjAAAVkBoObMPj1O3rADOLRTUfx1QL3x4imxZitiMN4ODonHHwh/8ED JZq5DMw4CTLSTTZ7N9UWt9qfEHQlLts= X-Received: by 2002:a17:902:b416:: with SMTP id x22mr7326291plr.285.1551470711499; Fri, 01 Mar 2019 12:05:11 -0800 (PST) Received: from cloudburst.twiddle.net (cpe-72-132-238-51.dc.res.rr.com. [72.132.238.51]) by smtp.gmail.com with ESMTPSA id x8sm31869206pfn.137.2019.03.01.12.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2019 12:05:10 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2019 12:04:56 -0800 Message-Id: <20190301200501.16533-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190301200501.16533-1-richard.henderson@linaro.org> References: <20190301200501.16533-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62a Subject: [Qemu-devel] [PATCH v3 05/10] target/arm: Add set/clear_pstate_bits, share gen_ss_advance 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We do not need an out-of-line helper for manipulating bits in pstate. While changing things, share the implementation of gen_ss_advance. Signed-off-by: Richard Henderson --- v3: Assert no manual change to CACHED_PSTATE_BITS, merged in from a previously separate patch. --- target/arm/helper.h | 2 -- target/arm/translate.h | 34 ++++++++++++++++++++++++++++++++++ target/arm/op_helper.c | 5 ----- target/arm/translate-a64.c | 11 ----------- target/arm/translate.c | 11 ----------- 5 files changed, 34 insertions(+), 29 deletions(-) -- 2.17.2 diff --git a/target/arm/helper.h b/target/arm/helper.h index 6f0f386926..583adba9b0 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -77,8 +77,6 @@ DEF_HELPER_2(get_cp_reg, i32, env, ptr) DEF_HELPER_3(set_cp_reg64, void, env, ptr, i64) DEF_HELPER_2(get_cp_reg64, i64, env, ptr) -DEF_HELPER_1(clear_pstate_ss, void, env) - DEF_HELPER_2(get_r13_banked, i32, env, i32) DEF_HELPER_3(set_r13_banked, void, env, i32, i32) diff --git a/target/arm/translate.h b/target/arm/translate.h index f25fe75685..912cc2a4a5 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -202,6 +202,40 @@ static inline TCGv_i32 get_ahp_flag(void) return ret; } +/* Set bits within PSTATE. */ +static inline void set_pstate_bits(uint32_t bits) +{ + TCGv_i32 p = tcg_temp_new_i32(); + + tcg_debug_assert(!(bits & CACHED_PSTATE_BITS)); + + tcg_gen_ld_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_gen_ori_i32(p, p, bits); + tcg_gen_st_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_temp_free_i32(p); +} + +/* Clear bits within PSTATE. */ +static inline void clear_pstate_bits(uint32_t bits) +{ + TCGv_i32 p = tcg_temp_new_i32(); + + tcg_debug_assert(!(bits & CACHED_PSTATE_BITS)); + + tcg_gen_ld_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_gen_andi_i32(p, p, ~bits); + tcg_gen_st_i32(p, cpu_env, offsetof(CPUARMState, pstate)); + tcg_temp_free_i32(p); +} + +/* If the singlestep state is Active-not-pending, advance to Active-pending. */ +static inline void gen_ss_advance(DisasContext *s) +{ + if (s->ss_active) { + s->pstate_ss = 0; + clear_pstate_bits(PSTATE_SS); + } +} /* Vector operations shared between ARM and AArch64. */ extern const GVecGen3 bsl_op; diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index c5721a866d..8698b4dc83 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -861,11 +861,6 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, void *rip) return res; } -void HELPER(clear_pstate_ss)(CPUARMState *env) -{ - env->pstate &= ~PSTATE_SS; -} - void HELPER(pre_hvc)(CPUARMState *env) { ARMCPU *cpu = arm_env_get_cpu(env); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1e49d33365..eaeb43577d 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -421,17 +421,6 @@ static void gen_exception_bkpt_insn(DisasContext *s, int offset, s->base.is_jmp = DISAS_NORETURN; } -static void gen_ss_advance(DisasContext *s) -{ - /* If the singlestep state is Active-not-pending, advance to - * Active-pending. - */ - if (s->ss_active) { - s->pstate_ss = 0; - gen_helper_clear_pstate_ss(cpu_env); - } -} - static void gen_step_complete_exception(DisasContext *s) { /* We just completed step of an insn. Move from Active-not-pending diff --git a/target/arm/translate.c b/target/arm/translate.c index 61adefb328..57b1b20287 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -298,17 +298,6 @@ static void gen_exception(int excp, uint32_t syndrome, uint32_t target_el) tcg_temp_free_i32(tcg_excp); } -static void gen_ss_advance(DisasContext *s) -{ - /* If the singlestep state is Active-not-pending, advance to - * Active-pending. - */ - if (s->ss_active) { - s->pstate_ss = 0; - gen_helper_clear_pstate_ss(cpu_env); - } -} - static void gen_step_complete_exception(DisasContext *s) { /* We just completed step of an insn. Move from Active-not-pending