From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjqVg-0006VV-T4 for qemu-devel@nongnu.org; Tue, 13 Sep 2016 12:24:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjqVa-0001Xg-Vp for qemu-devel@nongnu.org; Tue, 13 Sep 2016 12:24:35 -0400 From: Michael Tokarev Date: Tue, 13 Sep 2016 19:04:54 +0300 Message-Id: <5ce747cfac697f61668ab4fa4a71c1dba15cc272.1473782118.git.mjt@msgid.tls.msk.ru> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PULL 15/16] target-m68k: fix get_mac_extf helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-trivial@nongnu.org, Michael Tokarev From: Paolo Bonzini val is assigned twice; the second one should be combined with "|". Reported by Coverity. Signed-off-by: Paolo Bonzini Signed-off-by: Michael Tokarev --- target-m68k/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-m68k/helper.c b/target-m68k/helper.c index f52d0e3..89bbe6d 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -812,7 +812,7 @@ uint32_t HELPER(get_mac_extf)(CPUM68KState *env, uint32_t acc) { uint32_t val; val = env->macc[acc] & 0x00ff; - val = (env->macc[acc] >> 32) & 0xff00; + val |= (env->macc[acc] >> 32) & 0xff00; val |= (env->macc[acc + 1] << 16) & 0x00ff0000; val |= (env->macc[acc + 1] >> 16) & 0xff000000; return val; -- 2.1.4