From patchwork Wed Feb 5 04:03:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 862161 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:11cb:b0:385:e875:8a9e with SMTP id i11csp632387wrx; Tue, 4 Feb 2025 20:06:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUWZ0owopn4TL/+zhAVR67AjBTaUrPBQPADSBcpQm/6aOFuUYuFp7lwQmEUAZ50vQBfd8XD5Q==@linaro.org X-Google-Smtp-Source: AGHT+IGJ7f0neqOFSjvOBMFJhYqrxL7boZ69+R2Usfk+8IYPfbFV+MtXrVqD70Q+kewRyJdCcu78 X-Received: by 2002:a05:6214:194c:b0:6e2:2dd7:1404 with SMTP id 6a1803df08f44-6e42fb0437amr21245706d6.3.1738728403371; Tue, 04 Feb 2025 20:06:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738728403; cv=none; d=google.com; s=arc-20240605; b=RL/cMpJWqWYbKZrR81A4u4JPY+Zcus9sRwjA5KTk90qexD/hZh9DRTz5fZXCJjUtAq i7k0+xvFkPY5i/21sbLNg80MqkqXVCDelV7NUfy2wCwijeY+SBSlYdCgMrVe0oyW+l6l aVeT0ivytZLoOQukTF04KVxMtQUxYBrC9uxoKnGh+xYIpihfEGZrT4n4Qa4EDZFc2DiG 8JTLOL3C4761grqDV7MvY5nleRVZ9fkrAENL17AX0L/8Pgp5jYLecyNLDTmJ2jw8P3a+ 0E3pUDGOQXKYLZo2M+AsT2YPBofk6o8b/+QDGdXaaLODkETEIxYBWUxcB7SBwC65fmHM sskQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=gLYqET5p8j8VFKQbbiyA8QMXMpxuG1/ty4odhnTY0Ts=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=JKqzjtdCVlgi/XpHJZ8kS3w5Qq3JFqhqqfBCd+U0KBKCfKgChi3wobwNN1FKCHG7fi 3iia5MHYfq8PaLiOFIRdH/mRqCHCIBftqej/rZ3fMLWobp7v4Akarmh/urjnGeMNsoOu VqtZdoZGn9T5SSji89RSVU/RyQfT3UnFY36kTo3mVfd+LvAa0WxMIdlyrD8Ht6aS74lS qvCjIVxCOpnzivWfr8HukMMGhVxUVcXcewf9O2dNj+GodGQk1jPtaFto/8TkLwJOGiM6 2Tz7/kcKXUPQv0H3fC4sfZAO86voRfUHqdcT1QXdhpYOF5L5HNZCJE06MRAyaStXVDJt Yx/w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rS+xUsWg; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c02dc00b7asi444716485a.573.2025.02.04.20.06.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Feb 2025 20:06:43 -0800 (PST) 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=rS+xUsWg; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfWdq-0008KS-37; Tue, 04 Feb 2025 23:03:58 -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 ) id 1tfWdm-0008IK-IU for qemu-devel@nongnu.org; Tue, 04 Feb 2025 23:03:54 -0500 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 1tfWdj-00079a-1p for qemu-devel@nongnu.org; Tue, 04 Feb 2025 23:03:52 -0500 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-21654fdd5daso110101595ad.1 for ; Tue, 04 Feb 2025 20:03:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738728228; x=1739333028; 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=gLYqET5p8j8VFKQbbiyA8QMXMpxuG1/ty4odhnTY0Ts=; b=rS+xUsWg3fqap0tyCo+MHR9oJZMAsDTzuY2oRsgqsryGDsC3RgxFQDWps3NLj6gruY csD9X8AHZeGgSBPaCdbgJvtZndJdKTU71Et8m2UKaKVPxgmCAu7Wuk+N3rixHXA0CrFH WfkUJxWCHhHfQsWCXcM4cZyVTwj6UAivvqFz463jTkdyFckAkl2kbzOgWxsHN6N27xGU S+dYoXmSOMmE7h4QHYKbnrf5MEMjrgupWCXe+tYHwcH1X16fvpJQgQ+KdR1iiHfyLAwV RbclZbH0xBBb+o12UWxvdIxlrICeRdJSQ2pdepsi492jvyWO7iRlOvW+51xP/GbT/GVY IeWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738728228; x=1739333028; 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=gLYqET5p8j8VFKQbbiyA8QMXMpxuG1/ty4odhnTY0Ts=; b=Erp2GEKTz5xNqD6XEEUdQvMdDSdl3S8bR1cd+ack1R+RjWwUBo9nRMWGZuU9JJl4BL Jik+Wd6A+Ju9wjHeepsJP73RfNslL94qD+PCeTEZ1jDSokJ4WeiuPH2amjhH1G2VFU6i KhXsP+WfZQwGcPgD5DiOYJldG0zbZmqyVc08cDe47EL9NbEBvw2LQVo+icdXWpbjDyvE cTyV7hFAyXe89knzgrv63o7hGu3/s8BqxcXi+PROkmdwwLN4r5fo/oyg3z/Ea2W4hKnM 5FRfuTj6RqhLNv3CduDefCA8Mg7p6+1snwuBloFIS1FdWgCrCnkAoYpP8xoCJgCjRQeL x4Kw== X-Gm-Message-State: AOJu0Yxjrve3KqfZFaFZHm+tCz7QMCabv/uGlIa6kg0EePLJslDFMcIg cQbUplKEJc97j66V12fTQDZaXbEmPb9pGJPmtWWzZchJVxN3RlFfm2pPZ52nqbPgx+s5qH9Xsvo L X-Gm-Gg: ASbGncutrxwL9CFDJ3NwMrXJ+fNAg1DS2OZYme5atS6zrglXXbJRMIbtjoikwlxwMJG 9PTaSByEF8+2+4opvmqkDNT6qRBOHOmvIHwxZ1/le9WEZoYefFtbdea3r6llWOSovwgEIyJc0gw koYTf7wY+M/6kf978CtOvw6nnqbZ4s/k7eTeQlLkjZ2GmnoYmrTC4jHrH4wFxloxGjS0MzuKx/w mpYQLsQBwbV/cm/Hr56uIS9z2W5tlnsjOjv9Bpun9Pnksa5x7p1lLYUHEU6ooRFP0EdlwR/Z0LT n7llessJhg2YCZ/8Ibm5Kp4xT0RQnN5l87J5MmkdF2iu1P0= X-Received: by 2002:a17:902:c94d:b0:215:b9a6:5cb9 with SMTP id d9443c01a7336-21f17e26df1mr24644095ad.5.1738728228179; Tue, 04 Feb 2025 20:03:48 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f054eb89esm22380325ad.79.2025.02.04.20.03.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 20:03:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 05/11] tcg/mips: Drop addrhi from prepare_host_addr Date: Tue, 4 Feb 2025 20:03:35 -0800 Message-ID: <20250205040341.2056361-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205040341.2056361-1-richard.henderson@linaro.org> References: <20250205040341.2056361-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 The guest address will now always fit in one register. Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c.inc | 62 ++++++++++++++------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index b1d512ca2a..153ce1f3c3 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -1217,8 +1217,7 @@ bool tcg_target_has_memory_bswap(MemOp memop) * is required and fill in @h with the host address for the fast path. */ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, - TCGReg addrlo, TCGReg addrhi, - MemOpIdx oi, bool is_ld) + TCGReg addr, MemOpIdx oi, bool is_ld) { TCGType addr_type = s->addr_type; TCGLabelQemuLdst *ldst = NULL; @@ -1245,8 +1244,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, ldst = new_ldst_label(s); ldst->is_ld = is_ld; ldst->oi = oi; - ldst->addrlo_reg = addrlo; - ldst->addrhi_reg = addrhi; + ldst->addrlo_reg = addr; /* Load tlb_mask[mmu_idx] and tlb_table[mmu_idx]. */ tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP0, TCG_AREG0, mask_off); @@ -1254,11 +1252,10 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, /* Extract the TLB index from the address into TMP3. */ if (TCG_TARGET_REG_BITS == 32 || addr_type == TCG_TYPE_I32) { - tcg_out_opc_sa(s, OPC_SRL, TCG_TMP3, addrlo, + tcg_out_opc_sa(s, OPC_SRL, TCG_TMP3, addr, s->page_bits - CPU_TLB_ENTRY_BITS); } else { - tcg_out_dsrl(s, TCG_TMP3, addrlo, - s->page_bits - CPU_TLB_ENTRY_BITS); + tcg_out_dsrl(s, TCG_TMP3, addr, s->page_bits - CPU_TLB_ENTRY_BITS); } tcg_out_opc_reg(s, OPC_AND, TCG_TMP3, TCG_TMP3, TCG_TMP0); @@ -1288,48 +1285,35 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, tcg_out_opc_imm(s, (TCG_TARGET_REG_BITS == 32 || addr_type == TCG_TYPE_I32 ? OPC_ADDIU : OPC_DADDIU), - TCG_TMP2, addrlo, s_mask - a_mask); + TCG_TMP2, addr, s_mask - a_mask); tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, TCG_TMP2); } else { - tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, addrlo); + tcg_out_opc_reg(s, OPC_AND, TCG_TMP1, TCG_TMP1, addr); } /* Zero extend a 32-bit guest address for a 64-bit host. */ if (TCG_TARGET_REG_BITS == 64 && addr_type == TCG_TYPE_I32) { - tcg_out_ext32u(s, TCG_TMP2, addrlo); - addrlo = TCG_TMP2; + tcg_out_ext32u(s, TCG_TMP2, addr); + addr = TCG_TMP2; } ldst->label_ptr[0] = s->code_ptr; tcg_out_opc_br(s, OPC_BNE, TCG_TMP1, TCG_TMP0); - /* Load and test the high half tlb comparator. */ - if (TCG_TARGET_REG_BITS == 32 && addr_type != TCG_TYPE_I32) { - /* delay slot */ - tcg_out_ldst(s, OPC_LW, TCG_TMP0, TCG_TMP3, cmp_off + HI_OFF); - - /* Load the tlb addend for the fast path. */ - tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP3, TCG_TMP3, add_off); - - ldst->label_ptr[1] = s->code_ptr; - tcg_out_opc_br(s, OPC_BNE, addrhi, TCG_TMP0); - } - /* delay slot */ base = TCG_TMP3; - tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP3, addrlo); + tcg_out_opc_reg(s, ALIAS_PADD, base, TCG_TMP3, addr); } else { if (a_mask && (use_mips32r6_instructions || a_bits != s_bits)) { ldst = new_ldst_label(s); ldst->is_ld = is_ld; ldst->oi = oi; - ldst->addrlo_reg = addrlo; - ldst->addrhi_reg = addrhi; + ldst->addrlo_reg = addr; /* We are expecting a_bits to max out at 7, much lower than ANDI. */ tcg_debug_assert(a_bits < 16); - tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP0, addrlo, a_mask); + tcg_out_opc_imm(s, OPC_ANDI, TCG_TMP0, addr, a_mask); ldst->label_ptr[0] = s->code_ptr; if (use_mips32r6_instructions) { @@ -1340,7 +1324,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, } } - base = addrlo; + base = addr; if (TCG_TARGET_REG_BITS == 64 && addr_type == TCG_TYPE_I32) { tcg_out_ext32u(s, TCG_REG_A0, base); base = TCG_REG_A0; @@ -1460,14 +1444,13 @@ static void tcg_out_qemu_ld_unalign(TCGContext *s, TCGReg lo, TCGReg hi, } static void tcg_out_qemu_ld(TCGContext *s, TCGReg datalo, TCGReg datahi, - TCGReg addrlo, TCGReg addrhi, - MemOpIdx oi, TCGType data_type) + TCGReg addr, MemOpIdx oi, TCGType data_type) { MemOp opc = get_memop(oi); TCGLabelQemuLdst *ldst; HostAddress h; - ldst = prepare_host_addr(s, &h, addrlo, addrhi, oi, true); + ldst = prepare_host_addr(s, &h, addr, oi, true); if (use_mips32r6_instructions || h.aa.align >= (opc & MO_SIZE)) { tcg_out_qemu_ld_direct(s, datalo, datahi, h.base, opc, data_type); @@ -1547,14 +1530,13 @@ static void tcg_out_qemu_st_unalign(TCGContext *s, TCGReg lo, TCGReg hi, } static void tcg_out_qemu_st(TCGContext *s, TCGReg datalo, TCGReg datahi, - TCGReg addrlo, TCGReg addrhi, - MemOpIdx oi, TCGType data_type) + TCGReg addr, MemOpIdx oi, TCGType data_type) { MemOp opc = get_memop(oi); TCGLabelQemuLdst *ldst; HostAddress h; - ldst = prepare_host_addr(s, &h, addrlo, addrhi, oi, false); + ldst = prepare_host_addr(s, &h, addr, oi, false); if (use_mips32r6_instructions || h.aa.align >= (opc & MO_SIZE)) { tcg_out_qemu_st_direct(s, datalo, datahi, h.base, opc); @@ -2096,24 +2078,24 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type, break; case INDEX_op_qemu_ld_i32: - tcg_out_qemu_ld(s, a0, 0, a1, 0, a2, TCG_TYPE_I32); + tcg_out_qemu_ld(s, a0, 0, a1, a2, TCG_TYPE_I32); break; case INDEX_op_qemu_ld_i64: if (TCG_TARGET_REG_BITS == 64) { - tcg_out_qemu_ld(s, a0, 0, a1, 0, a2, TCG_TYPE_I64); + tcg_out_qemu_ld(s, a0, 0, a1, a2, TCG_TYPE_I64); } else { - tcg_out_qemu_ld(s, a0, a1, a2, 0, args[3], TCG_TYPE_I64); + tcg_out_qemu_ld(s, a0, a1, a2, args[3], TCG_TYPE_I64); } break; case INDEX_op_qemu_st_i32: - tcg_out_qemu_st(s, a0, 0, a1, 0, a2, TCG_TYPE_I32); + tcg_out_qemu_st(s, a0, 0, a1, a2, TCG_TYPE_I32); break; case INDEX_op_qemu_st_i64: if (TCG_TARGET_REG_BITS == 64) { - tcg_out_qemu_st(s, a0, 0, a1, 0, a2, TCG_TYPE_I64); + tcg_out_qemu_st(s, a0, 0, a1, a2, TCG_TYPE_I64); } else { - tcg_out_qemu_st(s, a0, a1, a2, 0, args[3], TCG_TYPE_I64); + tcg_out_qemu_st(s, a0, a1, a2, args[3], TCG_TYPE_I64); } break;