From patchwork Sun Nov 13 11:32:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 125388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DFED8B6F8E for ; Sun, 13 Nov 2011 22:32:54 +1100 (EST) Received: from localhost ([::1]:54244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPYIq-0007US-02 for incoming@patchwork.ozlabs.org; Sun, 13 Nov 2011 06:32:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:47376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPYIk-0007UM-1x for qemu-devel@nongnu.org; Sun, 13 Nov 2011 06:32:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPYIi-0001dE-Vm for qemu-devel@nongnu.org; Sun, 13 Nov 2011 06:32:42 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:58063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPYIi-0001dA-QB for qemu-devel@nongnu.org; Sun, 13 Nov 2011 06:32:40 -0500 Received: by iakk32 with SMTP id k32so7168657iak.4 for ; Sun, 13 Nov 2011 03:32:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=GEDf36r0VCktY5fL4DAcgELWkQ9ViI1vyM16YCuVaO8=; b=NbTPHTrQF/lXeac1TQcJNoWgj6/WF+dqRRer2kYhPRbEj0mwDKV1f/p+HVBgFaMnkB KL+cyt6Mz5DTgImaBJMOZUOQk2b9b7L24lrYg9+wouKNJolSKd76mymzG73ogKOlsWPN nKcQZwkN9MnOU24oSOYOd1fanKTGABkUNNev4= Received: by 10.50.87.227 with SMTP id bb3mr19335577igb.29.1321183960068; Sun, 13 Nov 2011 03:32:40 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.10.194 with HTTP; Sun, 13 Nov 2011 03:32:19 -0800 (PST) From: Blue Swirl Date: Sun, 13 Nov 2011 11:32:19 +0000 Message-ID: To: Frank Mehnert , qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Subject: [Qemu-devel] [PATCH 1.0] x86: fix pcmpestrm and pcmpistrm 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 Fix obvious typos (decrement and off-by-one error) in pcmpestrm and pcmpistrm which resulted in infinite loop. Reported by Frank Mehnert, spotted also by Coverity (bug 84752853). Reported-by: Frank Mehnert Signed-off-by: Blue Swirl --- target-i386/ops_sse.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) d->Q(0) = res; @@ -2028,11 +2030,13 @@ void glue(helper_pcmpistrm, SUFFIX) (Reg *d, Reg *s, uint32_t ctrl) if ((ctrl >> 6) & 1) { if (ctrl & 1) - for (i = 0; i <= 8; i--, res >>= 1) + for (i = 0; i < 8; i++, res >>= 1) { d->W(i) = (res & 1) ? ~0 : 0; + } else - for (i = 0; i <= 16; i--, res >>= 1) + for (i = 0; i < 16; i++, res >>= 1) { d->B(i) = (res & 1) ? ~0 : 0; + } } else { d->Q(1) = 0; d->Q(0) = res; diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h index aa41d25..47dde78 100644 --- a/target-i386/ops_sse.h +++ b/target-i386/ops_sse.h @@ -1996,11 +1996,13 @@ void glue(helper_pcmpestrm, SUFFIX) (Reg *d, Reg *s, uint32_t ctrl) if ((ctrl >> 6) & 1) { if (ctrl & 1) - for (i = 0; i <= 8; i--, res >>= 1) + for (i = 0; i < 8; i++, res >>= 1) { d->W(i) = (res & 1) ? ~0 : 0; + } else - for (i = 0; i <= 16; i--, res >>= 1) + for (i = 0; i < 16; i++, res >>= 1) { d->B(i) = (res & 1) ? ~0 : 0; + } } else { d->Q(1) = 0;