From patchwork Fri Jul 1 17:04:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 643180 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 3rh3Qh3DqCz9sCg for ; Sat, 2 Jul 2016 03:32:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=DaNEzfvw; dkim-atps=neutral Received: from localhost ([::1]:34778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ2JC-0003yZ-Rp for incoming@patchwork.ozlabs.org; Fri, 01 Jul 2016 13:32:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sV-0002Zq-GS for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ1sR-0005Vw-Jq for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:18 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:32975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ1sR-0005VW-DR for qemu-devel@nongnu.org; Fri, 01 Jul 2016 13:05:15 -0400 Received: by mail-pf0-x242.google.com with SMTP id c74so10477463pfb.0 for ; Fri, 01 Jul 2016 10:05:15 -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=fArTN5fdfjAL5/bIQMkSENItVnPtJVUJc8Mar8oIaJw=; b=DaNEzfvwPz6r7t3Shd3Jvn7amx7pX8xudRfjzN6ojoBahdmhscJaY0tBWCkA74J2Ay 82fE0jblMneSKKnyd2sHMePnMqz8JeHscp0YWTJRtpWvqpX2v0LS4ZzO+EbjEQ7XTJbs TWHgUOE3T1GNaDkhilHLJiekF0LPCeXJ8F09angG8Kz7YJyWPGgV36dKYsc/S5mRi/lH kVYOAwFcF3hJZ6ldXS0POudUM9iMQvBV/aGX0CZvnEtoSPSOIcZzlzUN/pCscq7tIQtr Ewrkpx4Rp87ey51vM/W/xKI9UpQf5QVQ+Z9Y/X3tS7u/8hw8RxiJOpKw+Ps6OVhDr2lt cLqg== 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=fArTN5fdfjAL5/bIQMkSENItVnPtJVUJc8Mar8oIaJw=; b=lojHnmjesneAEkbMtC7pU7LFuA48FQYrIYftv9403q/RC4bpO3bx5JAVA55YO5f19E 96IJdAhOOTaybTP3hFvSgWMiy19nbCGxTAI++aJ8wv2rnbjFgDmPKa1q+nX/JS20vNfh NeFnQL02kTq+oZHjK2a1AIGgH6DnNHKIMOaqAcdUtI0bQDHjArzAFxac/puyDQiDIYsz ZDPYuNet/jOsUvyucHhiGgGsklzZn7B8u1jkRXYTDOGiiJw1+HfZeHq6oPDDgoYJK5R3 IGHMhC/e4ND0vdPfaGEh0MWNtDsFRYfgbk+hOHwRNRiPAZgrtdXOhCpHku2PWg41VfLc +Q+A== X-Gm-Message-State: ALyK8tKBsaQwGLGM4/ezMuMzH6fRODY4VHaBDS9aYAGw234WslAY/bv1CENV9Va8oZ7bDQ== X-Received: by 10.98.111.138 with SMTP id k132mr33262536pfc.105.1467392714730; Fri, 01 Jul 2016 10:05:14 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 10:05:14 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 10:04:49 -0700 Message-Id: <1467392693-22715-24-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::242 Subject: [Qemu-devel] [PATCH v2 23/27] target-arm: emulate SWP with atomic_xchg 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Signed-off-by: Emilio G. Cota Message-Id: <1467054136-10430-25-git-send-email-cota@braap.org> Signed-off-by: Richard Henderson --- target-arm/translate.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 680635c..2b3c34f 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -8741,25 +8741,26 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } tcg_temp_free_i32(addr); } else { + TCGv taddr; + TCGMemOp opc = s->be_data; + /* SWP instruction */ rm = (insn) & 0xf; - /* ??? This is not really atomic. However we know - we never have multiple CPUs running in parallel, - so it is good enough. */ - addr = load_reg(s, rn); - tmp = load_reg(s, rm); - tmp2 = tcg_temp_new_i32(); if (insn & (1 << 22)) { - gen_aa32_ld8u(s, tmp2, addr, get_mem_index(s)); - gen_aa32_st8(s, tmp, addr, get_mem_index(s)); + opc |= MO_UB; } else { - gen_aa32_ld32u(s, tmp2, addr, get_mem_index(s)); - gen_aa32_st32(s, tmp, addr, get_mem_index(s)); + opc |= MO_UL | MO_ALIGN; } - tcg_temp_free_i32(tmp); + + addr = load_reg(s, rn); + taddr = gen_aa32_addr(s, addr, opc); tcg_temp_free_i32(addr); - store_reg(s, rd, tmp2); + + tmp = load_reg(s, rm); + tcg_gen_atomic_xchg_i32(tmp, taddr, tmp, + get_mem_index(s), opc); + store_reg(s, rd, tmp); } } } else {