From patchwork Sun Oct 22 23:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 737083 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1284630wrl; Sun, 22 Oct 2023 16:41:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGleP/9AOe2Or7/irF3ZZlcKWqjaTqrxlc7nl0lGSL+ExvuAqETV6w8AoqRBcoI52Lxw733 X-Received: by 2002:a0c:b252:0:b0:66d:65a9:8a17 with SMTP id k18-20020a0cb252000000b0066d65a98a17mr6901014qve.2.1698018088824; Sun, 22 Oct 2023 16:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698018088; cv=none; d=google.com; s=arc-20160816; b=MpuP+xhYlB7kD5lr32UKdCOG1IxGFPiNgV9KXhjqUcHysDoh3R+tvpGZmpDP23kM9F s/KdPQ8RSRFd70Yj+uoeooTSnk8U93l0OGKv13ndOU0ygowTQodQmToqKfXppvH6I9P0 zLXUZr5KxRljSEu3fpAn7GGtVfq2WcxI/Pft8zxhqNAm3AKp0hSXff69yIvDkIxTBcuS CjTAUV/8r6W1JZRPVQFNfraRLYe2FC6rjhLEASOkyZvCqtb7fg/6kqMAQKY8fEGntMOo Poso1p8C5HMAOP90D/OHjBWDbpVa0X/6FyA2H0JbIKNUsUp+53Z6tT2S/Pwae8dMyagO HR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JaYz69SUDDMX4AWeouBScFX23XE7LemVY6Jh7fmZ3qM=; fh=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=V+ZDd/Uwmjj4u2JpFXF8DBafwjXZu/vrRD9LcbcOTaAKnkN/h0KG2vkrfrfv/DBKe+ P/IH9umt9rTn+TOdG5cZozQjBBBBUrWFZDVr1qv0G4W0KW2xDV7OziSrO8PgdK1+gJK4 e1XCRZtBztOdn5X/FE49uXhMDraqMORONtjcJ6napk4h6ZsuqN+mNxFKrQJI8M/xFaq1 fXMNfQHDKNj73FwjbK2x5k6K6fUdF8qzJpMZ94Y5800K0AfXJdeOM72o2+z0vawDzjqY pdoiPNgHTRSOeDfY4upGy4TG/fYhtzQpMR1Fw56bUNjhXWQBUedKq9X5tRRc4uiGBQUO cMaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="g/EJuvzE"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c4-20020a0cd604000000b0066cfd0ec363si4753142qvj.418.2023.10.22.16.41.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Oct 2023 16:41:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="g/EJuvzE"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quhwt-00065x-0v; Sun, 22 Oct 2023 19:33:35 -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 1quhwq-0005lN-43 for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:33:32 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quhwf-0007Yz-Jy for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:33:31 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6b3c2607d9bso2100153b3a.1 for ; Sun, 22 Oct 2023 16:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698017600; x=1698622400; 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=JaYz69SUDDMX4AWeouBScFX23XE7LemVY6Jh7fmZ3qM=; b=g/EJuvzEVMOu3+kTvaeSxQUxt11ac1goe1RaBrdvbUrNIuTlghgiOjJ7nw4k1OLwi7 ycvApNl33vYgeURqFSZ2d68KQ0RTw9WylITulgrnO1NStxrSiGcjLhpBAUtQ+ZHAhkWn 4P3qnyeM9NUNoOeEvQMII9V4ybwmBRuvb6YZK5c3ILn0iUcFVWmzG+iI4sE5PbbJQRPB 15E+F1RkDTwJlR49j+3wG2wVw2RndSeAnkMGVkfedN1Hf/jLX8SWnsirdoYrBeIYV41C Uw0sn4dW8cPfhC0YIWmEMX1oNm6TZXsLGRaST9jpGfl5ThlPKmcHYRVY7dGA2T8BNNTf q3/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698017600; x=1698622400; 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=JaYz69SUDDMX4AWeouBScFX23XE7LemVY6Jh7fmZ3qM=; b=ijm/OysKhxX34Y3TqDZwNn4L4p6+9xcx3d3Z/n3HMBd7/HyjhlUWQcmUp4vtn2sT7P pVcSAfFue0unjXy7Q3b6RUfOmPk2ijVN51G1nprJN++s8q1DQprYIvpzEiBIriba0ZB9 TRrhPwOSjjQ3Z2ZOyP5roldWPYerRo/83TF5U2jWnIrVn5njeUdBC+UBDGZTpPgVYSCM 7R9Tl4jvCLzZ9bgr2GDIY+LM8G3ojnGPva/A9bmJJXPM7jv2/2eWZ7umzUIs5YYo0bY8 YkUgF6yxWxy7Q/tXuVGf4Q6dd94qla1qhy1yh+UAna3GFxgl1JKL63BpaHGR7W9XD38S vtAA== X-Gm-Message-State: AOJu0YxLrjqSrztDpbsv5NX7sn/AFZor3/+SGYh7K3ULuoRrPeM7Jejo M4cHnSvtHEHBA3xDNrf9EUMhkYE9m7yG0nODXY0= X-Received: by 2002:a05:6a00:9398:b0:6b9:a3d3:772a with SMTP id ka24-20020a056a00939800b006b9a3d3772amr5922692pfb.14.1698017600284; Sun, 22 Oct 2023 16:33:20 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id fe12-20020a056a002f0c00b0066a4e561beesm5182855pfb.173.2023.10.22.16.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 16:33:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v5 54/94] target/sparc: Move LDSTUB, LDSTUBA to decodetree Date: Sun, 22 Oct 2023 16:28:52 -0700 Message-Id: <20231022232932.80507-55-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231022232932.80507-1-richard.henderson@linaro.org> References: <20231022232932.80507-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Remove gen_ldstub_asi. Rename gen_ldstub_asi0 to gen_ldstub_asi. Merge gen_ldstub into gen_ldstub_asi. Tested-by: Mark Cave-Ayland Acked-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target/sparc/insns.decode | 4 ++++ target/sparc/translate.c | 46 +++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index 280b19f033..2f950000b5 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -284,6 +284,10 @@ STD 11 ..... 010111 ..... . ............. @r_r_i_asi # STDA STX 11 ..... 011110 ..... . ............. @r_r_r_asi # STXA STX 11 ..... 011110 ..... . ............. @r_r_i_asi # STXA +LDSTUB 11 ..... 001101 ..... . ............. @r_r_ri_na +LDSTUB 11 ..... 011101 ..... . ............. @r_r_r_asi # LDSTUBA +LDSTUB 11 ..... 011101 ..... . ............. @r_r_i_asi # LDSTUBA + NCP 10 ----- 110110 ----- --------- ----- # v8 CPop1 NCP 10 ----- 110111 ----- --------- ----- # v8 CPop2 diff --git a/target/sparc/translate.c b/target/sparc/translate.c index ddd1ab0430..3698e1a84d 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1892,13 +1892,6 @@ static void gen_swap(DisasContext *dc, TCGv dst, TCGv src, tcg_gen_atomic_xchg_tl(dst, addr, src, mmu_idx, memop | MO_ALIGN); } -static void gen_ldstub(DisasContext *dc, TCGv dst, TCGv addr, int mmu_idx) -{ - TCGv m1 = tcg_constant_tl(0xff); - gen_address_mask(dc, addr); - tcg_gen_atomic_xchg_tl(dst, addr, m1, mmu_idx, MO_UB); -} - /* asi moves */ typedef enum { GET_ASI_HELPER, @@ -2331,13 +2324,14 @@ gen_casx_asi(DisasContext *dc, TCGv addr, TCGv cmpv, int insn, int rd) gen_store_gpr(dc, rd, oldv); } -static void gen_ldstub_asi0(DisasContext *dc, DisasASI *da, TCGv dst, TCGv addr) +static void gen_ldstub_asi(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); + tcg_gen_atomic_xchg_tl(dst, addr, tcg_constant_tl(0xff), + da->mem_idx, MO_UB); break; default: /* ??? In theory, this should be raise DAE_invalid_asi. @@ -2365,15 +2359,6 @@ static void gen_ldstub_asi0(DisasContext *dc, DisasASI *da, TCGv dst, TCGv addr) } } -static void __attribute__((unused)) -gen_ldstub_asi(DisasContext *dc, TCGv dst, TCGv addr, int insn) -{ - DisasASI da = 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) { @@ -4608,6 +4593,23 @@ static bool trans_STD(DisasContext *dc, arg_r_r_ri_asi *a) return advance_pc(dc); } +static bool trans_LDSTUB(DisasContext *dc, arg_r_r_ri_asi *a) +{ + TCGv addr, reg; + DisasASI da; + + addr = gen_ldst_addr(dc, a->rs1, a->imm, a->rs2_or_imm); + if (addr == NULL) { + return false; + } + da = resolve_asi(dc, a->asi, MO_UB); + + reg = gen_dest_gpr(dc, a->rd); + gen_ldstub_asi(dc, &da, reg, addr); + gen_store_gpr(dc, a->rd, reg); + return advance_pc(dc); +} + #define CHECK_IU_FEATURE(dc, FEATURE) \ if (!((dc)->def->features & CPU_FEATURE_ ## FEATURE)) \ goto illegal_insn; @@ -5436,21 +5438,20 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) case 0x3: /* ldd, load double word */ case 0x9: /* ldsb, load signed byte */ case 0xa: /* ldsh, load signed halfword */ + case 0xd: /* ldstub */ case 0x10: /* lda, V9 lduwa, load word alternate */ case 0x11: /* lduba, load unsigned byte alternate */ case 0x12: /* lduha, load unsigned halfword alternate */ case 0x13: /* ldda, load double word alternate */ case 0x19: /* ldsba, load signed byte alternate */ case 0x1a: /* ldsha, load signed halfword alternate */ + case 0x1d: /* ldstuba */ g_assert_not_reached(); /* in decodetree */ case 0x08: /* V9 ldsw */ case 0x0b: /* V9 ldx */ case 0x18: /* V9 ldswa */ case 0x1b: /* V9 ldxa */ goto illegal_insn; /* in decodetree */ - case 0xd: /* ldstub */ - gen_ldstub(dc, cpu_val, cpu_addr, dc->mem_idx); - break; case 0x0f: /* swap, swap register with memory. Also atomically */ cpu_src1 = gen_load_gpr(dc, rd); @@ -5458,9 +5459,6 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) dc->mem_idx, MO_TEUL); break; #if !defined(CONFIG_USER_ONLY) || defined(TARGET_SPARC64) - case 0x1d: /* ldstuba -- XXX: should be atomically */ - gen_ldstub_asi(dc, cpu_val, cpu_addr, insn); - break; case 0x1f: /* swapa, swap reg with alt. memory. Also atomically */ cpu_src1 = gen_load_gpr(dc, rd);