From nobody Sun Apr 27 18:15:13 2025
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=1739748562; cv=none;
d=zohomail.com; s=zohoarc;
b=CublfUPZvlhcMZD0YmJu6W6du4iJfLcpIJdQA891Zskldlgj1FIh5gR+BI4mxJ+oByGRxu5fCQ6Y8eKNstcRXboUyS03sYQmRl5l8VFTBgngAc3w8MlDAlcZ1VAdqA3EOggZZ8T5NHuS+Bryg5F4jacAmm48pj5Tm4DPPIfW6H0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1739748562;
h=Content-Transfer-Encoding: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:Cc;
bh=KqkEFuniO5rOsCt2BqE3N6lfQLLLo6GqiyTanadG3oU=;
b=AnPXjc0K4sCzrlsbt5KFKAttq6odQaJwU4Z59uSwFzJOANk2YurILpQ/uSO3j51LIxaY9OKGFMm+OOJNyGUOGcVNkC4QXprcouiuZiIhggwCGp2FmHw73lEnzwz4Nj5JJxTvixBbI/2zA+51E2NS7+k2LLn52+8hqHhfxoagaew=
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=<richard.henderson@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1739748562627719.6158900919971;
Sun, 16 Feb 2025 15:29:22 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tjnpx-0000r4-6E; Sun, 16 Feb 2025 18:14:11 -0500
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 <richard.henderson@linaro.org>)
id 1tjnpe-0000c7-4j
for qemu-devel@nongnu.org; Sun, 16 Feb 2025 18:13:51 -0500
Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1tjnpa-0005PN-Uc
for qemu-devel@nongnu.org; Sun, 16 Feb 2025 18:13:49 -0500
Received: by mail-pl1-x634.google.com with SMTP id
d9443c01a7336-220d39a5627so54482675ad.1
for <qemu-devel@nongnu.org>; Sun, 16 Feb 2025 15:13:46 -0800 (PST)
Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-220d5366882sm60565615ad.95.2025.02.16.15.13.44
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 16 Feb 2025 15:13:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1739747625; x=1740352425; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=KqkEFuniO5rOsCt2BqE3N6lfQLLLo6GqiyTanadG3oU=;
b=is9NHoV9Anjn+pIq6Ss+T0sDmpbSJaYILbzkDjueG68m/XPLl43uE+fu5VJUhKruKY
3thpPK52kxVs4ZspBenjgKUKVytZRvpfBsyP83KYOEE95F3rSc4SP6SY/KOgu4cyK0c3
TJaDi9Fwx2LGd98JK5Vsy8/+4pGN41P8KpPPnxHEu6EJkLxUH6MLIRn/3CBGmL9EB4c5
WwgAD/r+yuGxY+I5onoA+2tbe3kpvTuUJgdPl/iKZ/bCYv0y7XUI4lpJptBhBD97KZQg
OAyqYg5bvgc9PLJr3tJzwfLwzAZO54YLOoBx1X08bxqUn4WIYZ6HbaJiF4ydx1/mJ7Gx
XQHQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1739747625; x=1740352425;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=KqkEFuniO5rOsCt2BqE3N6lfQLLLo6GqiyTanadG3oU=;
b=nTUD03e6mLB7UvEcN1j1KElHlZ/zuxF8bY7ElZvjSeQ/PFAiZTUEU+oIXJlptB3r/J
l9i7Mq/BM0HWdrAyoI1xwXKdV7O4GrvwOzqLumXJ77WLOB1BMNY1wbpLIkRnHUnTFFSo
Tb3v+IHy0xh0PfGAe9wBlbyCFOg2JOMMWUQupnQ2GrEMZf7nFNc8mDN7qG40pvvyNuUv
UFwQwPvM47CGvuhIRbM5szx4dUlsrhY+yoiFfjCkc1qsbT0+QhVyMBMb+7Zr6MCVubwN
dZeXK6OD568eoVXpUQHFFYcftqyHcRvv6lljQEPMy63eWJjmbkXor1ZUJD/7zCPJPpv0
q47A==
X-Gm-Message-State: AOJu0YzIgG/NtQNNFk/9bG9ZOvsMboPJysFqMZfQ6F0GuubeD2Q1BI+U
Devu2ym1obGkG8llPCS0Q0ghc8YRqwSNJ2oVfvYsLE8nwUPxBcaA8v6pdkyb/KceMuUj2jzmJTu
2
X-Gm-Gg: ASbGncuSgW4BkE5OPaOazmKqEn0P+Q7xT+U7P9CqutI+sTgymDJRk8yaKzqIPB9mTzF
RqAw2D5dBr1jreorktzWllBhUl5PujVF2N0J9eNyy52x5gY6EZG50i74Syo7pOoBs5yoZcZ9p5r
dkw5Bj67/ujoG3RHVSNjQzSstjJ7iW75Z/v399CAp+LwEKeuQ2HsIybYzUQKYAEpR5DH73oA2U3
xZBnNOY0MSfrxuZb/EaKBdXNsOG+9u9AGMWh9xX1stSXWePs3uEwU8ohXG7l5jNb8mqgucevwRg
QaXP67UjIyAQ1zC43LXfFHyrWFBWaA3nhmhqDohqVZhr1Cg=
X-Google-Smtp-Source:
AGHT+IFVJAwhpDRL5BvYs8OaIFb6PGCsn6CILIZNeo72BYdon+7uLIdWPNiIA5S+OL+T3f3XPRF9cQ==
X-Received: by 2002:a17:902:ce89:b0:220:e9ac:e746 with SMTP id
d9443c01a7336-221040d81f2mr127369335ad.53.1739747624927;
Sun, 16 Feb 2025 15:13:44 -0800 (PST)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v3 040/162] tcg: Convert div to TCGOutOpBinary
Date: Sun, 16 Feb 2025 15:08:09 -0800
Message-ID: <20250216231012.2808572-41-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20250216231012.2808572-1-richard.henderson@linaro.org>
References: <20250216231012.2808572-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::634;
envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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: 1739748565134019100
Content-Type: text/plain; charset="utf-8"
For TCI, we're losing type information in the interpreter.
Introduce a tci-specific opcode to handle the difference.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tcg-op.c | 8 +++---
tcg/tcg.c | 6 +++--
tcg/tci.c | 3 ++-
tcg/aarch64/tcg-target.c.inc | 17 ++++++++-----
tcg/arm/tcg-target.c.inc | 28 +++++++++++++--------
tcg/i386/tcg-target.c.inc | 4 +++
tcg/loongarch64/tcg-target.c.inc | 24 +++++++++++-------
tcg/mips/tcg-target.c.inc | 37 ++++++++++++++++------------
tcg/ppc/tcg-target.c.inc | 21 +++++++++-------
tcg/riscv/tcg-target.c.inc | 21 +++++++++-------
tcg/s390x/tcg-target.c.inc | 4 +++
tcg/sparc64/tcg-target.c.inc | 42 ++++++++++++++++++++++++++------
tcg/tci/tcg-target-opc.h.inc | 1 +
tcg/tci/tcg-target.c.inc | 17 ++++++++++---
14 files changed, 156 insertions(+), 77 deletions(-)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 664c698187..69e50f968f 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -601,7 +601,7 @@ void tcg_gen_muli_i32(TCGv_i32 ret, TCGv_i32 arg1, int3=
2_t arg2)
=20
void tcg_gen_div_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
{
- if (TCG_TARGET_HAS_div_i32) {
+ if (tcg_op_supported(INDEX_op_div_i32, TCG_TYPE_I32, 0)) {
tcg_gen_op3_i32(INDEX_op_div_i32, ret, arg1, arg2);
} else if (TCG_TARGET_HAS_div2_i32) {
TCGv_i32 t0 =3D tcg_temp_ebb_new_i32();
@@ -617,7 +617,7 @@ void tcg_gen_rem_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_=
i32 arg2)
{
if (TCG_TARGET_HAS_rem_i32) {
tcg_gen_op3_i32(INDEX_op_rem_i32, ret, arg1, arg2);
- } else if (TCG_TARGET_HAS_div_i32) {
+ } else if (tcg_op_supported(INDEX_op_div_i32, TCG_TYPE_I32, 0)) {
TCGv_i32 t0 =3D tcg_temp_ebb_new_i32();
tcg_gen_op3_i32(INDEX_op_div_i32, t0, arg1, arg2);
tcg_gen_mul_i32(t0, t0, arg2);
@@ -1969,7 +1969,7 @@ void tcg_gen_muli_i64(TCGv_i64 ret, TCGv_i64 arg1, in=
t64_t arg2)
=20
void tcg_gen_div_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
{
- if (TCG_TARGET_HAS_div_i64) {
+ if (tcg_op_supported(INDEX_op_div_i64, TCG_TYPE_I64, 0)) {
tcg_gen_op3_i64(INDEX_op_div_i64, ret, arg1, arg2);
} else if (TCG_TARGET_HAS_div2_i64) {
TCGv_i64 t0 =3D tcg_temp_ebb_new_i64();
@@ -1985,7 +1985,7 @@ void tcg_gen_rem_i64(TCGv_i64 ret, TCGv_i64 arg1, TCG=
v_i64 arg2)
{
if (TCG_TARGET_HAS_rem_i64) {
tcg_gen_op3_i64(INDEX_op_rem_i64, ret, arg1, arg2);
- } else if (TCG_TARGET_HAS_div_i64) {
+ } else if (tcg_op_supported(INDEX_op_div_i64, TCG_TYPE_I64, 0)) {
TCGv_i64 t0 =3D tcg_temp_ebb_new_i64();
tcg_gen_op3_i64(INDEX_op_div_i64, t0, arg1, arg2);
tcg_gen_mul_i64(t0, t0, arg2);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index e5d7c3dd19..3b6aba1a84 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -1020,6 +1020,8 @@ static const TCGOutOp * const all_outop[NB_OPS] =3D {
OUTOP(INDEX_op_add, TCGOutOpBinary, outop_add),
OUTOP(INDEX_op_and, TCGOutOpBinary, outop_and),
OUTOP(INDEX_op_andc, TCGOutOpBinary, outop_andc),
+ OUTOP(INDEX_op_div_i32, TCGOutOpBinary, outop_divs),
+ OUTOP(INDEX_op_div_i64, TCGOutOpBinary, outop_divs),
OUTOP(INDEX_op_eqv, TCGOutOpBinary, outop_eqv),
OUTOP(INDEX_op_mul, TCGOutOpBinary, outop_mul),
OUTOP(INDEX_op_mulsh, TCGOutOpBinary, outop_mulsh),
@@ -2260,7 +2262,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, uns=
igned flags)
=20
case INDEX_op_negsetcond_i32:
return TCG_TARGET_HAS_negsetcond_i32;
- case INDEX_op_div_i32:
case INDEX_op_divu_i32:
return TCG_TARGET_HAS_div_i32;
case INDEX_op_rem_i32:
@@ -2323,7 +2324,6 @@ bool tcg_op_supported(TCGOpcode op, TCGType type, uns=
igned flags)
=20
case INDEX_op_negsetcond_i64:
return TCG_TARGET_HAS_negsetcond_i64;
- case INDEX_op_div_i64:
case INDEX_op_divu_i64:
return TCG_TARGET_HAS_div_i64;
case INDEX_op_rem_i64:
@@ -5411,6 +5411,8 @@ static void tcg_reg_alloc_op(TCGContext *s, const TCG=
Op *op)
case INDEX_op_add:
case INDEX_op_and:
case INDEX_op_andc:
+ case INDEX_op_div_i32:
+ case INDEX_op_div_i64:
case INDEX_op_eqv:
case INDEX_op_mul:
case INDEX_op_mulsh:
diff --git a/tcg/tci.c b/tcg/tci.c
index 61c0ccf21e..4ecbb2d335 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -578,7 +578,7 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchStat=
e *env,
=20
/* Arithmetic operations (32 bit). */
=20
- case INDEX_op_div_i32:
+ case INDEX_op_tci_divs32:
tci_args_rrr(insn, &r0, &r1, &r2);
regs[r0] =3D (int32_t)regs[r1] / (int32_t)regs[r2];
break;
@@ -1101,6 +1101,7 @@ int print_insn_tci(bfd_vma addr, disassemble_info *in=
fo)
case INDEX_op_clz_i64:
case INDEX_op_ctz_i32:
case INDEX_op_ctz_i64:
+ case INDEX_op_tci_divs32:
tci_args_rrr(insn, &r0, &r1, &r2);
info->fprintf_func(info->stream, "%-12s %s, %s, %s",
op_name, str_r(r0), str_r(r1), str_r(r2));
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 493c504682..52069f1445 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -2157,6 +2157,17 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ tcg_out_insn(s, 3508, SDIV, type, a0, a1, a2);
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, r),
+ .out_rrr =3D tgen_divs,
+};
+
static void tgen_eqv(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
@@ -2362,10 +2373,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,=
TCGType ext,
tcg_out_ldst(s, I3312_STRX, a0, a1, a2, 3);
break;
=20
- case INDEX_op_div_i64:
- case INDEX_op_div_i32:
- tcg_out_insn(s, 3508, SDIV, ext, a0, a1, a2);
- break;
case INDEX_op_divu_i64:
case INDEX_op_divu_i32:
tcg_out_insn(s, 3508, UDIV, ext, a0, a1, a2);
@@ -3057,8 +3064,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigne=
d flags)
case INDEX_op_negsetcond_i64:
return C_O1_I2(r, r, rC);
=20
- case INDEX_op_div_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i32:
case INDEX_op_divu_i64:
case INDEX_op_rem_i32:
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index b83d221dbc..025d32dee6 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -943,12 +943,6 @@ static void tcg_out_smull32(TCGContext *s, ARMCond con=
d, TCGReg rd0,
(rd1 << 16) | (rd0 << 12) | (rm << 8) | rn);
}
=20
-static void tcg_out_sdiv(TCGContext *s, ARMCond cond,
- TCGReg rd, TCGReg rn, TCGReg rm)
-{
- tcg_out32(s, 0x0710f010 | (cond << 28) | (rd << 16) | rn | (rm << 8));
-}
-
static void tcg_out_udiv(TCGContext *s, ARMCond cond,
TCGReg rd, TCGReg rn, TCGReg rm)
{
@@ -1880,6 +1874,24 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static TCGConstraintSetIndex cset_idiv(TCGType type, unsigned flags)
+{
+ return use_idiv_instructions ? C_O1_I2(r, r, r) : C_NotImplemented;
+}
+
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ /* sdiv */
+ tcg_out32(s, 0x0710f010 | (COND_AL << 28) | (a0 << 16) | a1 | (a2 << 8=
));
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_Dynamic,
+ .base.dynamic_constraint =3D cset_idiv,
+ .out_rrr =3D tgen_divs,
+};
+
static const TCGOutOpBinary outop_eqv =3D {
.base.static_constraint =3D C_NotImplemented,
};
@@ -2224,9 +2236,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =
TCGType type,
}
break;
=20
- case INDEX_op_div_i32:
- tcg_out_sdiv(s, COND_AL, args[0], args[1], args[2]);
- break;
case INDEX_op_divu_i32:
tcg_out_udiv(s, COND_AL, args[0], args[1], args[2]);
break;
@@ -2274,7 +2283,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigne=
d flags)
case INDEX_op_ctz_i32:
return C_O1_I2(r, r, rIK);
=20
- case INDEX_op_div_i32:
case INDEX_op_divu_i32:
return C_O1_I2(r, r, r);
=20
diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc
index c20612ff7c..ebd074d0b3 100644
--- a/tcg/i386/tcg-target.c.inc
+++ b/tcg/i386/tcg-target.c.inc
@@ -2633,6 +2633,10 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_NotImplemented,
+};
+
static const TCGOutOpBinary outop_eqv =3D {
.base.static_constraint =3D C_NotImplemented,
};
diff --git a/tcg/loongarch64/tcg-target.c.inc b/tcg/loongarch64/tcg-target.=
c.inc
index 65a93050cc..3970dcabbc 100644
--- a/tcg/loongarch64/tcg-target.c.inc
+++ b/tcg/loongarch64/tcg-target.c.inc
@@ -1316,6 +1316,21 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ if (type =3D=3D TCG_TYPE_I32) {
+ tcg_out_opc_div_w(s, a0, a1, a2);
+ } else {
+ tcg_out_opc_div_d(s, a0, a1, a2);
+ }
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, r),
+ .out_rrr =3D tgen_divs,
+};
+
static const TCGOutOpBinary outop_eqv =3D {
.base.static_constraint =3D C_NotImplemented,
};
@@ -1659,13 +1674,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,=
TCGType type,
}
break;
=20
- case INDEX_op_div_i32:
- tcg_out_opc_div_w(s, a0, a1, a2);
- break;
- case INDEX_op_div_i64:
- tcg_out_opc_div_d(s, a0, a1, a2);
- break;
-
case INDEX_op_divu_i32:
tcg_out_opc_div_wu(s, a0, a1, a2);
break;
@@ -2351,8 +2359,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigne=
d flags)
case INDEX_op_setcond_i64:
return C_O1_I2(r, rz, rJ);
=20
- case INDEX_op_div_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i32:
case INDEX_op_divu_i64:
case INDEX_op_rem_i32:
diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
index 08d98f49f7..9c1fc86f5a 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -1712,6 +1712,27 @@ static const TCGOutOpBinary outop_andc =3D {
.base.static_constraint =3D C_NotImplemented,
};
=20
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ if (use_mips32r6_instructions) {
+ if (type =3D=3D TCG_TYPE_I32) {
+ tcg_out_opc_reg(s, OPC_DIV_R6, a0, a1, a2);
+ } else {
+ tcg_out_opc_reg(s, OPC_DDIV_R6, a0, a1, a2);
+ }
+ } else {
+ MIPSInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_DIV : OPC_DDIV;
+ tcg_out_opc_reg(s, insn, 0, a1, a2);
+ tcg_out_opc_reg(s, OPC_MFLO, a0, 0, 0);
+ }
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, r),
+ .out_rrr =3D tgen_divs,
+};
+
static const TCGOutOpBinary outop_eqv =3D {
.base.static_constraint =3D C_NotImplemented,
};
@@ -1945,13 +1966,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,=
TCGType type,
tcg_out_ldst(s, i1, a0, a1, a2);
break;
=20
- case INDEX_op_div_i32:
- if (use_mips32r6_instructions) {
- tcg_out_opc_reg(s, OPC_DIV_R6, a0, a1, a2);
- break;
- }
- i1 =3D OPC_DIV, i2 =3D OPC_MFLO;
- goto do_hilo1;
case INDEX_op_divu_i32:
if (use_mips32r6_instructions) {
tcg_out_opc_reg(s, OPC_DIVU_R6, a0, a1, a2);
@@ -1973,13 +1987,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,=
TCGType type,
}
i1 =3D OPC_DIVU, i2 =3D OPC_MFHI;
goto do_hilo1;
- case INDEX_op_div_i64:
- if (use_mips32r6_instructions) {
- tcg_out_opc_reg(s, OPC_DDIV_R6, a0, a1, a2);
- break;
- }
- i1 =3D OPC_DDIV, i2 =3D OPC_MFLO;
- goto do_hilo1;
case INDEX_op_divu_i64:
if (use_mips32r6_instructions) {
tcg_out_opc_reg(s, OPC_DDIVU_R6, a0, a1, a2);
@@ -2259,12 +2266,10 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsig=
ned flags)
case INDEX_op_st_i64:
return C_O0_I2(rz, r);
=20
- case INDEX_op_div_i32:
case INDEX_op_divu_i32:
case INDEX_op_rem_i32:
case INDEX_op_remu_i32:
case INDEX_op_setcond_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i64:
case INDEX_op_rem_i64:
case INDEX_op_remu_i64:
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 7ebadf396a..9fdf8df082 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -2960,6 +2960,18 @@ static void tgen_eqv(TCGContext *s, TCGType type,
tcg_out32(s, EQV | SAB(a1, a0, a2));
}
=20
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ uint32_t insn =3D type =3D=3D TCG_TYPE_I32 ? DIVW : DIVD;
+ tcg_out32(s, insn | TAB(a0, a1, a2));
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, r),
+ .out_rrr =3D tgen_divs,
+};
+
static const TCGOutOpBinary outop_eqv =3D {
.base.static_constraint =3D C_O1_I2(r, r, r),
.out_rrr =3D tgen_eqv,
@@ -3209,10 +3221,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,=
TCGType type,
tcg_out32(s, CNTPOPD | SAB(args[1], args[0], 0));
break;
=20
- case INDEX_op_div_i32:
- tcg_out32(s, DIVW | TAB(args[0], args[1], args[2]));
- break;
-
case INDEX_op_divu_i32:
tcg_out32(s, DIVWU | TAB(args[0], args[1], args[2]));
break;
@@ -3317,9 +3325,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =
TCGType type,
}
break;
=20
- case INDEX_op_div_i64:
- tcg_out32(s, DIVD | TAB(args[0], args[1], args[2]));
- break;
case INDEX_op_divu_i64:
tcg_out32(s, DIVDU | TAB(args[0], args[1], args[2]));
break;
@@ -4184,11 +4189,9 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsign=
ed flags)
case INDEX_op_rotr_i64:
return C_O1_I2(r, r, ri);
=20
- case INDEX_op_div_i32:
case INDEX_op_divu_i32:
case INDEX_op_rem_i32:
case INDEX_op_remu_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i64:
case INDEX_op_rem_i64:
case INDEX_op_remu_i64:
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
index 82f76b8e0c..15925729dc 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -1997,6 +1997,18 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ RISCVInsn insn =3D type =3D=3D TCG_TYPE_I32 ? OPC_DIVW : OPC_DIV;
+ tcg_out_opc_reg(s, insn, a0, a1, a2);
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, r),
+ .out_rrr =3D tgen_divs,
+};
+
static void tgen_eqv(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
@@ -2201,13 +2213,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc,=
TCGType type,
tcg_out_ldst(s, OPC_SD, a0, a1, a2);
break;
=20
- case INDEX_op_div_i32:
- tcg_out_opc_reg(s, OPC_DIVW, a0, a1, a2);
- break;
- case INDEX_op_div_i64:
- tcg_out_opc_reg(s, OPC_DIV, a0, a1, a2);
- break;
-
case INDEX_op_divu_i32:
tcg_out_opc_reg(s, OPC_DIVUW, a0, a1, a2);
break;
@@ -2730,11 +2735,9 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsign=
ed flags)
case INDEX_op_negsetcond_i64:
return C_O1_I2(r, r, rI);
=20
- case INDEX_op_div_i32:
case INDEX_op_divu_i32:
case INDEX_op_rem_i32:
case INDEX_op_remu_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i64:
case INDEX_op_rem_i64:
case INDEX_op_remu_i64:
diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc
index 2685e6ffa1..fd0e717c49 100644
--- a/tcg/s390x/tcg-target.c.inc
+++ b/tcg/s390x/tcg-target.c.inc
@@ -2242,6 +2242,10 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_NotImplemented,
+};
+
static void tgen_eqv(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc
index 95a138ef56..779d0ce882 100644
--- a/tcg/sparc64/tcg-target.c.inc
+++ b/tcg/sparc64/tcg-target.c.inc
@@ -1333,6 +1333,40 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static void tgen_divs_rJ(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGArg a2, bool c2)
+{
+ uint32_t insn;
+
+ if (type =3D=3D TCG_TYPE_I32) {
+ /* Load Y with the sign extension of a1 to 64-bits. */
+ tcg_out_arithi(s, TCG_REG_T1, a1, 31, SHIFT_SRA);
+ tcg_out_sety(s, TCG_REG_T1);
+ insn =3D ARITH_SDIV;
+ } else {
+ insn =3D ARITH_SDIVX;
+ }
+ tcg_out_arithc(s, a0, a1, a2, c2, insn);
+}
+
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ tgen_divs_rJ(s, type, a0, a1, a2, false);
+}
+
+static void tgen_divsi(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, tcg_target_long a2)
+{
+ tgen_divs_rJ(s, type, a0, a1, a2, true);
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, rJ),
+ .out_rrr =3D tgen_divs,
+ .out_rri =3D tgen_divsi,
+};
+
static const TCGOutOpBinary outop_eqv =3D {
.base.static_constraint =3D C_NotImplemented,
};
@@ -1532,9 +1566,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =
TCGType type,
c =3D SHIFT_SRA;
goto do_shift32;
=20
- case INDEX_op_div_i32:
- tcg_out_div32(s, a0, a1, a2, c2, 0);
- break;
case INDEX_op_divu_i32:
tcg_out_div32(s, a0, a1, a2, c2, 1);
break;
@@ -1607,9 +1638,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, =
TCGType type,
case INDEX_op_sar_i64:
c =3D SHIFT_SRAX;
goto do_shift64;
- case INDEX_op_div_i64:
- c =3D ARITH_SDIVX;
- goto gen_arith;
case INDEX_op_divu_i64:
c =3D ARITH_UDIVX;
goto gen_arith;
@@ -1700,8 +1728,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigne=
d flags)
case INDEX_op_qemu_st_i64:
return C_O0_I2(rz, r);
=20
- case INDEX_op_div_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i32:
case INDEX_op_divu_i64:
case INDEX_op_shl_i32:
diff --git a/tcg/tci/tcg-target-opc.h.inc b/tcg/tci/tcg-target-opc.h.inc
index ecc8c4e55e..f503374643 100644
--- a/tcg/tci/tcg-target-opc.h.inc
+++ b/tcg/tci/tcg-target-opc.h.inc
@@ -2,3 +2,4 @@
/* These opcodes for use between the tci generator and interpreter. */
DEF(tci_movi, 1, 0, 1, TCG_OPF_NOT_PRESENT)
DEF(tci_movl, 1, 0, 1, TCG_OPF_NOT_PRESENT)
+DEF(tci_divs32, 1, 2, 0, TCG_OPF_NOT_PRESENT)
diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc
index 1dcce543ec..c8e86a3253 100644
--- a/tcg/tci/tcg-target.c.inc
+++ b/tcg/tci/tcg-target.c.inc
@@ -79,8 +79,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned fl=
ags)
case INDEX_op_st_i64:
return C_O0_I2(r, r);
=20
- case INDEX_op_div_i32:
- case INDEX_op_div_i64:
case INDEX_op_divu_i32:
case INDEX_op_divu_i64:
case INDEX_op_rem_i32:
@@ -648,6 +646,20 @@ static const TCGOutOpBinary outop_andc =3D {
.out_rrr =3D tgen_andc,
};
=20
+static void tgen_divs(TCGContext *s, TCGType type,
+ TCGReg a0, TCGReg a1, TCGReg a2)
+{
+ TCGOpcode opc =3D (type =3D=3D TCG_TYPE_I32
+ ? INDEX_op_tci_divs32
+ : INDEX_op_div_i64);
+ tcg_out_op_rrr(s, opc, a0, a1, a2);
+}
+
+static const TCGOutOpBinary outop_divs =3D {
+ .base.static_constraint =3D C_O1_I2(r, r, r),
+ .out_rrr =3D tgen_divs,
+};
+
static void tgen_eqv(TCGContext *s, TCGType type,
TCGReg a0, TCGReg a1, TCGReg a2)
{
@@ -811,7 +823,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TC=
GType type,
CASE_32_64(sar)
CASE_32_64(rotl) /* Optional (TCG_TARGET_HAS_rot_*). */
CASE_32_64(rotr) /* Optional (TCG_TARGET_HAS_rot_*). */
- CASE_32_64(div) /* Optional (TCG_TARGET_HAS_div_*). */
CASE_32_64(divu) /* Optional (TCG_TARGET_HAS_div_*). */
CASE_32_64(rem) /* Optional (TCG_TARGET_HAS_div_*). */
CASE_32_64(remu) /* Optional (TCG_TARGET_HAS_div_*). */
--=20
2.43.0