From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bu2w2-0003W7-5C for qemu-devel@nongnu.org; Tue, 11 Oct 2016 15:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bu2vz-0001tw-BS for qemu-devel@nongnu.org; Tue, 11 Oct 2016 15:41:57 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:33860) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bu2vz-0001tc-5y for qemu-devel@nongnu.org; Tue, 11 Oct 2016 15:41:55 -0400 Received: by mail-pa0-x241.google.com with SMTP id fn2so1237101pad.1 for ; Tue, 11 Oct 2016 12:41:55 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 11 Oct 2016 14:40:45 -0500 Message-Id: <1476214861-31658-20-git-send-email-rth@twiddle.net> In-Reply-To: <1476214861-31658-1-git-send-email-rth@twiddle.net> References: <1476214861-31658-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v6 19/35] target-i386: emulate LOCK'ed INC using atomic helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, "Emilio G. Cota" From: "Emilio G. Cota" [rth: Merge gen_inc_locked back into gen_inc to share cc update.] Signed-off-by: Emilio G. Cota Message-Id: <1467054136-10430-14-git-send-email-cota@braap.org> Signed-off-by: Richard Henderson --- target-i386/translate.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index b5c7791..a38d953 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -1362,21 +1362,23 @@ static void gen_op(DisasContext *s1, int op, TCGMemOp ot, int d) /* if d == OR_TMP0, it means memory operand (address in A0) */ static void gen_inc(DisasContext *s1, TCGMemOp ot, int d, int c) { - if (d != OR_TMP0) { - gen_op_mov_v_reg(ot, cpu_T0, d); + if (s1->prefix & PREFIX_LOCK) { + tcg_gen_movi_tl(cpu_T0, c > 0 ? 1 : -1); + tcg_gen_atomic_add_fetch_tl(cpu_T0, cpu_A0, cpu_T0, + s1->mem_index, ot | MO_LE); } else { - gen_op_ld_v(s1, ot, cpu_T0, cpu_A0); + if (d != OR_TMP0) { + gen_op_mov_v_reg(ot, cpu_T0, d); + } else { + gen_op_ld_v(s1, ot, cpu_T0, cpu_A0); + } + tcg_gen_addi_tl(cpu_T0, cpu_T0, (c > 0 ? 1 : -1)); + gen_op_st_rm_T0_A0(s1, ot, d); } + gen_compute_eflags_c(s1, cpu_cc_src); - if (c > 0) { - tcg_gen_addi_tl(cpu_T0, cpu_T0, 1); - set_cc_op(s1, CC_OP_INCB + ot); - } else { - tcg_gen_addi_tl(cpu_T0, cpu_T0, -1); - set_cc_op(s1, CC_OP_DECB + ot); - } - gen_op_st_rm_T0_A0(s1, ot, d); tcg_gen_mov_tl(cpu_cc_dst, cpu_T0); + set_cc_op(s1, (c > 0 ? CC_OP_INCB : CC_OP_DECB) + ot); } static void gen_shift_flags(DisasContext *s, TCGMemOp ot, TCGv result, -- 2.7.4