From patchwork Fri Feb 12 14:34:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 8292431 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 929529F3CD for ; Fri, 12 Feb 2016 14:42:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD134203E3 for ; Fri, 12 Feb 2016 14:42:34 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 4231B203E1 for ; Fri, 12 Feb 2016 14:42:29 +0000 (UTC) Received: from localhost ([::1]:33204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUEvU-00015m-LP for patchwork-qemu-devel@patchwork.kernel.org; Fri, 12 Feb 2016 09:42:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUEqU-00018S-Ds for qemu-devel@nongnu.org; Fri, 12 Feb 2016 09:37:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUEqT-0002qN-8G for qemu-devel@nongnu.org; Fri, 12 Feb 2016 09:37:18 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:35523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUEqQ-0002p6-1Q; Fri, 12 Feb 2016 09:37:17 -0500 Received: by mail-pf0-x243.google.com with SMTP id w128so3476644pfb.2; Fri, 12 Feb 2016 06:37:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gU+yQTn56mnRlZm+IMNbBuBH+2/mqBKaEXs7+7o9Sx8=; b=z80ReV7yc5tHSO/x2MdVNFu2OhE/esPMlaLjbeueiDaroZzkG/WVYhPwZGLJrYGV3G 2GoRslXTpVU14k9WhHuDqVKIDmqvo95FTsjTVhIy7/hfLytAm9EzAv7ciCBTuRaDKH1F pEeBcjG+MSn8tm0kAMAezlI/5Tkc3op/+bwZTSMYXBO5x8IYSqq1am4+YsmwNebLLW/2 PB8FZNGzhyPlitQKxmPksTnPoL4fU5roRrB98vwgJxX1hN5UUP4L6Z4kMs055CGx+WEn eIef4sxWgAnMbtmwmDcBq4SxriTEhzpeU0/nQ+txlorkj/TgFxZdhh2LULp9P94YJHJV M3hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gU+yQTn56mnRlZm+IMNbBuBH+2/mqBKaEXs7+7o9Sx8=; b=C7Xz4w2vMCsx9IwwXmN+GrgSDuNaYaEZXE22KasivfjdgS+mKGCtzhRBKxXL9CNWH4 SRJfi/GAeT/uV9WPdFCtPerT3R0rNQHl8DtondRa0SuHeRykR2YZ1ix2X9kYhu8rfREZ QF5FxtydXaIV1Y6Sq8WQDjlPE49RYD+cAWaCkC+e1gFVd7flqAaA7UM+fVkz/ye24e8N oMNDoarN3aPa2tJsufprlmWptVKX294cKSC0Muax+MQFL065w4D8fMHgXJRymwOEr//A WxP8LnOqPi+e+RPc5GHR7loByFQx2eIxYFSDXOHTydUNXB71ToM2YQPEOHZd2sMUff8D /YhQ== X-Gm-Message-State: AG10YOTSAhZSljI7IlSED/TyOWmI9647zylRpQydfJr5lhd2klvhlzxW5XXnJqzick6vMw== X-Received: by 10.98.15.145 with SMTP id 17mr2553324pfp.19.1455287833308; Fri, 12 Feb 2016 06:37:13 -0800 (PST) Received: from localhost (ec2-52-8-89-49.us-west-1.compute.amazonaws.com. [52.8.89.49]) by smtp.gmail.com with ESMTPSA id m16sm19976134pfi.75.2016.02.12.06.37.11 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 12 Feb 2016 06:37:12 -0800 (PST) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 12 Feb 2016 15:34:02 +0100 Message-Id: <1455287642-28166-10-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455287642-28166-1-git-send-email-edgar.iglesias@gmail.com> References: <1455287642-28166-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::243 Cc: edgar.iglesias@xilinx.com, serge.fdrv@gmail.com, qemu-arm@nongnu.org, alex.bennee@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v1 9/9] target-arm: Use isyn.swstep.ex to hold the is_ldex state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Edgar E. Iglesias" Switch to using isyn.swstep.ex to hold the is_ldex state for SWStep syndrome generation. No functional change. Signed-off-by: Edgar E. Iglesias --- target-arm/translate-a64.c | 6 +++--- target-arm/translate.c | 6 +++--- target-arm/translate.h | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index 2f17cba..1d7fbcb 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -260,7 +260,7 @@ static void gen_step_complete_exception(DisasContext *s) * of the exception, and our syndrome information is always correct. */ gen_ss_advance(s); - gen_exception(EXCP_UDEF, syn_swstep(s->ss_same_el, 1, s->is_ldex), + gen_exception(EXCP_UDEF, syn_swstep(s->ss_same_el, 1, s->isyn.swstep.ex), default_exception_el(s)); s->is_jmp = DISAS_EXC; } @@ -1865,7 +1865,7 @@ static void disas_ldst_excl(DisasContext *s, uint32_t insn) if (is_excl) { if (!is_store) { - s->is_ldex = true; + s->isyn.swstep.ex = true; gen_load_exclusive(s, rt, rt2, tcg_addr, size, is_pair); } else { gen_store_exclusive(s, rs, rt, rt2, tcg_addr, size, is_pair); @@ -11127,7 +11127,7 @@ void gen_intermediate_code_a64(ARMCPU *cpu, TranslationBlock *tb) */ dc->ss_active = ARM_TBFLAG_SS_ACTIVE(tb->flags); dc->pstate_ss = ARM_TBFLAG_PSTATE_SS(tb->flags); - dc->is_ldex = false; + dc->isyn.swstep.ex = false; dc->ss_same_el = (arm_debug_target_el(env) == dc->current_el); init_tmp_a64_array(dc); diff --git a/target-arm/translate.c b/target-arm/translate.c index 0d53e7d..605d21b 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -250,7 +250,7 @@ static void gen_step_complete_exception(DisasContext *s) * of the exception, and our syndrome information is always correct. */ gen_ss_advance(s); - gen_exception(EXCP_UDEF, syn_swstep(s->ss_same_el, 1, s->is_ldex), + gen_exception(EXCP_UDEF, syn_swstep(s->ss_same_el, 1, s->isyn.swstep.ex), default_exception_el(s)); s->is_jmp = DISAS_EXC; } @@ -7431,7 +7431,7 @@ static void gen_load_exclusive(DisasContext *s, int rt, int rt2, { TCGv_i32 tmp = tcg_temp_new_i32(); - s->is_ldex = true; + s->isyn.swstep.ex = true; switch (size) { case 0: @@ -11284,7 +11284,7 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb) */ dc->ss_active = ARM_TBFLAG_SS_ACTIVE(tb->flags); dc->pstate_ss = ARM_TBFLAG_PSTATE_SS(tb->flags); - dc->is_ldex = false; + dc->isyn.swstep.ex = false; dc->ss_same_el = false; /* Can't be true since EL_d must be AArch64 */ cpu_F0s = tcg_temp_new_i32(); diff --git a/target-arm/translate.h b/target-arm/translate.h index 2130a84..d500342 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -49,11 +49,6 @@ typedef struct DisasContext { */ bool ss_active; bool pstate_ss; - /* True if the insn just emitted was a load-exclusive instruction - * (necessary for syndrome information for single step exceptions), - * ie A64 LDX*, LDAX*, A32/T32 LDREX*, LDAEX*. - */ - bool is_ldex; /* True if a single-step exception will be taken to the current EL */ bool ss_same_el; /* Bottom two bits of XScale c15_cpar coprocessor access control reg */