From patchwork Thu Oct 17 18:51:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176696 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1355438ill; Thu, 17 Oct 2019 12:06:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwRQEtP7DJaO2QgP07HIGT8VSST6BNGYJHriqfKHNtAcNCEvoZNAp68ib5jjk4M59/QJkX3 X-Received: by 2002:a05:620a:126e:: with SMTP id b14mr5027277qkl.470.1571339206990; Thu, 17 Oct 2019 12:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571339206; cv=none; d=google.com; s=arc-20160816; b=pQrID26yN3TkJmoTVZNkEu55L2GAzLYlYJGiV4MCQoQ9MSvTBFNyjy4mN8q6c6Xm65 AOtBzDm6zh98jP1zDZJotWQX/93ARlfHID2ZjWAxVTJMlcRtG65bq5/V1TN/IHiGdzQo 0fHDbuVXLlJ9OHv99l7Ki4RSe/XohrnWyhFlwA5WuVAuuTyDrq9eZiUfBoXNWoyCZ6rH lsrvE6Z1yelH6JGjsARxJVfK9Lv6327F5PRwEMwqW2Qh3bWTrIplceRDnk7zxMlE1Onv g7/sIq1s5dEHRA/ShvB7VBPFY2a547FDsvT1w22VnxXBL2tni4ZDl4QC7Xz1Vo+tziZx Te7Q== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Lq3/b5OXsgTHbcSMFLOFHm3tF7v/Y0wC/PpxwPnfroE=; b=aaxOgK4knO0kPG8e0qvnTybpTOD68RfKoxNy8ilhpAcNEa4uizhNIvtZ6Yv43M2qb6 4uTcFX2Em/NLTqhSqsmzWl8+2L9BJTsg4rZ9Hu5dDDg9N4CgLrlIILD5HkO0axrd5QKV oc+qUi/38Tlz2vj/xekG9bgMqQaKgucUXlEO1jvnRUUhJeEMqDnOimwab9DRgmA4KwY6 TPdJeZhrPrFs7UGIgNQbRFtQ6q1X5486jh4UgrleXPMEvAcZuLRhQore9kqBTU+O0x7t EFqcsIVtZrnCCMoIFBuUbMkT2117I9PcsKIm7xHcHYEyCWC0Qo4l3ITWcfMHPzbWYumb XXTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cEaPHjEz; 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 q4si3066214qti.68.2019.10.17.12.06.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Oct 2019 12:06:46 -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=cEaPHjEz; 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]:57238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLB6j-000210-Ve for patch@linaro.org; Thu, 17 Oct 2019 15:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35405) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLAs9-0001Kv-L9 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLAs6-0000xM-JL for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:41 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:46923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLAs6-0000vD-Ai for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:38 -0400 Received: by mail-pl1-x644.google.com with SMTP id q24so1544465plr.13 for ; Thu, 17 Oct 2019 11:51:34 -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 :mime-version:content-transfer-encoding; bh=Lq3/b5OXsgTHbcSMFLOFHm3tF7v/Y0wC/PpxwPnfroE=; b=cEaPHjEzBKKHhFV/agUkG1RKHFlmcEnQ1uYOQY+tq8Cv4Ztsxzl6dPALOqLRpHF8Tp aQVZenDLG2vL/9lsBhh0RBWkW5sWRjwcA9xcuUY79Om6+UkNYnqTnwkVUuInOq99+PLH x+1tMK0wC/ii58IOCBHl9SwHJR09nkjgdeyDpVGeLYCUxPZlDkKZ9nmTxMU7sId6LgMq S0T3QjP2ej8ygW0qx99/05/9On0Ev1rFfQYiSfszVoTFf6JYB+0Vug/C44x01OGZSmUG FiO1YUaibBQGecxfT5snuDdHzWOyIsKqdyQjQl6CB7EfQ8q3Z2b5Xo9Oekr0WTw7mcwF 7cRQ== 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:mime-version:content-transfer-encoding; bh=Lq3/b5OXsgTHbcSMFLOFHm3tF7v/Y0wC/PpxwPnfroE=; b=Z2SOTACLT2dr+nxI4eWORE6/B18Z3gDbdklrk1mgVaGeiBUgscj6lzKHf0CZZIq3Es b6O0s20MtPvi5bZQO3LA3TJNhSyqIsfLsXjTktBAchfT936V3m4K/VkTsSzD25mvDQBI NiBYNEKr7H0CqEA56HAAc8kRy/QuVDPHV47/DrRhQ0wSzreLdjZoDExwM5AGJp8sHwBS 8QYBrYxjmIPl25BHDy1hkGijdMuAXNFxRX47Zmk+6yhyB2xI+2C1VGebjkVh7jexwfjs 6cdb0TXIUX5QuYlt5Vms5koyBZPnzBBCbVQNvSgKiRHY0OLTi5ammtdfyzhMg683Axep ia2Q== X-Gm-Message-State: APjAAAUkQh375WOdZhJj+4RFwVxU3cSLUb6z3cCUxxujYT3JoxHC0lsy qdNa5qq+b4DOXgGz3WrwhKcOv+vDWQA= X-Received: by 2002:a17:902:aa02:: with SMTP id be2mr5576430plb.326.1571338293343; Thu, 17 Oct 2019 11:51:33 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id s97sm5009256pjc.4.2019.10.17.11.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 11:51:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 16/20] target/arm: Rebuild hflags at EL changes Date: Thu, 17 Oct 2019 11:51:06 -0700 Message-Id: <20191017185110.539-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017185110.539-1-richard.henderson@linaro.org> References: <20191017185110.539-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::644 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: 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. Reviewed-by: Alex Bennée 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 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 13813fb213..ab3e1a0361 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));