From patchwork Thu Oct 27 17:07:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 687826 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 3t4Yyp5XRsz9sXx for ; Fri, 28 Oct 2016 04:38:42 +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=mnvZJurl; dkim-atps=neutral Received: from localhost ([::1]:43351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzodT-000119-N6 for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2016 13:38:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzoA1-0001Dz-4i for qemu-devel@nongnu.org; Thu, 27 Oct 2016 13:08:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzo9z-0000zV-J8 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 13:08:13 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:36064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzo9z-0000zD-EW for qemu-devel@nongnu.org; Thu, 27 Oct 2016 13:08:11 -0400 Received: by mail-qt0-x244.google.com with SMTP id n34so1492852qtb.3 for ; Thu, 27 Oct 2016 10:08:11 -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=oa6oqF9Z2W1kuJhDlysrdGO7ue9yDR6IYz3fIzm77/g=; b=mnvZJurlVqvsMNxWiXX/XP85cODCPTzYFIF8Xbh38v2k1rGqEUdwdQniokBaII518u OK+2JLDcG6TWzCYgBcuRPfxGUxctZaOaDkBBN4GvBDhzIRnEOpUvWlp0y3RCgYvQQC/+ rT20Aok4fY49ecPNM6cJGvC+BK6EOBAO39QEbL1oAaAvql+vDZuya8Ww1f22H9VDHoO3 1WZcqGRcCo+j+wIADKjUV35ApBVXmaPt+F3vfgg9PekqGffBiaKqc2UTaQLWxaRPxbJX m/M/rF/46zMASPpGSeFRiGgwTk29J/8E/UJQhLCfpjkQ090ThA5TPvvvJVeGzpN7DDi1 PENw== 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=oa6oqF9Z2W1kuJhDlysrdGO7ue9yDR6IYz3fIzm77/g=; b=fOjjjptVxM7Z35KY44oYXIyGDLZUTX5/YlCYGbPim/l65+guMaw1Bq+MhTDnKpkauR OAOek2bFm4BXyo6WCY7ypZ/R+875C8Wtk1vCmaCV33Xy931LJNrzZgmN/6zQ00Ev84cQ 2biUgMDTPF1w7Wb1g7YHEDEEXZF96fFMOvnIXciQPwyJyaQ1gUiI1vh+9O/C7kz3v5bV dxKI/psuatkyMsSVt7jUKOfUUGDcTSComV/h2peOchM0bFU/IGwsW5QgnR0nonVLGTZd /oy6+jKHiJcQFA0gXFTuQJQNDTEXzbPHK9LQa1+cxEh4iOjI/PZAom040hk7ewdAoJwu kV+g== X-Gm-Message-State: ABUngvchz6rj8puTKkQtkIf9eDYicYRhepML7fPXzU+NSh884JyI/LPgVQ/QRL1XPvFq5w== X-Received: by 10.200.46.184 with SMTP id h53mr7314547qta.133.1477588090816; Thu, 27 Oct 2016 10:08:10 -0700 (PDT) Received: from bigtime.com (174-24-157-40.tukw.qwest.net. [174.24.157.40]) by smtp.gmail.com with ESMTPSA id 21sm4073875qtx.12.2016.10.27.10.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 10:08:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2016 10:07:23 -0700 Message-Id: <1477588052-10152-7-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477588052-10152-1-git-send-email-rth@twiddle.net> References: <1477588052-10152-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::244 Subject: [Qemu-devel] [PATCH v3 06/15] target-sparc: Implement swap_asi inline 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: mark.cave-ayland@ilande.co.uk Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Tested-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target-sparc/translate.c | 49 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index e7e07de..8cd8bb6 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -2001,6 +2001,18 @@ static inline void gen_ne_fop_QD(DisasContext *dc, int rd, int rs, gen_update_fprs_dirty(dc, QFPREG(rd)); } +static void gen_swap(DisasContext *dc, TCGv dst, TCGv src, + TCGv addr, int mmu_idx, TCGMemOp memop) +{ + /* ??? Should be atomic. */ + TCGv t0 = tcg_temp_new(); + gen_address_mask(dc, addr); + tcg_gen_qemu_ld_tl(t0, addr, mmu_idx, memop); + tcg_gen_qemu_st_tl(src, addr, mmu_idx, memop); + tcg_gen_mov_tl(dst, t0); + tcg_temp_free(t0); +} + /* asi moves */ #if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64) typedef enum { @@ -2302,26 +2314,12 @@ static void gen_swap_asi(DisasContext *dc, TCGv dst, TCGv src, switch (da.type) { case GET_ASI_EXCP: break; + case GET_ASI_DIRECT: + gen_swap(dc, dst, src, addr, da.mem_idx, da.memop); + break; default: - { - TCGv_i32 r_asi = tcg_const_i32(da.asi); - TCGv_i32 r_mop = tcg_const_i32(MO_UL); - TCGv_i64 s64, t64; - - save_state(dc); - t64 = tcg_temp_new_i64(); - gen_helper_ld_asi(t64, cpu_env, addr, r_asi, r_mop); - - s64 = tcg_temp_new_i64(); - tcg_gen_extu_tl_i64(s64, src); - gen_helper_st_asi(cpu_env, addr, s64, r_asi, r_mop); - tcg_temp_free_i64(s64); - tcg_temp_free_i32(r_mop); - tcg_temp_free_i32(r_asi); - - tcg_gen_trunc_i64_tl(dst, t64); - tcg_temp_free_i64(t64); - } + /* ??? Should be DAE_invalid_asi. */ + gen_exception(dc, TT_DATA_ACCESS); break; } } @@ -5207,15 +5205,10 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn) break; case 0x0f: /* swap, swap register with memory. Also atomically */ - { - TCGv t0 = get_temp_tl(dc); - CHECK_IU_FEATURE(dc, SWAP); - cpu_src1 = gen_load_gpr(dc, rd); - gen_address_mask(dc, cpu_addr); - tcg_gen_qemu_ld32u(t0, cpu_addr, dc->mem_idx); - tcg_gen_qemu_st32(cpu_src1, cpu_addr, dc->mem_idx); - tcg_gen_mov_tl(cpu_val, t0); - } + CHECK_IU_FEATURE(dc, SWAP); + cpu_src1 = gen_load_gpr(dc, rd); + gen_swap(dc, cpu_val, cpu_src1, cpu_addr, + dc->mem_idx, MO_TEUL); break; #if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64) case 0x10: /* lda, V9 lduwa, load word alternate */