From patchwork Thu Oct 26 00:14:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 738302 Delivered-To: patch@linaro.org Received: by 2002:adf:f842:0:b0:32d:baff:b0ca with SMTP id d2csp560430wrq; Wed, 25 Oct 2023 17:42:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGT4gswEGpfYDFWlfRu2hTaoQVNB/SDV+AEwo9Yww5zjgLbCkx3FsseYz8Tu8wAJkX4BXQf X-Received: by 2002:a5d:5b1c:0:b0:32d:87c8:b548 with SMTP id bx28-20020a5d5b1c000000b0032d87c8b548mr16506418wrb.21.1698280970364; Wed, 25 Oct 2023 17:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698280970; cv=none; d=google.com; s=arc-20160816; b=0g4CPfnEn5CcVH3s+f7fipizIdqxDyAQKDR7N37T8y/E/bjE6GB7Af39WrxIZaXgA1 6DCU5jRWshZPaaBMVEP0vAOmsNNn7W/0Z+tyGlenkv7Xkp2SgUN10SCh16DqTc+LGJ+O vuIgFIfwGoQrWZFddAajG5O0wBC5ZYqB//Fy3gdFwykuQyXwI6i8z/4GMiN6UJmLwtiZ ovc279Z/dCQoZHS7rxU9gBsbImc+u7dp+ZAvZix9/3o9BSx2A/5WkXGnmlcMmorrrGzH P7vj40PfRq0gwVAwzmDpttCq5eIHQaApku/wLtXScx87IvbwpXhvqXH91Aicc8HUCyBr AsvA== 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=aVUF256SJzOtZnYyvhHTuu241VktS0Mu9MeLZNCREB4=; fh=rYI8DiHAAFX3O5g969KmOAQ7d45Sb8OxQX1+DywGDk4=; b=eXv0aUKqagDPOjggWL2+2kr4w96tMzqS+uMx7IOup67hPRbeqWV648nO36cxnlzACn sVkRoDIA1tBd5U2T3RqfyFGaiOCBvZWO9Q2V4gUFobeqpH7CCxeZamcnyhbWqbfZbChM kGJYiXiEq7uijm79pKyzBdzeullIQJXELtnXGY3tMcXx/kjcan67CSnhw7Dkvm9xlGXp wuPZXIq/RBTH6Mgev/NymxQ9IrRI0PcnnvOcIFVmdqAhzjL7koEnIeE4bJSSsUzSx9Zl Xkc+IPCwt1OFe+ttMsCYr1xkUFJthpTJQnhRDTxsa0rTAL7APVUYyiI4PZ4+GwxUkXmp eqgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h1Jcw7pv; 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 l21-20020a056000023500b0032336b3416bsi8102446wrz.499.2023.10.25.17.42.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2023 17:42:50 -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=h1Jcw7pv; 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 1qvo2x-0007KK-Te; Wed, 25 Oct 2023 20:16:23 -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 1qvo2q-00074v-9C for qemu-devel@nongnu.org; Wed, 25 Oct 2023 20:16:16 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvo2k-0004sk-JR for qemu-devel@nongnu.org; Wed, 25 Oct 2023 20:16:16 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1caa7597af9so2155305ad.1 for ; Wed, 25 Oct 2023 17:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698279368; x=1698884168; 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=aVUF256SJzOtZnYyvhHTuu241VktS0Mu9MeLZNCREB4=; b=h1Jcw7pvbQfpc/L55J/HnPVwdnsaDT2q/1qXieAq4IAdXuw4pFgFUDYEEC8+a1ANs4 0YsT57t+//zeh6SlxrLwfbhQ/TygtBHPzJ/4kWWznvTBHNp26AUCNIAkRUrwx+KfZUsI 7oQE0uwNT4PBQ/4puAfuKSIYbTeiYh4FRqtgnCpaB2xCoGeQm7RuZU/8DTQ7jm+GLO4z FSccb0YiX7ikGws+efRMxLe7zT0SdVsJCrqvxvkp7mpawSx/XTG6VXnXdn0F07tiRGnQ vjRJtEUB/4ur6UNh7r8iQzwtMMBTcQWe4Mj7qUJ/tjG2IfdUH5MUAwkFGA7eGHrwnzh2 SoSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698279368; x=1698884168; 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=aVUF256SJzOtZnYyvhHTuu241VktS0Mu9MeLZNCREB4=; b=X3JhP85uSxcWjMwNPDQ+9u6LYfa3hplYFhhCaZ6qlGuA9HxGWmWe6eptuQdhm3CB0V omAHHiIo3y8ll5J+a1VQGd9DsX7WOAuD0F+214ZKUNSI2f3SWvQXqUxUG83cxI25cghS R7yvjJM3VB9Y+wy50YjA3RahDc9ZVVOsUYaiAuqRGf/ywk3sd9GfVRRdadpSd02An9Mh coN4vf75wrK941Nu9F/Ycq5r7Kw/mXPEz4NHLGbFcqW9Neb7sxW0STWNjQkdysVACHMR wA9JHHAmBCTweooEJMXm9eGIRec4ObXfoSM+PUI2VcyTHH76Pg8l2AgXaIk8ugYKN2+z VGYw== X-Gm-Message-State: AOJu0Yy5ibmIRfuZCrwyuGo+TNGOaQjOjB1k7bR+GQku59yVNKQQcubI IQr3pAwp53qps7JQ1qTVQXvmzEdIJ+NCkv8lx7s= X-Received: by 2002:a17:902:e2c2:b0:1c4:4c10:6ae3 with SMTP id l2-20020a170902e2c200b001c44c106ae3mr13343972plc.23.1698279367817; Wed, 25 Oct 2023 17:16:07 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id ij23-20020a170902ab5700b001c582de968dsm10038433plb.72.2023.10.25.17.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 17:16:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland Subject: [PULL 15/94] target/sparc: Move FBPfcc and FBfcc to decodetree Date: Wed, 25 Oct 2023 17:14:08 -0700 Message-Id: <20231026001542.1141412-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026001542.1141412-1-richard.henderson@linaro.org> References: <20231026001542.1141412-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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 Tested-by: Mark Cave-Ayland Acked-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target/sparc/insns.decode | 4 ++ target/sparc/translate.c | 102 +++++++++++++++----------------------- 2 files changed, 43 insertions(+), 63 deletions(-) diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index 838f4cdb1d..9ab3f2eb82 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -6,8 +6,12 @@ &bcc i a cond cc BPcc 00 a:1 cond:4 001 cc:1 0 - i:s19 &bcc Bicc 00 a:1 cond:4 010 i:s22 &bcc cc=0 +FBPfcc 00 a:1 cond:4 101 cc:2 - i:s19 &bcc +FBfcc 00 a:1 cond:4 110 i:s22 &bcc cc=0 %d16 20:s2 0:14 BPr 00 a:1 0 cond:3 011 .. - rs1:5 .............. i=%d16 +NCP 00 - ---- 111 ---------------------- # CBcc + CALL 01 i:s30 diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 2d08c81821..69e85b1842 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1356,44 +1356,6 @@ static void gen_compare_reg(DisasCompare *cmp, int cond, TCGv r_src) cmp->c2 = tcg_constant_tl(0); } -static void do_fbranch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) -{ - unsigned int cond = GET_FIELD(insn, 3, 6), a = (insn & (1 << 29)); - target_ulong target = dc->pc + offset; - - if (unlikely(AM_CHECK(dc))) { - target &= 0xffffffffULL; - } - if (cond == 0x0) { - /* unconditional not taken */ - if (a) { - dc->pc = dc->npc + 4; - dc->npc = dc->pc + 4; - } else { - dc->pc = dc->npc; - dc->npc = dc->pc + 4; - } - } else if (cond == 0x8) { - /* unconditional taken */ - if (a) { - dc->pc = target; - dc->npc = dc->pc + 4; - } else { - dc->pc = dc->npc; - dc->npc = target; - tcg_gen_mov_tl(cpu_pc, cpu_npc); - } - } else { - flush_cond(dc); - gen_fcond(cpu_cond, cc, cond); - if (a) { - gen_branch_a(dc, target); - } else { - gen_branch_n(dc, target); - } - } -} - #ifdef TARGET_SPARC64 static void gen_op_fcmps(int fccno, TCGv_i32 r_rs1, TCGv_i32 r_rs2) { @@ -3034,6 +2996,28 @@ static bool do_bpcc(DisasContext *dc, arg_bcc *a) TRANS(Bicc, ALL, do_bpcc, a) TRANS(BPcc, 64, do_bpcc, a) +static bool do_fbpfcc(DisasContext *dc, arg_bcc *a) +{ + target_long target = address_mask_i(dc, dc->pc + a->i * 4); + + if (gen_trap_ifnofpu(dc)) { + return true; + } + switch (a->cond) { + case 0x0: + return advance_jump_uncond_never(dc, a->a); + case 0x8: + return advance_jump_uncond_always(dc, a->a, target); + default: + flush_cond(dc); + gen_fcond(cpu_cond, a->cc, a->cond); + return advance_jump_cond(dc, a->a, target); + } +} + +TRANS(FBPfcc, 64, do_fbpfcc, a) +TRANS(FBfcc, ALL, do_fbpfcc, a) + static bool trans_BPr(DisasContext *dc, arg_BPr *a) { target_long target = address_mask_i(dc, dc->pc + a->i * 4); @@ -3062,6 +3046,20 @@ static bool trans_CALL(DisasContext *dc, arg_CALL *a) return true; } +static bool trans_NCP(DisasContext *dc, arg_NCP *a) +{ + /* + * For sparc32, always generate the no-coprocessor exception. + * For sparc64, always generate illegal instruction. + */ +#ifdef TARGET_SPARC64 + return false; +#else + gen_exception(dc, TT_NCP_INSN); + return true; +#endif +} + #define CHECK_IU_FEATURE(dc, FEATURE) \ if (!((dc)->def->features & CPU_FEATURE_ ## FEATURE)) \ goto illegal_insn; @@ -3085,7 +3083,6 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) case 0: /* branches/sethi */ { unsigned int xop = GET_FIELD(insn, 7, 9); - int32_t target; switch (xop) { #ifdef TARGET_SPARC64 case 0x1: /* V9 BPcc */ @@ -3093,36 +3090,15 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) case 0x3: /* V9 BPr */ g_assert_not_reached(); /* in decodetree */ case 0x5: /* V9 FBPcc */ - { - int cc = GET_FIELD_SP(insn, 20, 21); - if (gen_trap_ifnofpu(dc)) { - goto jmp_insn; - } - target = GET_FIELD_SP(insn, 0, 18); - target = sign_extend(target, 19); - target <<= 2; - do_fbranch(dc, target, insn, cc); - goto jmp_insn; - } + g_assert_not_reached(); /* in decodetree */ #else case 0x7: /* CBN+x */ - { - goto ncp_insn; - } + g_assert_not_reached(); /* in decodetree */ #endif case 0x2: /* BN+x */ g_assert_not_reached(); /* in decodetree */ case 0x6: /* FBN+x */ - { - if (gen_trap_ifnofpu(dc)) { - goto jmp_insn; - } - target = GET_FIELD(insn, 10, 31); - target = sign_extend(target, 22); - target <<= 2; - do_fbranch(dc, target, insn, 0); - goto jmp_insn; - } + g_assert_not_reached(); /* in decodetree */ case 0x4: /* SETHI */ /* Special-case %g0 because that's the canonical nop. */ if (rd) {