From patchwork Tue Jun 2 08:05:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kletzander X-Patchwork-Id: 479311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6C7E1140F91 for ; Tue, 2 Jun 2015 18:06:18 +1000 (AEST) Received: from localhost ([::1]:56549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzhDE-0002rr-C1 for incoming@patchwork.ozlabs.org; Tue, 02 Jun 2015 04:06:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzhCq-0002aK-Bh for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzhCl-00020O-Jv for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzhCl-000203-FF; Tue, 02 Jun 2015 04:05:47 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id C77033679FD; Tue, 2 Jun 2015 08:05:46 +0000 (UTC) Received: from wheatley.brq.redhat.com (dhcp129-92.brq.redhat.com [10.34.129.92]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5285joJ020907; Tue, 2 Jun 2015 04:05:45 -0400 From: Martin Kletzander To: qemu-devel@nongnu.org Date: Tue, 2 Jun 2015 10:05:29 +0200 Message-Id: <1433232329-14983-1-git-send-email-mkletzan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-trivial@nongnu.org, Peter Maydell Subject: [Qemu-devel] [PATCH] arm: Fix invalid assert logic in op_helper.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Boolean value '!arm_current_el(env)' can never be equal to 3. Fix it according to the comment above as currently the build fails with gcc-5.1.0. Signed-off-by: Martin Kletzander --- target-arm/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 3f5b9ab5963b..7583ae71217b 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -421,7 +421,7 @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome) /* Requesting a trap to EL2 when we're in EL3 or S-EL0/1 is * a bug in the access function. */ - assert(!arm_is_secure(env) && !arm_current_el(env) == 3); + assert(!arm_is_secure(env) && arm_current_el(env) != 3); target_el = 2; break; case CP_ACCESS_TRAP_EL3: