Message ID | 20191022133134.14487-33-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:ac9:3c86:0:0:0:0:0 with SMTP id w6csp5796269ocf; Tue, 22 Oct 2019 07:09:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFmNHt4S9JWc1D7fMm8e7LLN1pYtZ8+cIvaFmEG80TtttUg1mFS+02wKsyGw5OGW1qUQYc X-Received: by 2002:aed:2f86:: with SMTP id m6mr3529441qtd.55.1571753370105; Tue, 22 Oct 2019 07:09:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571753370; cv=none; d=google.com; s=arc-20160816; b=LTio0cYOtP6ce7zDILJ9dFQDfbQB+lKrzhQR1OlQ1jsuBySkDy4W2OY8OmsJ+PjJ/2 om8ugpXLogfQprl2L4EPWZzPphBgZUqpY2hd8oZAGnRLUPJ7NFJGEbJ+v9Z1jZXCVuVh +jxvhxpUwa9JQPRv/ZMt0w7huHmQT3dmZeRXJpOCi+Eg7pnaSR5vifa8+g/R1Pcznbej 6hd45PKM62ROKFcGBpN18VcTkt3xRJXm2VRgWokAW/GgMVxMJ2dnL6uyH75Ll++e24pc 41jmUJbEiJ1+pDVi/Oyl2K76sNE9vE9HUA/PvpUWQSKkcuNjlZlhuilrtaSaAuSRJTZZ h5Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=bAJu0HC72frNdy2Inrafd6Q3Q7w56dol34p5z07V/hc=; b=b738rNDn7rsXiL5LVrxVT8PZzQsXLGPZ2vyFLizYNXAwztHPzIKceCIGog8/GldC/a Kt8FntqmSxAb/P5hzgQ5BcYTFFcM4tWV0ZyV2dHBrysmY9Mo1L3piQ9BzCXz2yfQJOpV zabF0s54yS1WuYJ7vyxckitQf5fVi1dtYryF3JX1fzswXjaXnd7z0tY8O1D1+k8xpb1i wc4CwnzdZbdGRl4fifUwkFsn67UXzPjOW4Uf0PW7/UHVQXWop5izHrfiRiY3qCEy4hbd bpamqkYo1+AJLwGWIO3wa5uBxQsh9aDc3wyk/GSm52RsNVTWUiVlkHlaO9OPBtImbawm Supw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fx3oOz8h; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i17si18316906qti.113.2019.10.22.07.09.30 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 07:09:30 -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=pass header.i=@linaro.org header.s=google header.b=Fx3oOz8h; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1iMuqm-0005cm-NJ for patch@linaro.org; Tue, 22 Oct 2019 10:09:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37156) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1iMuHO-0003Pi-1D for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1iMuHM-0001Xp-Ut for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:53 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1iMuHM-0001XW-OB for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:52 -0400 Received: by mail-wm1-x341.google.com with SMTP id v3so4016736wmh.1 for <qemu-devel@nongnu.org>; Tue, 22 Oct 2019 06:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bAJu0HC72frNdy2Inrafd6Q3Q7w56dol34p5z07V/hc=; b=Fx3oOz8hVXmznqwlID58U5J+ECC6nChMG4dBPMtJ0XgacjN1sjv6pTt0TxXo/z/6ec I5l5eIpPMF25TeHF9+ojkmdzs3kKVsFdVHkWTQvLGLCP7elcwWcMnl0p8dNUMVWLUVer +RHwTZa05fEfEh5lqcjF8C2DBIUbHqm0HtQSI3w39eVEKs8qaByaFHdxsfrL2gzM5i0I zoB+YEE7bEzxtOBEBj9uQ2/Pz4AZsX3omG+jb+J1tmowqMApjLwb9eBc609T5nvWb+mZ OR91PqNA2iY1RACLJO8L2mFxtUkkIw2EBVMtPjUxJEibsGZpLcQsRMs0AQvi72Fxz5PT C7+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bAJu0HC72frNdy2Inrafd6Q3Q7w56dol34p5z07V/hc=; b=V3DdgqFAI56FHJB0Z3iR7izhLFOGqNWD/iOAhczP3DY+4A0wjmOrHODQ6CBKOqjrly 22q9IFy0PQpxqjx1SX2OjXySX+vk7GYFh+AZ2YFHdcUgH3nNDBcWBK/JEGJB4k0wN7hB w271geN0YgBxzaxoME/PxjdNSbjpKYsyVusKkgdwYe0ozTwj7NlBoUYxKvbV2Ph0r7k5 mZ8d9B5gqUBDg0ghOGxSE53Z+eDXW4uC4WzdOTWKZCZy2zdzyE+GSfGpbjo5ki2hhlPa 2JTTG7Dw7VqlCr0loMYR1I8F5BoeC4qxogxUz7myW3ApgMcYfZg5iVnLus5gsAAB0apR RusQ== X-Gm-Message-State: APjAAAXGSeRwPU7FkVddjvwNLVxb5mkU76FyZCPLWpNztp29DzILEIyb HL2lzXk41ReyoKdyzwYxRZbSMwz60RA= X-Received: by 2002:a1c:a9cb:: with SMTP id s194mr3311303wme.92.1571751171251; Tue, 22 Oct 2019 06:32:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.48 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:49 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 32/41] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state Date: Tue, 22 Oct 2019 14:31:25 +0100 Message-Id: <20191022133134.14487-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index c55783e5406..63815fc4cfc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11259,12 +11259,15 @@ void HELPER(rebuild_hflags_a64)(CPUARMState *env, int el) void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) { - uint32_t flags, pstate_for_ss; + uint32_t flags = env->hflags; + uint32_t pstate_for_ss; *cs_base = 0; - flags = rebuild_hflags_internal(env); +#ifdef CONFIG_DEBUG_TCG + assert(flags == rebuild_hflags_internal(env)); +#endif - if (is_a64(env)) { + if (FIELD_EX32(flags, TBFLAG_ANY, AARCH64_STATE)) { *pc = env->pc; if (cpu_isar_feature(aa64_bti, env_archcpu(env))) { flags = FIELD_DP32(flags, TBFLAG_A64, BTYPE, env->btype);