From patchwork Fri Oct 11 15:55:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176001 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp976101ill; Fri, 11 Oct 2019 09:24:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNFvdY7aIYm0IRUhB5XCgHu2F6f1b1IqSJqM16Xpj1FQBc3AHYCUyW0Nca5s639kfWr8+3 X-Received: by 2002:a37:614e:: with SMTP id v75mr16973574qkb.166.1570811063443; Fri, 11 Oct 2019 09:24:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570811063; cv=none; d=google.com; s=arc-20160816; b=NbYXNGJfB8/b58d5U8ieklQVk4jXyeGtWJix7+7ic1dnry85PEBT/LPz3iRxeYsUJZ OFRMpTvElTs5ZJpOje2eytrkvP3iSyn4FLrngux10NbwNvuFRnpN3kWnXe0M/xhhzJt+ Jd05oYbX7HiHqVwBgz/Qfu+n/cKSxuqxXT31V2WHaJ7A1M3mY890NKz4IIglTZD4Aflh 8aGpfM7ChUw4YdXohbe6HxfB/fSPBYYXbK8+OOlGa/5KiPaiWyXVzEfxYZMbyGVvioer xBcCLLm2TgdjgIIn3F3plet0VlZEFdLqZVCh7l2M5LL5eFMl2bQUPezClFj6zV0LmBXj EBuw== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=ALPpYr32kDp1ytFcWYZfVKvxKTo3nP4X483s1waY7YI=; b=XRBhi824cc99s7M1OO5xk4VANn2FgD0aScoMlorxP36LMETehwhqllnJdI2OPqxpQ+ /cVWnynkMoF3mrp9hj6+3LjtzvB1zuveHBue3tKIcZSo6wkTMGNl9rbAjWCksMNgaCOk h6Uh50mN7UxrV+5XcHOQLwxCetgxJA9CnadDnyTph4Uw530Ej6xDPuMp39WOxYvWGBfk x5xMLR3rM1V90HKb4y8pls/zX21LgRNmjrWpPaVL9qe3o536RBLJMxlkT/6qfUHqKZY+ IGVcSDyta1DOtfG69b8W6t3Tzuml8D9LL1wRUCViLn3wFUSgsM6ZwurcT9rQ6qYdE5hx 0uUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=p+a2RbvW; 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 x43si9593000qvf.57.2019.10.11.09.24.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Oct 2019 09:24:23 -0700 (PDT) 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=p+a2RbvW; 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 ([::1]:53736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxiI-00015y-Ju for patch@linaro.org; Fri, 11 Oct 2019 12:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxH0-0002i9-4e for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:56:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxGx-0007o9-Ok for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:56:09 -0400 Received: from mail-yb1-xb43.google.com ([2607:f8b0:4864:20::b43]:38344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iIxGx-0007nt-Ky for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:56:07 -0400 Received: by mail-yb1-xb43.google.com with SMTP id r68so3254204ybf.5 for ; Fri, 11 Oct 2019 08:56:07 -0700 (PDT) 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=ALPpYr32kDp1ytFcWYZfVKvxKTo3nP4X483s1waY7YI=; b=p+a2RbvWCC2j7OSyXcBZbKEeDC2pvN+BnPhCoYPrQtgn0NCDdffUgrWvuzbEJqEiHd Yb72S8SnCmZgzzbYiK4kP57NrgTzhjpPGLV2Ln380+0y7TTZMAueyUf2mhXWHHe4FyDZ F7CYVhN1gIqOTSzxJ/d2xv9Cs7IjczZ8gjgoKx7fqZgwBEV/LQX2XOarbJDJdHLIFjDT 20GTr+4Xx3fhvfEJdaqfMjaF6v48e/o8UEfLhfNdLKEHxOOTJOtYCTJkkr8x/OuUrDj+ GQ4ntR+1XxXBC33tiL/a3nR6iAFPP4T/hKELuoRDCoxri50WXZh4H+q5E8V9FfSx5+md pGig== 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=ALPpYr32kDp1ytFcWYZfVKvxKTo3nP4X483s1waY7YI=; b=ayZLGiGOYIzMpHz/KyHxNo5rMc+TI43UxAEbwDire3C/WbB+OeTEiWk8QuOx89Msh/ JO1+gbLPHan+Afbyy/G1SGpZnT3EbCBJFE/TJvnhM5XMfOlCV6VLYf3nBQMc7JCwAd3x tg4TaIt+bT8dvQsPtv/xx3c48aLdqmPzjEdfYPXek2WkDVqTwxpMAz0W/SrEiKsXp4jJ QycJtYT/ydwm6z1i0857WEfpnw4N4dD01PaFZxX9QCmpyP0hZ176CXruY80P5HYAbyoG VYhN0c8IXmMVrEqU7JgsHMortPJFt9gSiioRkXuW6/wnnbABmAZbj7d9efi33kQ6pm17 6G6A== X-Gm-Message-State: APjAAAW6UTJPrHCTtr41sOo4m17ucrSUOiCFOR+aW5t50hYis4UbBJJi d4XWG21XmDE70UGIHNhxutbKGvdGu0A= X-Received: by 2002:a25:d4a:: with SMTP id 71mr10604797ybn.311.1570809366729; Fri, 11 Oct 2019 08:56:06 -0700 (PDT) Received: from cloudburst.gateway.pace.com (67.216.151.25.pool.hargray.net. [67.216.151.25]) by smtp.gmail.com with ESMTPSA id d17sm2473139ywb.95.2019.10.11.08.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 08:56:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 16/20] target/arm: Rebuild hflags at EL changes Date: Fri, 11 Oct 2019 11:55:42 -0400 Message-Id: <20191011155546.14342-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011155546.14342-1-richard.henderson@linaro.org> References: <20191011155546.14342-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::b43 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent.desnogues@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Begin setting, but not relying upon, env->hflags. Signed-off-by: Richard Henderson --- linux-user/syscall.c | 1 + target/arm/cpu.c | 1 + target/arm/helper-a64.c | 3 +++ target/arm/helper.c | 2 ++ target/arm/machine.c | 1 + target/arm/op_helper.c | 1 + 6 files changed, 9 insertions(+) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e2af3c1494..ebefd05140 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9982,6 +9982,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, aarch64_sve_narrow_vq(env, vq); } env->vfp.zcr_el[1] = vq - 1; + arm_rebuild_hflags(env); ret = vq * 16; } return ret; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 2399c14471..d043e75166 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -406,6 +406,7 @@ static void arm_cpu_reset(CPUState *s) hw_breakpoint_update_all(cpu); hw_watchpoint_update_all(cpu); + arm_rebuild_hflags(env); } bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt_request) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index bca80bdc38..b4cd680fc4 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -1025,6 +1025,7 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) } else { env->regs[15] = new_pc & ~0x3; } + helper_rebuild_hflags_a32(env, new_el); qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to " "AArch32 EL%d PC 0x%" PRIx32 "\n", cur_el, new_el, env->regs[15]); @@ -1036,10 +1037,12 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) } aarch64_restore_sp(env, new_el); env->pc = new_pc; + helper_rebuild_hflags_a64(env, new_el); 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); } + /* * Note that cur_el can never be 0. If new_el is 0, then * el0_a64 is return_to_aa64, else el0_a64 is ignored. diff --git a/target/arm/helper.c b/target/arm/helper.c index b2d701cf00..aae7b62458 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7998,6 +7998,7 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode, env->regs[14] = env->regs[15] + offset; } env->regs[15] = newpc; + arm_rebuild_hflags(env); } static void arm_cpu_do_interrupt_aarch32_hyp(CPUState *cs) @@ -8345,6 +8346,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) pstate_write(env, PSTATE_DAIF | new_mode); env->aarch64 = 1; aarch64_restore_sp(env, new_el); + helper_rebuild_hflags_a64(env, new_el); env->pc = addr; diff --git a/target/arm/machine.c b/target/arm/machine.c index 5c36707a7c..eb28b2381b 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -756,6 +756,7 @@ static int cpu_post_load(void *opaque, int version_id) if (!kvm_enabled()) { pmu_op_finish(&cpu->env); } + arm_rebuild_hflags(&cpu->env); return 0; } diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 0fd4bd0238..ccc2cecb46 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -404,6 +404,7 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) * state. Do the masking now. */ env->regs[15] &= (env->thumb ? ~1 : ~3); + arm_rebuild_hflags(env); qemu_mutex_lock_iothread(); arm_call_el_change_hook(env_archcpu(env));