Message ID | 20181213145445.17935-32-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 619959c3583dad325c36f09ce670e7d091382cae |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp917244ljp; Thu, 13 Dec 2018 07:13:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/WTuK77SswP9kMKixu9p7nvxuKLLa4hmBdssvKndY/dCrrqYrHTyvo5TvInLSPUIPtyCTzq X-Received: by 2002:ac8:2472:: with SMTP id d47mr24158132qtd.7.1544714025022; Thu, 13 Dec 2018 07:13:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544714025; cv=none; d=google.com; s=arc-20160816; b=uVzoYah4fivhOfbm/2Jhi2Gj/VHzwHIp7lUoQ/6mDHQ3lXKp/dkbqOYMIVMMXjKoWd e9C0Olpy4Urtnb3umuXLw2XSYFdYbPJPTvg5nAQdZae92JAJ0lejGqcYrOeGaMcWD85h 64guRYhIRgR39xNQ72hmaY7kTsFkPRaF7C8+ONSOvsSzjlIi7UF+3QLuwn/ey4W3dP1n bxpedGJlc+9V67Z+j4ZQl62QyX1zftbxKSYF5m9Lxfd1xXy87bcdZOynC8pYIAYANf3r etzm9UutvZvTV5sga5eQW+yDEz7OT7t2jPDr3wxH3owopwCs81JVMyS5qrYZyA2b2qv/ 9Z0Q== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=OeCoORcMy1xERNPaVbFhLscnmdFAUVuVp0RuKrlRIZo=; b=XXQELU/+1Ttq2qQiqFD8tbF/j5aEMOnLT7rB+BL8/1/GiHznk8Sf1ezGnCztzSHS96 PTu9oMIVLPRCJkMXiR3I5rS4Zsm5fOf+brYQLcJWIB9L+Bzg/0SXimBUQIpEkC2981iS 2MAZApckF72ytKoKUqqVZdG0/fuUl4aspInyfXp1IsxtzSJ9j+m61yM4DaQ/POfbgdqs 2gMnAgI5SuiOacZTlK50KgvvjAsGeGVURxWu4CI8talHZkz/GNpB1C42JH6ss9TlPA43 5JPAx9WggGo1lWcpnuFrT7AGPr3Np7C427sRgDxIAEsBKOKkOmRreXtSTmqLmCuiq70R FCPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y52si1194942qty.161.2018.12.13.07.13.44 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 07:13:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:53181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXSgK-00054j-EW for patch@linaro.org; Thu, 13 Dec 2018 10:13:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSOW-0004TP-3d for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:55:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSOR-0007au-TH for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:55:18 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:53508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSOR-00071P-3o for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:55:15 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gXSOE-0007MS-Id for qemu-devel@nongnu.org; Thu, 13 Dec 2018 14:55:02 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 14:54:39 +0000 Message-Id: <20181213145445.17935-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181213145445.17935-1-peter.maydell@linaro.org> References: <20181213145445.17935-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 31/37] target/arm: Fix HCR_EL2.TGE check in arm_phys_excp_target_el X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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: <http://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 04c4a91b04c..bf020364e1d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6537,9 +6537,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx, break; }; - /* If HCR.TGE is set then HCR is treated as being 1 */ - hcr |= ((env->cp15.hcr_el2 & HCR_TGE) == HCR_TGE); - /* Perform a table-lookup for the target EL given the current state */ target_el = target_el_table[is64][scr][rw][hcr][secure][cur_el];