From patchwork Fri Jul 1 17:04:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9210249 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 805246089F for ; Fri, 1 Jul 2016 17:10:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BCF6285BA for ; Fri, 1 Jul 2016 17:10:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60A95286CB; Fri, 1 Jul 2016 17:10:08 +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 2956F286C9 for ; Fri, 1 Jul 2016 17:10:06 +0000 (UTC) Received: from localhost ([::1]:34641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1x7-00086C-AE for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Jul 2016 13:10:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sM-0002Ku-MF for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ1sL-0005Sb-He for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:10 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:36499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sL-0005S5-Au for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:09 -0400 Received: by mail-pa0-x241.google.com with SMTP id av7so10156240pac.3 for ; Fri, 01 Jul 2016 10:05: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=bMena2fa5PqhVs9q806HUvatVoOPGWioXYlJeuyuvgM=; b=DDv5vh54RuIp1Nsvxh/jAJLQCetRT4d2QmlR1ZIOmsTMfgIXllF+KA1SFy8oXBzSfh OSwMSzw/DMfnPXxBUuQyyih/dx1gZoeVvMc3gL8Rc2SzcrvaZLenKCOdrIjUTFjL8AGz 7VTg1V3ncX+Llur5k/pUlcZEjvFV9JNqUJ9qDpg8Aj9L6XiJZoNu0+d5Zq1R1GTK+J5P NgsjsihX0MJX+I7dpDD/HdHtPaK0wAb8fui6pQ4ZmMX9ucS1whJgYFpuaWzL40eHl4ju kmPk4qFl7I+dqS87y3JRm/yOVRHcBVlw+4n/ljFXE1rg9/eKVfoVGYyvVeTm5S9rY2vc SIWQ== 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=bMena2fa5PqhVs9q806HUvatVoOPGWioXYlJeuyuvgM=; b=gGm0BSlhsVsBJnaytXZK0tOnjBYAJd/dvOKmwiORnY7GwYNmRzdWU3WDYg+zdf5S7J mgnBmfGpGlYpeuBM8Ir5lOKd85hBEV3cayNwk5kxR00ggVT04n/15qNVSdRpSXi0GUeK TpOBoIRDrnmjZhZpPzm4Ln59n+mRlK2dmqpORpm+8nqTI84FAHGOFA6f+G4HLeS7tc5u HCnIE7z5OGjkuwpmBI7kakkhqNMz+A1Bw/EJ85VgGJYmmFRahIV16ggvMbdrM6hudEnr VpAcscshuzwte/b6Vb6xvHG3pPwXqfkreqeDaxxXrdP+NO5Y4/tyyWNqEApIq4WjhzyE KaRQ== X-Gm-Message-State: ALyK8tKLSVaiIlzSrMsKtpDXAK+y9PMQK/qw2xbeXppmf83mHNtAWJT55EGiT+yZPcM9SA== X-Received: by 10.66.151.71 with SMTP id uo7mr33373844pab.134.1467392708592; Fri, 01 Jul 2016 10:05:08 -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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 10:05:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 10:04:42 -0700 Message-Id: <1467392693-22715-17-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:c03::241 Subject: [Qemu-devel] [PATCH v2 16/27] target-i386: emulate LOCK'ed XADD 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: Move load of reg value to common location.] Signed-off-by: Emilio G. Cota Message-Id: <1467054136-10430-17-git-send-email-cota@braap.org> Signed-off-by: Richard Henderson --- target-i386/translate.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 19d6f1e..dc132a1 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -5135,19 +5135,24 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, modrm = cpu_ldub_code(env, s->pc++); reg = ((modrm >> 3) & 7) | rex_r; mod = (modrm >> 6) & 3; + gen_op_mov_v_reg(ot, cpu_T0, reg); if (mod == 3) { rm = (modrm & 7) | REX_B(s); - gen_op_mov_v_reg(ot, cpu_T0, reg); gen_op_mov_v_reg(ot, cpu_T1, rm); tcg_gen_add_tl(cpu_T0, cpu_T0, cpu_T1); gen_op_mov_reg_v(ot, reg, cpu_T1); gen_op_mov_reg_v(ot, rm, cpu_T0); } else { gen_lea_modrm(env, s, modrm); - gen_op_mov_v_reg(ot, cpu_T0, reg); - gen_op_ld_v(s, ot, cpu_T1, cpu_A0); - tcg_gen_add_tl(cpu_T0, cpu_T0, cpu_T1); - gen_op_st_v(s, ot, cpu_T0, cpu_A0); + if (s->prefix & PREFIX_LOCK) { + tcg_gen_atomic_fetch_add_tl(cpu_T1, cpu_A0, cpu_T0, + s->mem_index, ot | MO_LE); + tcg_gen_add_tl(cpu_T0, cpu_T0, cpu_T1); + } else { + gen_op_ld_v(s, ot, cpu_T1, cpu_A0); + tcg_gen_add_tl(cpu_T0, cpu_T0, cpu_T1); + gen_op_st_v(s, ot, cpu_T0, cpu_A0); + } gen_op_mov_reg_v(ot, reg, cpu_T1); } gen_op_update2_cc();