From patchwork Fri Jul 1 17:04:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9210255 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 64739607D6 for ; Fri, 1 Jul 2016 17:14:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50F6B28531 for ; Fri, 1 Jul 2016 17:14:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45D33286A4; Fri, 1 Jul 2016 17:14:28 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 E569F28531 for ; Fri, 1 Jul 2016 17:14:27 +0000 (UTC) Received: from localhost ([::1]:34664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ21L-0005KQ-31 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Jul 2016 13:14:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sL-0002Is-N5 for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ1sK-0005Rf-Mg for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:09 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:35151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sK-0005RJ-FB for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:08 -0400 Received: by mail-pf0-x242.google.com with SMTP id t190so10456175pfb.2 for ; Fri, 01 Jul 2016 10:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hZ1LmQxj0RL7nVN7AAKUrBRyuZH1innNy2rv7ux0v+s=; b=wnbz1T9H6zARu0czl5c1StwESwbHA5UK+1SP0YvCUkQrSrb8SHYfREG0q3/kkaTFud FIgurQ2SrSaKiEBJnFa9o6zTWcQLFUTjNuFk3zDKLGQM/mNjGWS7PCJT3Dp/FCUBOakU KHI2OhgwZzXm0dUttSA32KYfL6o81yk13drEnt1tGzgwj7oZdz1p1IZWyXdEq1qrKUyz oDzzqdXkcM4XwSS8nFD0BAAoKundDyDszJV+m2zlmCOHS+bEcMon+5mj/v9NrgVgsj8A HLWVKpp69R/oCMdI+XxZfvS5ZgGdAanGzCoP0M3hZpE8HrF7slF6Y7PXFwLOwXijfYgm V87A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=hZ1LmQxj0RL7nVN7AAKUrBRyuZH1innNy2rv7ux0v+s=; b=Par0pRlsZ3D1QQnK8O8DM0sr/tijYo6wHTjBqClTSFQsnwLW191oh5YV1kP51O9RCc M25ZAb/IuZ/bjaYnImwf0Hk746zSLPJ1UEPJsnCYrLQax1XnbD1/0n2DDwLyP36tJiu3 dhfCq9zybz0PZeXKq6WrQCjCuy+KeEOJCB5HjEfD+BD/FI5yGcR4he746yWBT1SVleh4 ChKL9EH7E1BuxLKMd8wCP4vFpiw5yhtQMgZ3r2wssVlRYSNwtSOpbXE7U7VJIHXAiByR FRiz6VNsk3pbUV5d5CKFStTBh5dQEIz7o7imlex6o+c48/zaMpD6+ZJSthIuFSME/Cbv lHDQ== X-Gm-Message-State: ALyK8tJhjjAws1TDjDDlpWE7GmdVSZIXjTupaMI1rmksssU+UKgUPYPaWkPhbh0YBu8Jeg== X-Received: by 10.98.78.18 with SMTP id c18mr33361806pfb.129.1467392707806; Fri, 01 Jul 2016 10:05:07 -0700 (PDT) Received: from bigtime.twiddle.net (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id ff9sm2652229pac.5.2016.07.01.10.05.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 10:05:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 10:04:41 -0700 Message-Id: <1467392693-22715-16-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467392693-22715-1-git-send-email-rth@twiddle.net> References: <1467392693-22715-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v2 15/27] target-i386: emulate LOCK'ed NEG using cmpxchg 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: pbonzini@redhat.com, serge.fdrv@gmail.com, cota@braap.org, alex.bennee@linaro.org, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Emilio G. Cota" [rth: Move redundant qemu_load out of cmpxchg loop.] Signed-off-by: Emilio G. Cota Message-Id: <1467054136-10430-16-git-send-email-cota@braap.org> Signed-off-by: Richard Henderson --- target-i386/translate.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 78eadee..19d6f1e 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -4713,11 +4713,41 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, } break; case 3: /* neg */ - tcg_gen_neg_tl(cpu_T0, cpu_T0); - if (mod != 3) { - gen_op_st_v(s, ot, cpu_T0, cpu_A0); + if (s->prefix & PREFIX_LOCK) { + TCGLabel *label1; + TCGv a0, t0, t1, t2; + + if (mod == 3) { + goto illegal_op; + } + a0 = tcg_temp_local_new(); + t0 = tcg_temp_local_new(); + label1 = gen_new_label(); + + tcg_gen_mov_tl(a0, cpu_A0); + tcg_gen_mov_tl(t0, cpu_T0); + + gen_set_label(label1); + t1 = tcg_temp_new(); + t2 = tcg_temp_new(); + tcg_gen_mov_tl(t2, t0); + tcg_gen_neg_tl(t1, t0); + tcg_gen_atomic_cmpxchg_tl(t0, a0, t0, t1, + s->mem_index, ot | MO_LE); + tcg_temp_free(t1); + tcg_gen_brcond_tl(TCG_COND_NE, t0, t2, label1); + + tcg_temp_free(t2); + tcg_temp_free(a0); + tcg_gen_mov_tl(cpu_T0, t0); + tcg_temp_free(t0); } else { - gen_op_mov_reg_v(ot, rm, cpu_T0); + tcg_gen_neg_tl(cpu_T0, cpu_T0); + if (mod != 3) { + gen_op_st_v(s, ot, cpu_T0, cpu_A0); + } else { + gen_op_mov_reg_v(ot, rm, cpu_T0); + } } gen_op_update_neg_cc(); set_cc_op(s, CC_OP_SUBB + ot);