From patchwork Fri Jul 1 17:04:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9210277 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 9C17D607D6 for ; Fri, 1 Jul 2016 17:23:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B0FD285BA for ; Fri, 1 Jul 2016 17:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FD8B286C6; Fri, 1 Jul 2016 17:23:21 +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 EE6E4285BA for ; Fri, 1 Jul 2016 17:23:20 +0000 (UTC) Received: from localhost ([::1]:34712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ29w-0008ID-3N for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Jul 2016 13:23:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sP-0002Nj-39 for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ1sK-0005RB-0s for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:11 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:35851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sJ-0005Ql-QC for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:07 -0400 Received: by mail-pf0-x243.google.com with SMTP id i123so10452566pfg.3 for ; Fri, 01 Jul 2016 10:05:07 -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=tdbJSMX9Fus86Y7Ia87DC8LzbbawiOKpDxBY3f5AkN4=; b=Ptxg9JBrV+ym3kcpJdbQWkxg0R5GtLft+V86hrcCN6zJ5z66Q7zTscxqJf/W2BbgF0 B1acFaZYVfY7CWyhjtnE7JDtjEHK0ngz8gVUhFCEVXzBKw9SP8+/5DH0tTlOXlFPt81g rsB6L3AfUMZidfvUjDTXPTNmzwYThGUdGEjkUY54IrmdxvpwTtJLlmajbOAOKNtBVWwQ qRGpOxZ0ADa41cGm0poEgZUBZSQE9+3GLhAYBeCJgVIiwO+LSiwCEZ3N/G3RBfTipQtW UdOaMRCw0qn3yGtpLfWN/zbQq19k5PmRQ/jWB27DTB0DCflbyvFiDVc506r07ozk3k1t uGOw== 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=tdbJSMX9Fus86Y7Ia87DC8LzbbawiOKpDxBY3f5AkN4=; b=F+kQ6FWE4b+3euWf9DwA1NDf5YnaqoHBl83xTLbGHbsi9m3Knx6xlfjXLYs/2d3k7K 5bd0OqwgUryEkb0Dawk8RrjlccD3LGg0h3BHT7lAQZaZxm8mQ+V/t2GE75wtNgJG5/yL 7/ttl9YSWsJdkwiVvh7WdbDSrZqhjDkPIalGcI3bnXQT516EdfTf3z8iJtPJsx8NjCWf mykeKGSUvCwKDK/2sKNMXpAA9/Hdzg2zr2obSZNokYiFO6uG5qk70r5CpjlMmv8ubjaf jVZDRpw7qHO/nw4TtQW6bln0nMVyJjaFCs8sd11Mx0/F3zmV8Qtp9RtshA55QlLXI0ai EFtQ== X-Gm-Message-State: ALyK8tLTSLpz4qDTdWAT/5FLmlFyKVf/5vobFw+OX3nEJK1OozN01AzVmFhJVVq6VclpCg== X-Received: by 10.98.102.66 with SMTP id a63mr33238885pfc.32.1467392706659; Fri, 01 Jul 2016 10:05:06 -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:40 -0700 Message-Id: <1467392693-22715-15-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::243 Subject: [Qemu-devel] [PATCH v2 14/27] target-i386: emulate LOCK'ed NOT using atomic 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: Avoid qemu_load that's redundant with the atomic op.] Signed-off-by: Emilio G. Cota Message-Id: <1467054136-10430-15-git-send-email-cota@braap.org> Signed-off-by: Richard Henderson --- target-i386/translate.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 3f10ff0..78eadee 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -4675,10 +4675,15 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, rm = (modrm & 7) | REX_B(s); op = (modrm >> 3) & 7; if (mod != 3) { - if (op == 0) + if (op == 0) { s->rip_offset = insn_const_size(ot); + } gen_lea_modrm(env, s, modrm); - gen_op_ld_v(s, ot, cpu_T0, cpu_A0); + /* For those below that handle locked memory, don't load here. */ + if (!(s->prefix & PREFIX_LOCK) + || op != 2) { + gen_op_ld_v(s, ot, cpu_T0, cpu_A0); + } } else { gen_op_mov_v_reg(ot, cpu_T0, rm); } @@ -4691,11 +4696,20 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, set_cc_op(s, CC_OP_LOGICB + ot); break; case 2: /* not */ - tcg_gen_not_tl(cpu_T0, cpu_T0); - if (mod != 3) { - gen_op_st_v(s, ot, cpu_T0, cpu_A0); + if (s->prefix & PREFIX_LOCK) { + if (mod == 3) { + goto illegal_op; + } + tcg_gen_movi_tl(cpu_T0, ~0); + tcg_gen_atomic_xor_fetch_tl(cpu_T0, cpu_A0, cpu_T0, + s->mem_index, ot | MO_LE); } else { - gen_op_mov_reg_v(ot, rm, cpu_T0); + tcg_gen_not_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); + } } break; case 3: /* neg */