From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59153)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1YzhHc-0006YQ-FD
	for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:10:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1YzhHY-00047o-06
	for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:10:47 -0400
Received: from mail-ie0-f172.google.com ([209.85.223.172]:34368)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1YzhHX-00047Z-Sk
	for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:10:43 -0400
Received: by ieczm2 with SMTP id zm2so127612673iec.1
	for <qemu-devel@nongnu.org>; Tue, 02 Jun 2015 01:10:43 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <1433232329-14983-1-git-send-email-mkletzan@redhat.com>
References: <1433232329-14983-1-git-send-email-mkletzan@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 2 Jun 2015 09:10:23 +0100
Message-ID: <CAFEAcA9ggEPZyuVs66bT5Omte8gdkDv8Fdz1nSW9LuEDa6Z_vQ@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH] arm: Fix invalid assert logic in
	op_helper.c
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>
To: Martin Kletzander <mkletzan@redhat.com>
Cc: QEMU Trivial <qemu-trivial@nongnu.org>, QEMU Developers <qemu-devel@nongnu.org>

On 2 June 2015 at 09:05, Martin Kletzander <mkletzan@redhat.com> wrote:
> 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 <mkletzan@redhat.com>
> ---
>  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:

Thanks, but there are already two versions of this patch on the list.

-- PMM