From patchwork Wed Oct 19 17:22:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9384965 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 EA46160487 for ; Wed, 19 Oct 2016 17:41:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEC2528B11 for ; Wed, 19 Oct 2016 17:41:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3A7F28CAD; Wed, 19 Oct 2016 17:41:10 +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 8B7D128B11 for ; Wed, 19 Oct 2016 17:41:10 +0000 (UTC) Received: from localhost ([::1]:50000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwurV-00073M-Oz for patchwork-qemu-devel@patchwork.kernel.org; Wed, 19 Oct 2016 13:41:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwua7-0006rm-GW for qemu-devel@nongnu.org; Wed, 19 Oct 2016 13:23:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwua6-0003EL-Lo for qemu-devel@nongnu.org; Wed, 19 Oct 2016 13:23:11 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bwua6-0003Dl-F4 for qemu-devel@nongnu.org; Wed, 19 Oct 2016 13:23:10 -0400 Received: by mail-qt0-x243.google.com with SMTP id m5so1133115qtb.0 for ; Wed, 19 Oct 2016 10:23:10 -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=vg5OKiuwN3ENQ4ZA33BEpT8OYPQiC91kuU+3qUr+MFo=; b=G7LBr+fqkRNkShAbGdJPylUl0zXBwXQGu6XlT+RIQzirm8abv4y11nf+7krZdb2BZG /T/gnIO7bm5SuZnVVGB03EgkdcUPitbSPZtV+j4lMpST4+0s6OMrKxxm2lN/YxPXfF+M eVkJDLmyRZ2j309ihnQ4DLQ3VEkBOPevDZSbz1MnaCX8bUswOPf/EtnlUpWcJvxWljMa BxCeU/8G0OAfk8YPXLPwUE0C1qBI49L7ykVpbkfIepKCqptNGjD3OG+NSbTZIbzHWUvk +9ukXoFjh6eCLThhDIBARM0uaHICOfg8xDI1qj64dOHeYgw2QPnilJsFIJI8Yfv627j8 0DaA== 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=vg5OKiuwN3ENQ4ZA33BEpT8OYPQiC91kuU+3qUr+MFo=; b=gGLdGF3gIWrTpKFR6wJEf518aXQld9E08OY1t4hi6+nL61MWrUWJAabtn+wQHsw4uP kowDuYOu+pPmhP+1xkp5fiD6jGadQROfvnOvceLd/UOmoInlYj+729n+Qszovl/c1cOf p/gNd/lK1xi9sG62Y4QdC8cWMPNhBppijOqjPkEyp65y+HmcRL6btj7k3EsNfR/fwXRH sBXkyL17oTHbEr0Q389v52U9D43O5SKjt/DUdRvgMWd1+KB+VcZ3NtDPVwVhv/yInzDD Rzv+2WglkCmjq9oWQ1ubHbviQaQDDHndNLhGvR5+f0XHpoohge/OqJ5gc8qbNRgrZCmf 2rdg== X-Gm-Message-State: AA6/9Rlw/s2cRQeYpnDY6y+6YZTcHZFXnNxfa8q2n3TtEZ92lquL3Xb0uxu3vFPID85oIg== X-Received: by 10.200.52.75 with SMTP id v11mr7012386qtb.137.1476897789540; Wed, 19 Oct 2016 10:23:09 -0700 (PDT) Received: from bigtime.com (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id 16sm18357530qtf.36.2016.10.19.10.23.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Oct 2016 10:23:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 19 Oct 2016 10:22:01 -0700 Message-Id: <1476897727-791-30-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476897727-791-1-git-send-email-rth@twiddle.net> References: <1476897727-791-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:c0d::243 Subject: [Qemu-devel] [PATCH v7 29/35] 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: cota@braap.org, alex.bennee@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" 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 | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 06c531f..8372c8c 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -8760,25 +8760,27 @@ 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); + tcg_temp_free(taddr); + store_reg(s, rd, tmp); } } } else {