From patchwork Wed Oct 26 16:15:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 687215 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 3t3wlD4gyfz9t1P for ; Thu, 27 Oct 2016 03:41:28 +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=VTqWa+nI; dkim-atps=neutral Received: from localhost ([::1]:36026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzRGX-0006iX-Mi for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2016 12:41:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzQsx-0002ui-Iu for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:17:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzQsw-0002S1-Aj for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:17:03 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:40342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzQsw-0002Rm-6e for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:17:02 -0400 Received: by mail-qk0-x244.google.com with SMTP id z82so563010qkb.7 for ; Wed, 26 Oct 2016 09:17:02 -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=0LDTWQhH66HQCZ6jBzi0FIgXkPrSptaqLhVwtGQiVxI=; b=VTqWa+nIGMN3SHTEgu6Zgi3e6lDB8uxmcxJoHI2GZcJHS8Hy/+0Q+c1NKtn6cr+tSg FqBwkxoaRWTH+I+oNaNcRGrUmxfhxVINl6tTmUm/PjMc1FtVxEogsaIx7hi7lShrUdjx wvs0j08OwSVetlmIQr9wGb/rqK71o/5wlnhyfyJSBpm0xVNae5f2015dnjDqbZWRXhd1 i13rTmAZzjjjTicqlAA/xStLsJ7MX/vuzC1RpPKBt/fCv+xe63Sijhp7/oDYim5RlsM3 F3Kd4su/I2TsTl5GBJf1C2WfYf18ulKproMo0vmhDiemf2vJCcTzKIyjq5cB6nd//M+G 0hig== 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=0LDTWQhH66HQCZ6jBzi0FIgXkPrSptaqLhVwtGQiVxI=; b=kwOCCBkSA+3qhAQPUyf01KSD5UmE7yEE+yb7t/YKbhopJYdj9/ZJKl9WWJ0fStCHl0 blhfxyrVcrpGkAVan8wGrz504bLQqDk0TzGrkjeqhd0705TseSWlG0zPFVMJp07FGWEG mXj1k0pNdYcmdhA2GHpGzaqo1MxDO4+SARh88roQ4ydXhCT2gnaLEZkpy/74v9olXlPq S5JNEvazXsK2KX73avv64EKmdxB+E2cx+USo+/Qj9DuyR8Kp7ie8Cpb3PTFg1sWX+mC2 ux9Gc+u9gpoDqU7ppvSdFeiE5AhSKQwl9J8pQgDd4XQsBHPvAyY2pR1LOQGPVyHkhMho LEVA== X-Gm-Message-State: ABUngveN2J7eFOGclp8N84v1r0h2QTlx8BnBfoMqhcWk4qkTsWh1eQabcV4r6umKut7ewg== X-Received: by 10.55.42.34 with SMTP id q34mr2354222qkh.283.1477498621678; Wed, 26 Oct 2016 09:17:01 -0700 (PDT) Received: from bigtime.com (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id e185sm1337941qkd.13.2016.10.26.09.17.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Oct 2016 09:17:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2016 09:15:48 -0700 Message-Id: <1477498563-29091-23-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477498563-29091-1-git-send-email-rth@twiddle.net> References: <1477498563-29091-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:400d:c09::244 Subject: [Qemu-devel] [PULL v2 22/37] 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: peter.maydell@linaro.org, "Emilio G. Cota" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 2f39dac..6d71564 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -4674,10 +4674,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); } @@ -4690,11 +4695,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 */