From patchwork Tue Dec 2 22:31:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 417160 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 E8CAE1401B5 for ; Wed, 3 Dec 2014 09:32:13 +1100 (AEDT) Received: from localhost ([::1]:38998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvvzO-0003U9-Bl for incoming@patchwork.ozlabs.org; Tue, 02 Dec 2014 17:32:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvvz2-0003D1-U6 for qemu-devel@nongnu.org; Tue, 02 Dec 2014 17:31:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xvvyv-0008Rp-1L for qemu-devel@nongnu.org; Tue, 02 Dec 2014 17:31:48 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:44129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xvvyu-0008RT-S9 for qemu-devel@nongnu.org; Tue, 02 Dec 2014 17:31:40 -0500 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Xvvys-0003Uz-Dd from Maciej_Rozycki@mentor.com ; Tue, 02 Dec 2014 14:31:38 -0800 Received: from localhost (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 2 Dec 2014 22:31:36 +0000 Date: Tue, 2 Dec 2014 22:31:33 +0000 From: "Maciej W. Rozycki" To: Message-ID: User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Cc: Leon Alrae , Aurelien Jarno Subject: [Qemu-devel] [PATCH] target-mips: Fix DisasContext's ulri member initialization 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 Set DisasContext's ulri member to 0 or 1 as with other bool members. Signed-off-by: Maciej W. Rozycki Reviewed-by: Leon Alrae --- qemu-mips-disas-ulri.diff Index: qemu-git-trunk/target-mips/translate.c =================================================================== --- qemu-git-trunk.orig/target-mips/translate.c 2014-12-02 21:28:17.528936640 +0000 +++ qemu-git-trunk/target-mips/translate.c 2014-12-02 21:28:41.028928249 +0000 @@ -19114,7 +19114,7 @@ gen_intermediate_code_internal(MIPSCPU * ctx.bp = (env->CP0_Config3 >> CP0C3_BP) & 1; /* Restore delay slot state from the tb context. */ ctx.hflags = (uint32_t)tb->flags; /* FIXME: maybe use 64 bits here? */ - ctx.ulri = env->CP0_Config3 & (1 << CP0C3_ULRI); + ctx.ulri = (env->CP0_Config3 >> CP0C3_ULRI) & 1; restore_cpu_state(env, &ctx); #ifdef CONFIG_USER_ONLY ctx.mem_idx = MIPS_HFLAG_UM;