]> git.proxmox.com Git - mirror_qemu.git/commitdiff
target-m68k: fix get_mac_extf helper
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 15 Jul 2016 15:29:22 +0000 (17:29 +0200)
committerMichael Tokarev <mjt@gandalf>
Tue, 13 Sep 2016 15:12:34 +0000 (18:12 +0300)
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>
target-m68k/helper.c

index f52d0e3036da8f488f8cd2dd1c1dcce915ba02cf..89bbe6dfa6fc9d52ad3cc402585af4caff5099b2 100644 (file)
@@ -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;