From patchwork Tue Sep 13 16:04:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 9329517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A5DC86089F for ; Tue, 13 Sep 2016 17:13:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91343294F2 for ; Tue, 13 Sep 2016 17:13:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85CE229582; Tue, 13 Sep 2016 17:13:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 623DD294F2 for ; Tue, 13 Sep 2016 17:13:21 +0000 (UTC) Received: from localhost ([::1]:50400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjrGq-0004GP-Iz for patchwork-qemu-devel@patchwork.kernel.org; Tue, 13 Sep 2016 13:13:20 -0400 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 Received: from isrv.corpit.ru ([86.62.121.231]:60327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjqVa-0001QF-Ny; Tue, 13 Sep 2016 12:24:30 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3F58B416E6; Tue, 13 Sep 2016 19:24:27 +0300 (MSK) Received: from gandalf (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 1B93EAFF; Tue, 13 Sep 2016 19:07:41 +0300 (MSK) Received: (nullmailer pid 31914 invoked by uid 1000); Tue, 13 Sep 2016 16:07:39 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Tue, 13 Sep 2016 19:04:54 +0300 Message-Id: <5ce747cfac697f61668ab4fa4a71c1dba15cc272.1473782118.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 15/16] target-m68k: fix get_mac_extf helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Michael Tokarev Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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;