From patchwork Mon Oct 24 17:39:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 686081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3t2kry1Mr4z9srZ for ; Tue, 25 Oct 2016 05:12:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=RBaQSWdA; dkim-atps=neutral Received: from localhost ([::1]:48710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byjjK-0005n3-P0 for incoming@patchwork.ozlabs.org; Mon, 24 Oct 2016 14:12:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byjEI-0002Zy-HP for qemu-devel@nongnu.org; Mon, 24 Oct 2016 13:40:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byjEH-0005XM-Q2 for qemu-devel@nongnu.org; Mon, 24 Oct 2016 13:40:10 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:34198) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1byjEH-0005W8-HF for qemu-devel@nongnu.org; Mon, 24 Oct 2016 13:40:09 -0400 Received: by mail-pf0-x243.google.com with SMTP id 128so17138225pfz.1 for ; Mon, 24 Oct 2016 10:40:09 -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=Fzb0ufHpFRDcg8Bg0UxEC2cSWiFyErD0DgVDLUwgNkk=; b=RBaQSWdAv+UCT4DoRdCfbFNuDUeVSrcrKI4Xw0m+RRavWhqPbcmsKQjJ22AdQG+l+X dwyOueV+c+gYcU4poDf3+N7BKwpha2ZA3DDQBJW/VylfqgEPBFq4C0IMt7QaYpmWknOg sIAeDE2AJAa4N5s7p4oqgpafuzkNvChvYg8cXprR/7ojAOXZcog2vhxJNNu3bgK93rH9 Lwssex9a7X3v7TTsIL1WUXvymEVb0+V976QVVTeKi8raaFQa99CN/UkYB+uH4Ccjb1cI sUnFIrN8abZSNuDW4qZCHj0tWa1VqwocfWj+SpvC/sjnmq0oX7czgeIKnK0ZAyw873p5 xQDQ== 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=Fzb0ufHpFRDcg8Bg0UxEC2cSWiFyErD0DgVDLUwgNkk=; b=SOBQhZFgdQHwoMS7X0Q1XtgPjEOEOXicg3iRIc5bABWSOUhPQ4gvvUtd0l8x28DHrn CLhsS93gZeTcmHH8kwL43LicemkTkk34FEzYStuZm9cRa7eXkmyrndAKdhXNnK+Aj9YC YGmoZbdAPp2QGkOdbqjoVAhZygcgFc4QxpT4RO6UHBpBRaUrBjzS5ILW4IsbZioYwXAo AAEj5+RaO9ox4UX75vm1CytQdUz21bu68t2ERcXc2MUmnZBGQe0p3iVzAuqF+W88sWEm +5LA25Tg3alEwExfYiZu9AL2ARwt1IXHNQ/ZspViShNf5k6QRug0f165QQHDDeB+QHdT 9dog== X-Gm-Message-State: ABUngveO9JNJgQ3oV7X9oDzg/on6RDwXLK19nDaTzPtk5rSzx8EgwRMYWf4xJAljGII6cA== X-Received: by 10.99.241.17 with SMTP id f17mr25717987pgi.175.1477330807962; Mon, 24 Oct 2016 10:40:07 -0700 (PDT) Received: from bigtime.twiddle.net (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id c15sm26908312pfd.53.2016.10.24.10.40.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2016 10:40:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Oct 2016 10:39:34 -0700 Message-Id: <1477330788-14996-24-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477330788-14996-1-git-send-email-rth@twiddle.net> References: <1477330788-14996-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::243 Subject: [Qemu-devel] [PATCH v8 23/37] 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: peter.maydell@linaro.org, cota@braap.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 6d71564..d2edbd9 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -4712,11 +4712,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);