From patchwork Sun Oct 22 23:28:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 737064 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1283270wrl; Sun, 22 Oct 2023 16:35:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhoNa836CU2hAKeH6GzT5CuNnxekYMlI/f9UzNMkkucz16pv9CG5uyjCLj1m73iiw70tYd X-Received: by 2002:a05:622a:1a8d:b0:419:c9df:412b with SMTP id s13-20020a05622a1a8d00b00419c9df412bmr8884013qtc.10.1698017747381; Sun, 22 Oct 2023 16:35:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698017747; cv=none; d=google.com; s=arc-20160816; b=xHhX3tou1mTGSzDKlwoQvwWJdRzrCdfNQ0RKPdBeDcJY1mpea5Xp8iyQUM8R7otl9k AvKSzWl+rb7ytXfN7ICKlhpFAd0I6f8vxPDt0onnYeIueeDuYQpUNDe0MUiDN6iAhYrU AEWI8uql161Nm+/9APaenHjxXQ3MW6Y8piFoxnoZQ14JDdPA6cj73NSIOd3SuWI3ttkp 2vPcuYRJwzMbYgGBZwOUvVZ4t2wQm8tg0uhMwZNAQjaOZkNWoC6oaMn+cTrQY7DGMnb/ X2NoFN5yxM0tDFdh0ZguFsf6f9yKWdLZaOQ34Hy0jVPcehuFK+n0GtX/pJ5bL5nG+rEd lFrw== 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=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=sU0nNA+uJAd/F/BYJce//FFF3lLLh3QxX5CEVTISbY7GmJ3zlwfHWnSluMcBJ3d3j+ OkARj/fgCYn+gscUuzg56aTyx7hvPbBGixV+gRx9j3dsFsepQR0s4LWxuwUSWXZpEIK1 vvozCmpieqNimnRRAaWTZxrMbwQYDzf4VTD+gnOBfbouf3dbXohUZ6qGpH5jr/M63Rvv mGRhj0iZ/LCFydA4PYM+oylPNW9oj/SHgh4m5xBeEZkrRlsrz89miJjFnnY7BEHV+gPm 7ah1fQKywk62JLega0EP5zpwCsgWV7xsCMe35faJe8WykK6U6Pr5gNfCSq2Zxt6VxZ7a 3P2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o9w5UVLL; 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 r11-20020a05622a034b00b004198ac8b4d8si4926114qtw.496.2023.10.22.16.35.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Oct 2023 16:35:47 -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=o9w5UVLL; 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 1quhtQ-0007AM-UE; Sun, 22 Oct 2023 19:30:00 -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 1quhtK-00077n-MU for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:29:54 -0400 Received: from mail-oo1-xc32.google.com ([2607:f8b0:4864:20::c32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quhtF-0006ju-AJ for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:29:54 -0400 Received: by mail-oo1-xc32.google.com with SMTP id 006d021491bc7-57ad95c555eso1777978eaf.3 for ; Sun, 22 Oct 2023 16:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698017387; x=1698622187; 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=o9w5UVLL9DWg6bQtmhV2FZm2Zz0SzVMMXi9+NDMJSdv1zYjG3jOjPdmSDM54lRqULC MYg2njgQUuZP98Z1S6qzMwttsRMH2Opuo+b0SQ8RrWvoawfIrRoNadSBgRCa6gH7iIdq tkaDHDmP8v5dVAVyMnxuoU5F6aQSITaGfrucQdb9nfiBnCNHvjOlplId4gj0jDzUu9l4 Sl38sw+Abd4w+T8yMWFf7gOUBUSFobCXwSNnF5m2yE75Ks0kZ5WEdaiZh3hdAkru3CGO plzZDAhUA+q5bGwB2kwhTaCc1i/xSjdDYmN8svUWfnHKCZFJwiY1mJWwTMoHB1QTPc+k 9BnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698017387; x=1698622187; 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=R+8evqKiyLNJGIGMaxdXbK0v5J+KDjNAbs/v9wtZQlY0WJ7gb1FPPUEFHO3vHJRY1V h1XcPnbulbfzpqpT1TkhLelj0O68ThF6Gp7EyybMiixzrFu2x+EbNI6ndA11FGbyRfGq 8LgwcPa9TeES9Q5L59yECrGMfqzqRZNEd4245aIbbqFHQP6FSviOud4UUtpoQCHTqWuB /VuFtogYQYlDz3rjL9IMZB+p415ICj6yRM+sxAdM4eCdXA1GHPK19Qb3O+yvwpGuTZJ1 0+DYpI4Oaikad5AS7xXf3n20UODa05ouHs11z8kB69GMSJ8uvqBUcNbMFcOVn30GBIWb fR5A== X-Gm-Message-State: AOJu0Yx2X2EEP2Usvv25Re3UXOa+l5EdToC5DqdqayeuHVTUvjIZpBFt QP36hl9Otnyen2afV5X0ofBhMcE1oYgaNiPYBf8= X-Received: by 2002:a05:6358:16d4:b0:168:e443:fbf4 with SMTP id r20-20020a05635816d400b00168e443fbf4mr271255rwl.30.1698017386985; Sun, 22 Oct 2023 16:29:46 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id k26-20020a63ba1a000000b005b25a04cf8bsm4023772pgf.12.2023.10.22.16.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 16:29:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v5 15/94] target/sparc: Move FBPfcc and FBfcc to decodetree Date: Sun, 22 Oct 2023 16:28:13 -0700 Message-Id: <20231022232932.80507-16-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::c32; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc32.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) {