From patchwork Tue Jan 8 22:31:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 155020 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp39347jaa; Tue, 8 Jan 2019 14:43:37 -0800 (PST) X-Google-Smtp-Source: ALg8bN7+RpLIPsWqjS7Axb0qt1djmEBoe+05OSfsS6h2hl8fdCAILdOy2niG5vk1aL+RXvyH7ZAW X-Received: by 2002:adf:b243:: with SMTP id y3mr2929018wra.184.1546987417288; Tue, 08 Jan 2019 14:43:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546987417; cv=none; d=google.com; s=arc-20160816; b=OQXwDlvX05M/UOX/ndy9YkispsSpDi3zhKsem/UXV7VnYItNR6jQcTWBCkTUO48KRo zqU/TG1opf+mc6y91U2Cdd8m2xVg2ZXKkHZOLlb4V8jiiSuZCsSHFYeiPgTL8hrD+smc onuOu639FYg96PGbNFEJBRoOzZMeEC7Tm5SFGMuiSknPEHykn0HmPPUbdhiPo46ipGpz AKkodqDOqqbc5elb709uXKMWjR+jyGWyNFX8Yy27ly1cMVh/ncpJ1fCz/tEErGAzHZd5 q1Z9ZZXiEdgpM6IxlYuMY1VHJ4+kexHLFc9MYnGWavXghTDeA2g8F3aJqaQZpcIJRWYM 64GQ== 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=jUqKqF6uZxUk1yU/tgbIwMa93VE1Y7GaEYbnjg1Eu+A=; b=wnbWKLc05cfo8M+metlw4i8KOk5lWLh5g+KPIaXJzvBSYCfedsjOwD+hseg+WC2+jV /rG9O6Fp0Hdc5f4IfLmYIW4YIDfOHhNGZUIWmZoLQzbaVzZJPDSHe6VwpExpP3cIZIm4 /bgfPdCavryp2lLBfNsynir3j2b7wpkZlM8IOCuUWkPx5C612OXXGfIlx/l9sLKt4VAl jQ49WNykWkbSo8YahpmfuU7xyTtNpmWJ25ODbovoTx69yOf7Jvf2qLxqE98esydVoJUC DSYPGGzGE7aeRwkCL0NGz+HQUkLpBUMcRJWRd0xWgqfh0kimeMLAfxb5wO46LKuCyhZG FHIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=foHoYkCE; 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 n204si7563320wma.87.2019.01.08.14.43.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 08 Jan 2019 14:43:37 -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=foHoYkCE; 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]:42383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gh05w-0001Pt-85 for patch@linaro.org; Tue, 08 Jan 2019 17:43:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggzuz-0008Tw-F7 for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggzut-0004bH-KW for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:13 -0500 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:41596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggzur-0004Yt-MG for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:11 -0500 Received: by mail-pf1-x430.google.com with SMTP id b7so2607721pfi.8 for ; Tue, 08 Jan 2019 14:32:06 -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=jUqKqF6uZxUk1yU/tgbIwMa93VE1Y7GaEYbnjg1Eu+A=; b=foHoYkCET5Zmma64krME5JOQV+gLabWGQq90oY84VS/Pm9f7AdnOJVOtPVwVo0aIDg IYOWthai2ozqXiNQ1norPGjNLSS+O9qg1DPRnE2g0NILSEx7XjCcD6jxnlmpOHxpRfr5 TduWKVjt0EMKEZyKzW4iccTFAVEZJIYrDokBU= 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=jUqKqF6uZxUk1yU/tgbIwMa93VE1Y7GaEYbnjg1Eu+A=; b=fpG/C13S3sdbsRkAvmLx7MqHa0fSBIPLq/5PLNI/AasZEKF/ogwRiaRkohx0sLp0q1 Bf0S3k/WXgHuAZCdk725MlaWXvNTnj6xJyYIOr7DDDoqOOwOT99BYrKqjRPQpSh5Ej0+ qrEF1IweyEh/DnpMNiIA8/AIB8v9o7Bi93yzvk0VH6WfohaCjxaTleqtMHujuYa+On8p 6kCURpS905ONqrhy+QUAYo0FCiLrpJS/FPWPnhwTm0yPUGxh4Wt8qIVwhWHpSlXONQK9 fywcsUi5GvO9W5xpoiUq5W5MRZGFzhNDC1Ke1jiwiEZRmUcP2KQhFh49wrT+wVQ0AKsE PdUA== X-Gm-Message-State: AJcUukfyka7U22bOsEh+C5CZLPdQ9/J+ZhqXnlunku1H0uTN15qhJYML JNV3WrYTgFeHH+/PV7BF1TbixJczVgI= X-Received: by 2002:a63:e545:: with SMTP id z5mr3151921pgj.195.1546986725211; Tue, 08 Jan 2019 14:32:05 -0800 (PST) Received: from cloudburst.lan (2001-44b8-2176-c800-8cc6-2630-7d99-5ef1.static.ipv6.internode.on.net. [2001:44b8:2176:c800:8cc6:2630:7d99:5ef1]) by smtp.gmail.com with ESMTPSA id w128sm100686177pfw.79.2019.01.08.14.32.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Jan 2019 14:32:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 08:31:09 +1000 Message-Id: <20190108223129.5570-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190108223129.5570-1-richard.henderson@linaro.org> References: <20190108223129.5570-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::430 Subject: [Qemu-devel] [PATCH v3 11/31] target/arm: Add new_pc argument to helper_exception_return 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" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/helper-a64.h | 2 +- target/arm/helper-a64.c | 10 +++++----- target/arm/translate-a64.c | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) -- 2.17.2 diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 55299896c4..aff8d6c9f3 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -86,7 +86,7 @@ DEF_HELPER_2(advsimd_f16tosinth, i32, f16, ptr) DEF_HELPER_2(advsimd_f16touinth, i32, f16, ptr) DEF_HELPER_2(sqrt_f16, f16, f16, ptr) -DEF_HELPER_1(exception_return, void, env) +DEF_HELPER_2(exception_return, void, env, i64) DEF_HELPER_FLAGS_3(pacia, TCG_CALL_NO_WG, i64, env, i64, i64) DEF_HELPER_FLAGS_3(pacib, TCG_CALL_NO_WG, i64, env, i64, i64) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 66ff70dcdb..101fa6d3ea 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -925,7 +925,7 @@ static int el_from_spsr(uint32_t spsr) } } -void HELPER(exception_return)(CPUARMState *env) +void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) { int cur_el = arm_current_el(env); unsigned int spsr_idx = aarch64_banked_spsr_index(cur_el); @@ -991,9 +991,9 @@ void HELPER(exception_return)(CPUARMState *env) aarch64_sync_64_to_32(env); if (spsr & CPSR_T) { - env->regs[15] = env->elr_el[cur_el] & ~0x1; + env->regs[15] = new_pc & ~0x1; } else { - env->regs[15] = env->elr_el[cur_el] & ~0x3; + env->regs[15] = new_pc & ~0x3; } qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to " "AArch32 EL%d PC 0x%" PRIx32 "\n", @@ -1005,7 +1005,7 @@ void HELPER(exception_return)(CPUARMState *env) env->pstate &= ~PSTATE_SS; } aarch64_restore_sp(env, new_el); - env->pc = env->elr_el[cur_el]; + env->pc = new_pc; qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to " "AArch64 EL%d PC 0x%" PRIx64 "\n", cur_el, new_el, env->pc); @@ -1031,7 +1031,7 @@ illegal_return: * no change to exception level, execution state or stack pointer */ env->pstate |= PSTATE_IL; - env->pc = env->elr_el[cur_el]; + env->pc = new_pc; spsr &= PSTATE_NZCV | PSTATE_DAIF; spsr |= pstate_read(env) & ~(PSTATE_NZCV | PSTATE_DAIF); pstate_write(env, spsr); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 3f08db580b..2df2323646 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1981,6 +1981,7 @@ static void disas_exc(DisasContext *s, uint32_t insn) static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) { unsigned int opc, op2, op3, rn, op4; + TCGv_i64 dst; opc = extract32(insn, 21, 4); op2 = extract32(insn, 16, 5); @@ -2011,7 +2012,11 @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_start(); } - gen_helper_exception_return(cpu_env); + dst = tcg_temp_new_i64(); + tcg_gen_ld_i64(dst, cpu_env, + offsetof(CPUARMState, elr_el[s->current_el])); + gen_helper_exception_return(cpu_env, dst); + tcg_temp_free_i64(dst); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_end(); }