From nobody Tue Feb 10 23:55:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1697523678; cv=none; d=zohomail.com; s=zohoarc; b=FBmEkllURsmLhIhZ3LqafjeHC28Sqm72bBXZ/a7sn0nplZNSjg6VMPd0T0D9GSmu/qjRuk5unnaXGfuwVLxqgxCqz/Hs3ONgvhWKJxb7aHN5irIrxPUG1Kx1SHtqtPXxV60km2cW17TaL/HlHBGxaUvVtUhFox7qDa4dUV/Et7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697523678; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2yKX3ubOopsU+rj4jurKNINzvppARLg08vtpsruBAUQ=; b=W0HjjLTlc4+xxIgUB8quvfHSiZE6ET18b33kFVS4HgIaP78ObV9rJ0iKs5x4VNBpPLF08fRwJVibxLZWM6K8Agnn5IncW7S7lYt+MAyHQvy622crYGjfVXk16QGzqa5KI2V6ltCAacjX9Ha5hWn/Rj2lJ0TcVBSff9HIYjVZBac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697523678070855.7296508856397; Mon, 16 Oct 2023 23:21:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsdNk-00039o-8h; Tue, 17 Oct 2023 02:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsdNU-0002mb-5J for qemu-devel@nongnu.org; Tue, 17 Oct 2023 02:16:28 -0400 Received: from mail-yb1-xb2d.google.com ([2607:f8b0:4864:20::b2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qsdNR-0004gD-Ls for qemu-devel@nongnu.org; Tue, 17 Oct 2023 02:16:27 -0400 Received: by mail-yb1-xb2d.google.com with SMTP id 3f1490d57ef6-d8a000f6a51so5934863276.3 for ; Mon, 16 Oct 2023 23:16:25 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id m10-20020a056a00080a00b00690ca4356f1sm579280pfk.198.2023.10.16.23.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 23:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697523384; x=1698128184; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2yKX3ubOopsU+rj4jurKNINzvppARLg08vtpsruBAUQ=; b=i7uqjyeLLmx8bCExGlFgAxNApdbLIyyIBeuoPwei/tGTzLsR9f/9X/IcNc897+wqRz hlmcd85x7/y5dKnCaDfA+xmMESegLMylavSii/pu/uDvZrOS3l1EOjlh7c5emsY41RtP HH//SQ6KpHnIGM46KmKA2Y5Wtj6Jdz+uHLZJMxmQBuuh6UsW9Ipmlha8Dn0Qtwk6D2J4 CSKb9bN9t/bXzRq/bc2FzkZCV5gV8Mh5Bi3mTc4Fg1YRJ/gRj2GOeK3wso1xgov96uc8 p6oTsuF5i4vn+0mJS2G88IguJ1sjIU94ry9NNP+fR+aIVO8tG+90cf+KYik071b86Kl7 6h2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697523384; x=1698128184; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2yKX3ubOopsU+rj4jurKNINzvppARLg08vtpsruBAUQ=; b=DvBgrqOpy7ZZRn+Qa76OVI0jupOqWXYkfzt0z8vKzb8FGAJppUHHYOjX7r6i+surrN qsyg8obuBZLF5tYTVQD0M9Zg0oCVIMGp4BHk9sZAZ6NQAHNycfvuiNoFwAHmbk9iJiKA M+gW+Oj62VllljXPy+cGDkEqVTEGVRMive5lir1jnK+6Kft1OjMIY2a914IKGH4hFFgm IWO1eNpzTmrU0j9g+dbNFBXOykO6FiI0Awq+ME3YUHQgkqPzeLPBZQsD5CoYOjGMluEE EZWNxt7Z7LUEsZSiVojkga+9i9Cf67lRcbywfmn+QmIa+it28QEaVSXpBzTe8uG+p8Qy FOMA== X-Gm-Message-State: AOJu0Yz8FiuC5SS/LNswZX2XnAbotCZ/EFW1VD9OWBQ80GamwkHN/E1a hXmOXo5qp3r1nvVDPbKo6C2dEJ2y0rbHB11buIk= X-Google-Smtp-Source: AGHT+IFp42T0iE8tUJlZrZQAcnfCxX0Qn0NDaiUw+K9i6S/cfqI8Q6+LFlzhzjlfY8pj7JAbdguAeg== X-Received: by 2002:a25:ab88:0:b0:d80:4533:9556 with SMTP id v8-20020a25ab88000000b00d8045339556mr1194372ybi.63.1697523384234; Mon, 16 Oct 2023 23:16:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 46/90] target/sparc: Split out ldst functions with asi pre-computed Date: Mon, 16 Oct 2023 23:12:00 -0700 Message-Id: <20231017061244.681584-47-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017061244.681584-1-richard.henderson@linaro.org> References: <20231017061244.681584-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::b2d; envelope-from=richard.henderson@linaro.org; helo=mail-yb1-xb2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1697523679511100006 Content-Type: text/plain; charset="utf-8" As an intermediate step in decodetree conversion, create new functions passing in DisasASI and not insn. Signed-off-by: Richard Henderson --- target/sparc/translate.c | 215 ++++++++++++++++++++++----------------- 1 file changed, 123 insertions(+), 92 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 6404ec5858..eed0fbadf9 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -2105,25 +2105,21 @@ static DisasASI get_asi(DisasContext *dc, int insn,= MemOp memop) return resolve_asi(dc, asi, memop); } =20 -static void __attribute__((unused)) -gen_ld_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn, MemOp memop) +static void gen_ld_asi0(DisasContext *dc, DisasASI *da, TCGv dst, TCGv add= r) { - DisasASI da =3D get_asi(dc, insn, memop); - - switch (da.type) { + switch (da->type) { case GET_ASI_EXCP: break; case GET_ASI_DTWINX: /* Reserved for ldda. */ gen_exception(dc, TT_ILL_INSN); break; case GET_ASI_DIRECT: - gen_address_mask(dc, addr); - tcg_gen_qemu_ld_tl(dst, addr, da.mem_idx, da.memop | MO_ALIGN); + tcg_gen_qemu_ld_tl(dst, addr, da->mem_idx, da->memop | MO_ALIGN); break; default: { - TCGv_i32 r_asi =3D tcg_constant_i32(da.asi); - TCGv_i32 r_mop =3D tcg_constant_i32(memop | MO_ALIGN); + TCGv_i32 r_asi =3D tcg_constant_i32(da->asi); + TCGv_i32 r_mop =3D tcg_constant_i32(da->memop | MO_ALIGN); =20 save_state(dc); #ifdef TARGET_SPARC64 @@ -2141,33 +2137,38 @@ gen_ld_asi(DisasContext *dc, TCGv dst, TCGv addr, i= nt insn, MemOp memop) } =20 static void __attribute__((unused)) -gen_st_asi(DisasContext *dc, TCGv src, TCGv addr, int insn, MemOp memop) +gen_ld_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn, MemOp memop) { DisasASI da =3D get_asi(dc, insn, memop); =20 - switch (da.type) { + gen_address_mask(dc, addr); + gen_ld_asi0(dc, &da, dst, addr); +} + +static void gen_st_asi0(DisasContext *dc, DisasASI *da, TCGv src, TCGv add= r) +{ + switch (da->type) { case GET_ASI_EXCP: break; + case GET_ASI_DTWINX: /* Reserved for stda. */ -#ifndef TARGET_SPARC64 - gen_exception(dc, TT_ILL_INSN); - break; -#else - if (!(dc->def->features & CPU_FEATURE_HYPV)) { + if (TARGET_LONG_BITS =3D=3D 32) { + gen_exception(dc, TT_ILL_INSN); + break; + } else if (!(dc->def->features & CPU_FEATURE_HYPV)) { /* Pre OpenSPARC CPUs don't have these */ gen_exception(dc, TT_ILL_INSN); - return; + break; } - /* in OpenSPARC T1+ CPUs TWINX ASIs in store instructions - * are ST_BLKINIT_ ASIs */ -#endif + /* In OpenSPARC T1+ CPUs TWINX ASIs in store are ST_BLKINIT_ ASIs = */ /* fall through */ + case GET_ASI_DIRECT: - gen_address_mask(dc, addr); - tcg_gen_qemu_st_tl(src, addr, da.mem_idx, da.memop | MO_ALIGN); + tcg_gen_qemu_st_tl(src, addr, da->mem_idx, da->memop | MO_ALIGN); break; -#if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) + case GET_ASI_BCOPY: + assert(TARGET_LONG_BITS =3D=3D 32); /* Copy 32 bytes from the address in SRC to ADDR. */ /* ??? The original qemu code suggests 4-byte alignment, dropping the low bits, but the only place I can see this used is in the @@ -2185,18 +2186,18 @@ gen_st_asi(DisasContext *dc, TCGv src, TCGv addr, i= nt insn, MemOp memop) for (i =3D 0; i < 32; i +=3D 4) { /* Since the loads and stores are paired, allow the copy to happen in the host endianness. */ - tcg_gen_qemu_ld_i32(tmp, saddr, da.mem_idx, MO_UL); - tcg_gen_qemu_st_i32(tmp, daddr, da.mem_idx, MO_UL); + tcg_gen_qemu_ld_i32(tmp, saddr, da->mem_idx, MO_UL); + tcg_gen_qemu_st_i32(tmp, daddr, da->mem_idx, MO_UL); tcg_gen_add_tl(saddr, saddr, four); tcg_gen_add_tl(daddr, daddr, four); } } break; -#endif + default: { - TCGv_i32 r_asi =3D tcg_constant_i32(da.asi); - TCGv_i32 r_mop =3D tcg_constant_i32(memop | MO_ALIGN); + TCGv_i32 r_asi =3D tcg_constant_i32(da->asi); + TCGv_i32 r_mop =3D tcg_constant_i32(da->memop | MO_ALIGN); =20 save_state(dc); #ifdef TARGET_SPARC64 @@ -2216,16 +2217,49 @@ gen_st_asi(DisasContext *dc, TCGv src, TCGv addr, i= nt insn, MemOp memop) } } =20 +static void __attribute__((unused)) +gen_st_asi(DisasContext *dc, TCGv src, TCGv addr, int insn, MemOp memop) +{ + DisasASI da =3D get_asi(dc, insn, memop); + + gen_address_mask(dc, addr); + gen_st_asi0(dc, &da, src, addr); +} + +static void gen_swap_asi0(DisasContext *dc, DisasASI *da, + TCGv dst, TCGv src, TCGv addr) +{ + 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: + /* ??? Should be DAE_invalid_asi. */ + gen_exception(dc, TT_DATA_ACCESS); + break; + } +} + static void __attribute__((unused)) gen_swap_asi(DisasContext *dc, TCGv dst, TCGv src, TCGv addr, int insn) { DisasASI da =3D get_asi(dc, insn, MO_TEUL); =20 - switch (da.type) { + gen_address_mask(dc, addr); + gen_swap_asi0(dc, &da, dst, src, addr); +} + +static void gen_cas_asi0(DisasContext *dc, DisasASI *da, + TCGv oldv, TCGv newv, TCGv cmpv, TCGv addr) +{ + switch (da->type) { case GET_ASI_EXCP: - break; + return; case GET_ASI_DIRECT: - gen_swap(dc, dst, src, addr, da.mem_idx, da.memop); + tcg_gen_atomic_cmpxchg_tl(oldv, addr, cmpv, newv, + da->mem_idx, da->memop | MO_ALIGN); break; default: /* ??? Should be DAE_invalid_asi. */ @@ -2238,34 +2272,33 @@ static void __attribute__((unused)) gen_cas_asi(DisasContext *dc, TCGv addr, TCGv cmpv, int insn, int rd) { DisasASI da =3D get_asi(dc, insn, MO_TEUL); - TCGv oldv; + TCGv oldv =3D gen_dest_gpr(dc, rd); + TCGv newv =3D gen_load_gpr(dc, rd); =20 - switch (da.type) { - case GET_ASI_EXCP: - return; - case GET_ASI_DIRECT: - oldv =3D tcg_temp_new(); - tcg_gen_atomic_cmpxchg_tl(oldv, addr, cmpv, gen_load_gpr(dc, rd), - da.mem_idx, da.memop | MO_ALIGN); - gen_store_gpr(dc, rd, oldv); - break; - default: - /* ??? Should be DAE_invalid_asi. */ - gen_exception(dc, TT_DATA_ACCESS); - break; - } + gen_address_mask(dc, addr); + gen_cas_asi0(dc, &da, oldv, newv, cmpv, addr); + gen_store_gpr(dc, rd, oldv); } =20 static void __attribute__((unused)) -gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn) +gen_casx_asi(DisasContext *dc, TCGv addr, TCGv cmpv, int insn, int rd) { - DisasASI da =3D get_asi(dc, insn, MO_UB); + DisasASI da =3D get_asi(dc, insn, MO_TEUQ); + TCGv oldv =3D gen_dest_gpr(dc, rd); + TCGv newv =3D gen_load_gpr(dc, rd); =20 - switch (da.type) { + gen_address_mask(dc, addr); + gen_cas_asi0(dc, &da, oldv, newv, cmpv, addr); + gen_store_gpr(dc, rd, oldv); +} + +static void gen_ldstub_asi0(DisasContext *dc, DisasASI *da, TCGv dst, TCGv= addr) +{ + switch (da->type) { case GET_ASI_EXCP: break; case GET_ASI_DIRECT: - gen_ldstub(dc, dst, addr, da.mem_idx); + gen_ldstub(dc, dst, addr, da->mem_idx); break; default: /* ??? In theory, this should be raise DAE_invalid_asi. @@ -2273,7 +2306,7 @@ gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr,= int insn) if (tb_cflags(dc->base.tb) & CF_PARALLEL) { gen_helper_exit_atomic(tcg_env); } else { - TCGv_i32 r_asi =3D tcg_constant_i32(da.asi); + TCGv_i32 r_asi =3D tcg_constant_i32(da->asi); TCGv_i32 r_mop =3D tcg_constant_i32(MO_UB); TCGv_i64 s64, t64; =20 @@ -2293,6 +2326,15 @@ gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr= , int insn) } } =20 +static void __attribute__((unused)) +gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn) +{ + DisasASI da =3D get_asi(dc, insn, MO_UB); + + gen_address_mask(dc, addr); + gen_ldstub_asi0(dc, &da, dst, addr); +} + static void __attribute__((unused)) gen_ldf_asi(DisasContext *dc, TCGv addr, int insn, int size, int rd) { @@ -2485,36 +2527,32 @@ gen_stf_asi(DisasContext *dc, TCGv addr, int insn, = int size, int rd) } } =20 -static void __attribute__((unused)) -gen_ldda_asi(DisasContext *dc, TCGv addr, int insn, int rd) +static void gen_ldda_asi0(DisasContext *dc, DisasASI *da, TCGv addr, int r= d) { - DisasASI da =3D get_asi(dc, insn, MO_TEUQ); TCGv hi =3D gen_dest_gpr(dc, rd); TCGv lo =3D gen_dest_gpr(dc, rd + 1); =20 - switch (da.type) { + switch (da->type) { case GET_ASI_EXCP: return; =20 case GET_ASI_DTWINX: assert(TARGET_LONG_BITS =3D=3D 64); - gen_address_mask(dc, addr); - tcg_gen_qemu_ld_tl(hi, addr, da.mem_idx, da.memop | MO_ALIGN_16); + tcg_gen_qemu_ld_tl(hi, addr, da->mem_idx, da->memop | MO_ALIGN_16); tcg_gen_addi_tl(addr, addr, 8); - tcg_gen_qemu_ld_tl(lo, addr, da.mem_idx, da.memop); + tcg_gen_qemu_ld_tl(lo, addr, da->mem_idx, da->memop); break; =20 case GET_ASI_DIRECT: { TCGv_i64 tmp =3D tcg_temp_new_i64(); =20 - gen_address_mask(dc, addr); - tcg_gen_qemu_ld_i64(tmp, addr, da.mem_idx, da.memop | MO_ALIGN= ); + tcg_gen_qemu_ld_i64(tmp, addr, da->mem_idx, da->memop | MO_ALI= GN); =20 /* Note that LE ldda acts as if each 32-bit register result is byte swapped. Having just performed one 64-bit bswap, we need now to swap the writebacks. */ - if ((da.memop & MO_BSWAP) =3D=3D MO_TE) { + if ((da->memop & MO_BSWAP) =3D=3D MO_TE) { tcg_gen_extr_i64_tl(lo, hi, tmp); } else { tcg_gen_extr_i64_tl(hi, lo, tmp); @@ -2528,15 +2566,15 @@ gen_ldda_asi(DisasContext *dc, TCGv addr, int insn,= int rd) real hardware allows others. This can be seen with e.g. FreeBSD 10.3 wrt ASI_IC_TAG. */ { - TCGv_i32 r_asi =3D tcg_constant_i32(da.asi); - TCGv_i32 r_mop =3D tcg_constant_i32(da.memop); + TCGv_i32 r_asi =3D tcg_constant_i32(da->asi); + TCGv_i32 r_mop =3D tcg_constant_i32(da->memop); TCGv_i64 tmp =3D tcg_temp_new_i64(); =20 save_state(dc); gen_helper_ld_asi(tmp, tcg_env, addr, r_asi, r_mop); =20 /* See above. */ - if ((da.memop & MO_BSWAP) =3D=3D MO_TE) { + if ((da->memop & MO_BSWAP) =3D=3D MO_TE) { tcg_gen_extr_i64_tl(lo, hi, tmp); } else { tcg_gen_extr_i64_tl(hi, lo, tmp); @@ -2550,21 +2588,28 @@ gen_ldda_asi(DisasContext *dc, TCGv addr, int insn,= int rd) } =20 static void __attribute__((unused)) -gen_stda_asi(DisasContext *dc, TCGv hi, TCGv addr, int insn, int rd) +gen_ldda_asi(DisasContext *dc, TCGv addr, int insn, int rd) { DisasASI da =3D get_asi(dc, insn, MO_TEUQ); + + gen_address_mask(dc, addr); + gen_ldda_asi0(dc, &da, addr, rd); +} + +static void gen_stda_asi0(DisasContext *dc, DisasASI *da, TCGv addr, int r= d) +{ + TCGv hi =3D gen_load_gpr(dc, rd); TCGv lo =3D gen_load_gpr(dc, rd + 1); =20 - switch (da.type) { + switch (da->type) { case GET_ASI_EXCP: break; =20 case GET_ASI_DTWINX: assert(TARGET_LONG_BITS =3D=3D 64); - gen_address_mask(dc, addr); - tcg_gen_qemu_st_tl(hi, addr, da.mem_idx, da.memop | MO_ALIGN_16); + tcg_gen_qemu_st_tl(hi, addr, da->mem_idx, da->memop | MO_ALIGN_16); tcg_gen_addi_tl(addr, addr, 8); - tcg_gen_qemu_st_tl(lo, addr, da.mem_idx, da.memop); + tcg_gen_qemu_st_tl(lo, addr, da->mem_idx, da->memop); break; =20 case GET_ASI_DIRECT: @@ -2574,13 +2619,12 @@ gen_stda_asi(DisasContext *dc, TCGv hi, TCGv addr, = int insn, int rd) /* Note that LE stda acts as if each 32-bit register result is byte swapped. We will perform one 64-bit LE store, so now we must swap the order of the construction. */ - if ((da.memop & MO_BSWAP) =3D=3D MO_TE) { + if ((da->memop & MO_BSWAP) =3D=3D MO_TE) { tcg_gen_concat_tl_i64(t64, lo, hi); } else { tcg_gen_concat_tl_i64(t64, hi, lo); } - gen_address_mask(dc, addr); - tcg_gen_qemu_st_i64(t64, addr, da.mem_idx, da.memop | MO_ALIGN= ); + tcg_gen_qemu_st_i64(t64, addr, da->mem_idx, da->memop | MO_ALI= GN); } break; =20 @@ -2600,7 +2644,7 @@ gen_stda_asi(DisasContext *dc, TCGv hi, TCGv addr, in= t insn, int rd) tcg_gen_concat_tl_i64(t64, lo, hi); tcg_gen_andi_tl(d_addr, addr, -8); for (i =3D 0; i < 32; i +=3D 8) { - tcg_gen_qemu_st_i64(t64, d_addr, da.mem_idx, da.memop); + tcg_gen_qemu_st_i64(t64, d_addr, da->mem_idx, da->memop); tcg_gen_add_tl(d_addr, d_addr, eight); } } @@ -2610,12 +2654,12 @@ gen_stda_asi(DisasContext *dc, TCGv hi, TCGv addr, = int insn, int rd) /* ??? In theory we've handled all of the ASIs that are valid for stda, and this should raise DAE_invalid_asi. */ { - TCGv_i32 r_asi =3D tcg_constant_i32(da.asi); - TCGv_i32 r_mop =3D tcg_constant_i32(da.memop); + TCGv_i32 r_asi =3D tcg_constant_i32(da->asi); + TCGv_i32 r_mop =3D tcg_constant_i32(da->memop); TCGv_i64 t64 =3D tcg_temp_new_i64(); =20 /* See above. */ - if ((da.memop & MO_BSWAP) =3D=3D MO_TE) { + if ((da->memop & MO_BSWAP) =3D=3D MO_TE) { tcg_gen_concat_tl_i64(t64, lo, hi); } else { tcg_gen_concat_tl_i64(t64, hi, lo); @@ -2629,25 +2673,12 @@ gen_stda_asi(DisasContext *dc, TCGv hi, TCGv addr, = int insn, int rd) } =20 static void __attribute__((unused)) -gen_casx_asi(DisasContext *dc, TCGv addr, TCGv cmpv, int insn, int rd) +gen_stda_asi(DisasContext *dc, TCGv hi, TCGv addr, int insn, int rd) { DisasASI da =3D get_asi(dc, insn, MO_TEUQ); - TCGv oldv; =20 - switch (da.type) { - case GET_ASI_EXCP: - return; - case GET_ASI_DIRECT: - oldv =3D tcg_temp_new(); - tcg_gen_atomic_cmpxchg_tl(oldv, addr, cmpv, gen_load_gpr(dc, rd), - da.mem_idx, da.memop | MO_ALIGN); - gen_store_gpr(dc, rd, oldv); - break; - default: - /* ??? Should be DAE_invalid_asi. */ - gen_exception(dc, TT_DATA_ACCESS); - break; - } + gen_address_mask(dc, addr); + gen_stda_asi0(dc, &da, addr, rd); } =20 static TCGv get_src1(DisasContext *dc, unsigned int insn) --=20 2.34.1