From patchwork Fri Apr 6 17:11:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 895781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z6zywS37"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40HmXq4Yzfz9s1R for ; Sat, 7 Apr 2018 03:15:07 +1000 (AEST) Received: from localhost ([::1]:40643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4Ux7-0001zl-JH for incoming@patchwork.ozlabs.org; Fri, 06 Apr 2018 13:15:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f4Utg-0007l6-Lx for qemu-devel@nongnu.org; Fri, 06 Apr 2018 13:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f4Utd-0007DL-KV for qemu-devel@nongnu.org; Fri, 06 Apr 2018 13:11:32 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35804) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f4Utd-00077q-D7; Fri, 06 Apr 2018 13:11:29 -0400 Received: by mail-wr0-x244.google.com with SMTP id 80so2413367wrb.2; Fri, 06 Apr 2018 10:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XrC6ffs2NSTNido4cQz5jqUpP4qAQeF0u2UPOS9ipNE=; b=Z6zywS37h+zZf9k++0HFm+qYgesR8GHyBxNbwGPmXVCcAlG7PT6PjIG/Y7iMhPMwkE LFC58vohbD82GE0Krxa9DIdN7U+SIIJkSGfeWAz74s27iSFRIneOXeXvH2dEtf5S1IdB Arlt+0HTGNDLsW5flE4A54iQiftnVWgfluY4yaSJ/Y39DttCGb0nbiTFHReyRtmHVsvB XA/6nnwWJXjYc+Mx2vha+P6y7HBQ1qPwBqjlhjyxlOoLdTkQwdqw09GP1EMA49QwGO+L 2UuzjgxJfjbD9TyRCl/MQvcaTRd1xVBzN2ZytUjQumaJqfF7c7beL/3k5kTbB9Qozy8i vMhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=XrC6ffs2NSTNido4cQz5jqUpP4qAQeF0u2UPOS9ipNE=; b=ARy7TGxXUfR38h9r5gwq1QDZX6wTIYLLf9ZGFk6UiwHA6X3yQu/NLv8u1vNE2+0Ias u2Zp2UY5STbj+KJnv9si18Bnfc19ZFxaPylmnBJQ2d8zGxX41g/QQCUZyli9ebxC7h2n 2Y84BvKRfUVQtPMos0O50B94hEGrI9pCuIvv28XihUey5p0B9C1pIrotPa/rC2jRS9sc Mb+Ay3NMypZHufoGDCCdoydgjxaZly4oHBm4Pg+7ajPyaAQ3aZ97y/BeMSL38Y4s3L5o a2ApI0QDjjj7SZs31Z7k0Q2qbMbNFFoCaR4RAmQs00tYm7obNF4UjiAL4HieQ8CpD805 WqFA== X-Gm-Message-State: AElRT7EfN1ITXVLcUj8nMVqjHUeREUTUkN+kokkzQUilImVQUy3O+PRZ vuAh67wtKYlBVf26oYzWo8tkrtNx X-Google-Smtp-Source: AIpwx48CyL4p04S8pX0PFt4K9OejjT615UClxwPj1L4247r3uM7L9OkdTawDrMj61pNTHiQJCnRtrg== X-Received: by 10.223.189.11 with SMTP id j11mr21386134wrh.49.1523034688020; Fri, 06 Apr 2018 10:11:28 -0700 (PDT) Received: from 640k.lan (94-36-194-48.adsl-ull.clienti.tiscali.it. [94.36.194.48]) by smtp.gmail.com with ESMTPSA id 24sm16286180wrt.60.2018.04.06.10.11.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Apr 2018 10:11:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 6 Apr 2018 19:11:03 +0200 Message-Id: <1523034681-33787-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523034681-33787-1-git-send-email-pbonzini@redhat.com> References: <1523034681-33787-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 02/20] target/i386: Fix andn instruction 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-stable@nongnu.org, Alexandro Sanchez Bach Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alexandro Sanchez Bach In commit 7073fbada733c8d10992f00772c9b9299d740e9b, the `andn` instruction was implemented via `tcg_gen_andc` but passes the operands in the wrong order: - X86 defines `andn dest,src1,src2` as: dest = ~src1 & src2 - TCG defines `andc dest,src1,src2` as: dest = src1 & ~src2 The following simple test shows the issue: #include #include int main(void) { uint32_t ret = 0; __asm ( "mov $0xFF00, %%ecx\n" "mov $0x0F0F, %%eax\n" "andn %%ecx, %%eax, %%ecx\n" "mov %%ecx, %0\n" : "=r" (ret)); printf("%08X\n", ret); return 0; } This patch fixes the problem by simply swapping the order of the two last arguments in `tcg_gen_andc_tl`. Reported-by: Alexandro Sanchez Bach Signed-off-by: Alexandro Sanchez Bach Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/translate.c b/target/i386/translate.c index 0135415..3b7ce92 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -3802,7 +3802,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, } ot = mo_64_32(s->dflag); gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0); - tcg_gen_andc_tl(cpu_T0, cpu_regs[s->vex_v], cpu_T0); + tcg_gen_andc_tl(cpu_T0, cpu_T0, cpu_regs[s->vex_v]); gen_op_mov_reg_v(ot, reg, cpu_T0); gen_op_update1_cc(); set_cc_op(s, CC_OP_LOGICB + ot);