From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 15 Jul 2016 15:29:22 +0000 (+0200)
Subject: target-m68k: fix get_mac_extf helper
X-Git-Tag: TizenStudio_2.0_p2.3.2~9^2~14^2~5^2~192^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ce747cfac697f61668ab4fa4a71c1dba15cc272;p=sdk%2Femulator%2Fqemu.git

target-m68k: fix get_mac_extf helper

val is assigned twice; the second one should be combined with "|".
Reported by Coverity.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

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;