From patchwork Wed Jun 7 05:46:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 690178 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp140940wru; Tue, 6 Jun 2023 22:47:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zAAw4hCfROFxj1BM6iEH1yFmixpNpGRzaEO5x6ha8gXOlc7WGvjfZiYrRu68So2ncGFOD X-Received: by 2002:a05:6214:e4d:b0:626:b17:3b87 with SMTP id o13-20020a0562140e4d00b006260b173b87mr2219869qvc.1.1686116860027; Tue, 06 Jun 2023 22:47:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686116860; cv=none; d=google.com; s=arc-20160816; b=QaIxShQD7JVQoLFQMpBnaKJhD+w4D1zCpbCkCJ00NsJYH2EDU2XnkuMBKLrY8EZeK/ 480PeAMibg7i1UdILwUMYLlCcELHa3qBBcrEUNx3lNHoYIcJZg/HBScaffxOIBsKy64X radXaBNniS8veTNB58YIdYeczj2cBkAWW2nB3qK8A+E4raIPMwZXmUjjRiFYmvGpAjUq ysFHsxZvFCuIA4y5YbzPbpaHxDBr7arQcOIlAQIwnQkx93P2XSFpQxgPgdkry4Y4CI6F dY2EwSNPUm7WynW6npfwN8REgRT9ekM0BFTi1Gf4ssQM4tXYtRj0sqD/holX1oITFGw9 335w== 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=fM6xm9cm+jVnnUxuzo389UJoVj8WYs/QWurw8xhZSYY=; b=Nm4IktDkwqVoslkeMJpN2EdOZh3XIGnowuA0v+s7+ySvWM331L98Jo11oZRKd4GDqh 3oovK7A/oiM2S8INF1zMKLqqzGj3RvumauBW9Yv14DrTs/7LJw0JvnTqf1Xe/jvg2Ytl L1LrpYniVOzSSGky07KEMBN5ytYPU7r5o2m9/JjiG57+P7G2xtFYvuGXvRHFelRRXGJo qMxDsd1T+lzu/4l7jC+18AQvt2gHjPU8/tLwE4vSfRmveY/+pHaZh4zFnjlt8YFB85mL tm/zjvIZEOs5v/8JB8qh8tIsvdCvnJMI/hGxalHp8pdFqYbHEkKP750NP1byPQIM4KCG G/rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EcTQxN5e; 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 v13-20020a05622a014d00b003f5473f9f2asi6749152qtw.208.2023.06.06.22.47.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jun 2023 22:47:40 -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=EcTQxN5e; 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 1q6m0n-0003rR-5r; Wed, 07 Jun 2023 01:47:13 -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 1q6m0l-0003qx-2e for qemu-devel@nongnu.org; Wed, 07 Jun 2023 01:47:11 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6m0Y-0006Pm-9H for qemu-devel@nongnu.org; Wed, 07 Jun 2023 01:47:10 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-653bed78635so181562b3a.0 for ; Tue, 06 Jun 2023 22:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686116817; x=1688708817; 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=fM6xm9cm+jVnnUxuzo389UJoVj8WYs/QWurw8xhZSYY=; b=EcTQxN5e4VNg3qltERrM8V7IoiCjq8v/0GXouFi+rHMC1etHj5p/oWVkV5jGYU6IPD 7SqGrokY+C8gZkpdKeWM6s8rzbOxY26dd/wBRE1Xlw48u9yoll6D5txsTjux4aIaptq0 2WknH4DKRreZJzlceTScQ9FT6gmgQ9ehE1jm5IWckQTC1oPlbLFxdRDSM3Z/AVL/bWk9 yBvYztY+vAVxATnQFF4yQpgGN8O4WQpohXYBeEj5ioENmVdoM+qyotf7bpUZ2gPdIpaf xsmmSJeFRhc4H+7wc55wLKRRSIIGv0y/83gK75QXutHRuA32O+PpxFST1UV45ieYSL2x jZkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686116817; x=1688708817; 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=fM6xm9cm+jVnnUxuzo389UJoVj8WYs/QWurw8xhZSYY=; b=gMnF387Fc+ZNtH8RnmRhdPpuVYslgLCbFcPgXQ7sLxxSH2fU6LpA4Whl49cXFgUJ1C bANrOAkhA/KQnwUYctZ40wvcjJ6BtsM0o5/Z7Rgsqv8Pm7mHAnzPinAj4iqwQ9jPSGY+ IjFLv/wiuI0dzt0hEqI397EyAkmDqYX14z8r3mNHXuF3L0skJ0+a4nHAI81PJqIR37fg TDlFREfctNrDg4q54FRK4+1jLrQOck7iYwUnrENi6ahfN7hhA8GcgZ3XmcdTn505sXtb m9hSXO72kyrPFRwGne98470DgqQKAuH8rhmqC2pP1UWrPsopx+bE0KLh9iBqI8HYY2bH +zpA== X-Gm-Message-State: AC+VfDxb89aRJeR2YR54l7UsPhIDtzYaVOn+PCi1UCek0LswZylyzpVB 2s1Uwto4tLEZXCSMmg9MJMXMkCIIenJRPeiOeVQ= X-Received: by 2002:a05:6a20:4425:b0:103:b585:b587 with SMTP id ce37-20020a056a20442500b00103b585b587mr2203146pzb.13.1686116816587; Tue, 06 Jun 2023 22:46:56 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:b7fa:ce59:1445:805a]) by smtp.gmail.com with ESMTPSA id fe16-20020a056a002f1000b0064d48d98260sm7640310pfb.156.2023.06.06.22.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 22:46:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: sw@weilnetz.de Subject: [PATCH 1/2] tcg/tci: Adjust passing of MemOpIdx Date: Tue, 6 Jun 2023 22:46:53 -0700 Message-Id: <20230607054654.622010-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607054654.622010-1-richard.henderson@linaro.org> References: <20230607054654.622010-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 Since adding MO_ATOM_MASK, the maximum MemOpIdx requires 15 bits, which overflows the 12 bit field allocated for TCI memory ops. Expand the field to 16 bits for 2-operand memory ops, and place the value in TCG_REG_TMP for 3-operand memory ops (same as we already do for 4-operand memory ops). Cures a debug assert for aarch64, with FEAT_LSE enabled. Signed-off-by: Richard Henderson --- tcg/tci.c | 30 +++++++++++++----------------- tcg/tci/tcg-target.c.inc | 21 ++++----------------- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index 813572ff39..4640902c88 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -106,7 +106,7 @@ static void tci_args_rrm(uint32_t insn, TCGReg *r0, { *r0 = extract32(insn, 8, 4); *r1 = extract32(insn, 12, 4); - *m2 = extract32(insn, 20, 12); + *m2 = extract32(insn, 16, 16); } static void tci_args_rrr(uint32_t insn, TCGReg *r0, TCGReg *r1, TCGReg *r2) @@ -141,15 +141,6 @@ static void tci_args_rrrc(uint32_t insn, *c3 = extract32(insn, 20, 4); } -static void tci_args_rrrm(uint32_t insn, - TCGReg *r0, TCGReg *r1, TCGReg *r2, MemOpIdx *m3) -{ - *r0 = extract32(insn, 8, 4); - *r1 = extract32(insn, 12, 4); - *r2 = extract32(insn, 16, 4); - *m3 = extract32(insn, 20, 12); -} - static void tci_args_rrrbb(uint32_t insn, TCGReg *r0, TCGReg *r1, TCGReg *r2, uint8_t *i3, uint8_t *i4) { @@ -929,8 +920,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_args_rrm(insn, &r0, &r1, &oi); taddr = regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); taddr = tci_uint64(regs[r2], regs[r1]); + oi = regs[r3]; } do_ld_i32: regs[r0] = tci_qemu_ld(env, taddr, oi, tb_ptr); @@ -941,8 +933,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_args_rrm(insn, &r0, &r1, &oi); taddr = (uint32_t)regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); taddr = (uint32_t)regs[r2]; + oi = regs[r3]; } goto do_ld_i64; case INDEX_op_qemu_ld_a64_i64: @@ -972,8 +965,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tci_args_rrm(insn, &r0, &r1, &oi); taddr = regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); taddr = tci_uint64(regs[r2], regs[r1]); + oi = regs[r3]; } do_st_i32: tci_qemu_st(env, taddr, regs[r0], oi, tb_ptr); @@ -985,9 +979,10 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tmp64 = regs[r0]; taddr = (uint32_t)regs[r1]; } else { - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); tmp64 = tci_uint64(regs[r1], regs[r0]); taddr = (uint32_t)regs[r2]; + oi = regs[r3]; } goto do_st_i64; case INDEX_op_qemu_st_a64_i64: @@ -1293,9 +1288,10 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) op_name, str_r(r0), str_r(r1), oi); break; case 3: - tci_args_rrrm(insn, &r0, &r1, &r2, &oi); - info->fprintf_func(info->stream, "%-12s %s, %s, %s, %x", - op_name, str_r(r0), str_r(r1), str_r(r2), oi); + tci_args_rrrr(insn, &r0, &r1, &r2, &r3); + info->fprintf_func(info->stream, "%-12s %s, %s, %s, %s", + op_name, str_r(r0), str_r(r1), + str_r(r2), str_r(r3)); break; case 4: tci_args_rrrrr(insn, &r0, &r1, &r2, &r3, &r4); diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index c9516a5e8b..5b456e1277 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -331,11 +331,11 @@ static void tcg_out_op_rrm(TCGContext *s, TCGOpcode op, { tcg_insn_unit insn = 0; - tcg_debug_assert(m2 == extract32(m2, 0, 12)); + tcg_debug_assert(m2 == extract32(m2, 0, 16)); insn = deposit32(insn, 0, 8, op); insn = deposit32(insn, 8, 4, r0); insn = deposit32(insn, 12, 4, r1); - insn = deposit32(insn, 20, 12, m2); + insn = deposit32(insn, 16, 16, m2); tcg_out32(s, insn); } @@ -392,20 +392,6 @@ static void tcg_out_op_rrrc(TCGContext *s, TCGOpcode op, tcg_out32(s, insn); } -static void tcg_out_op_rrrm(TCGContext *s, TCGOpcode op, - TCGReg r0, TCGReg r1, TCGReg r2, TCGArg m3) -{ - tcg_insn_unit insn = 0; - - tcg_debug_assert(m3 == extract32(m3, 0, 12)); - insn = deposit32(insn, 0, 8, op); - insn = deposit32(insn, 8, 4, r0); - insn = deposit32(insn, 12, 4, r1); - insn = deposit32(insn, 16, 4, r2); - insn = deposit32(insn, 20, 12, m3); - tcg_out32(s, insn); -} - static void tcg_out_op_rrrbb(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1, TCGReg r2, uint8_t b3, uint8_t b4) { @@ -860,7 +846,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, if (TCG_TARGET_REG_BITS == 64) { tcg_out_op_rrm(s, opc, args[0], args[1], args[2]); } else { - tcg_out_op_rrrm(s, opc, args[0], args[1], args[2], args[3]); + tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_TMP, args[4]); + tcg_out_op_rrrr(s, opc, args[0], args[1], args[2], TCG_REG_TMP); } break; case INDEX_op_qemu_ld_a64_i64: