From patchwork Tue Apr 11 01:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 672289 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:184:0:0:0:0 with SMTP id p4csp535888wrx; Mon, 10 Apr 2023 18:08:11 -0700 (PDT) X-Google-Smtp-Source: AKy350avj9a+6pI0wsoZh8Ye/aKqog1k/T4Stwxsbsc95+R572GnGxdPMCLGGslcxiDgIP/3Kabi X-Received: by 2002:a05:622a:1906:b0:3dd:137e:e3af with SMTP id w6-20020a05622a190600b003dd137ee3afmr22612453qtc.35.1681175291679; Mon, 10 Apr 2023 18:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681175291; cv=none; d=google.com; s=arc-20160816; b=WQlXNcvZLlFXZ/3oUw6uaf4V1zUWmygZ2DmID7P0t2DQKyuppC+K7YhAF8fuzsf3qd sxklw9Uf5QgnWn9j5aDMV7gVZgZ44HbtEM03ceExcwhz5qb7nzzKlXZavpOvr9Q/MuB9 gsMSAtKGFth7psZ7vH3IC5nXVXxDLJOZnHi+KMmaM/P/ENINBJ7WesykqX90yctob1B/ 0Pt5JS1K5vGP7siyQ8BPpoASGCT5OTI5bJlTLlBl0Z20Wj682eGpRhsLKzd9rVe+F0mp libGRIiSclaBIJZc5PMabbFzAaxUoQclsb/XZL7SNBanxSC5erQX19540liAkXtUxEww 2urA== 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=wBraNCXMNPQDFnAbumlMKWK8ry0vOaeywT8gEg7w4f0=; b=sFQMVYMjEYTi49QqgqYYveixu+SGmh7hXmZHy/cBhLu7vWX2eBt45/5KJT38qWj5R+ joM+eDUyOOmfl6IHVeBHgjCx27ks1rJfgw742eX8VoiF9wWjO9uu+Z7hPziLgIByIeTw asc/V4siLUr6b2eMp65qgxrVJPk5cdRJWieOo5umde4iK+PVu0W1SvoecTsIxkIPVKcW sA/W/5yfZ4QmZOD4UqFf5dsFYn4c+W9DOaX7M1bIMLHiZjUUEIM92fu6kiABXU5jOj1d fm4eFTZdiBCSLjXw7k+WSyoOje67Kd0xi0x4ZiriDOUUdQvk8y3nIOGdpP2/1/5eElc4 KLNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N2ZG14QO; 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 x7-20020ac85f07000000b003e4e8204c51si8119497qta.608.2023.04.10.18.08.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Apr 2023 18:08:11 -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=N2ZG14QO; 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 1pm2TF-0006pt-W3; Mon, 10 Apr 2023 21:06:54 -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 1pm2T5-0005yQ-OV for qemu-devel@nongnu.org; Mon, 10 Apr 2023 21:06:43 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm2T2-0000y8-GA for qemu-devel@nongnu.org; Mon, 10 Apr 2023 21:06:43 -0400 Received: by mail-pj1-x102d.google.com with SMTP id g3so7597681pja.2 for ; Mon, 10 Apr 2023 18:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681175199; 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=wBraNCXMNPQDFnAbumlMKWK8ry0vOaeywT8gEg7w4f0=; b=N2ZG14QOuOgwZHv+K/gORu7NCp/i5bGDwf86PQHiZ3wlddEopYRNVu4uwSailBLaiq WdTN3u9HjUFHuIkTgmQfSI4jx+jxjxK8TH2pLBA87+AYAgcG+IA1iogj/B5CzZW/oSRK LbXyM/MWgYrSaNqvZv1vXqyEyfJ4vhpQaA0rPWpBgMIhM0pN5ZneK4BE0DMkTyNq61x+ iCcIMw76J+vcueqRbcaO0Ka5RIGtWY+/yj6uQA41VYJNt/IffTHtJ0DGkEcEJ2HlNBLo Cjo/LP///QGBSsjajwbPydalrzs+dqH5BSxlnlocBYE5sczO0U6juzIJFGcNiqgMkTDC eTbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681175199; 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=wBraNCXMNPQDFnAbumlMKWK8ry0vOaeywT8gEg7w4f0=; b=o/zAnEowuRkBlhSfKtIGgfnbSITdLMnuDzs3v9I3xz1pQJXLHwazWScX0g3pGR+rRO /fALnPL4Kn/d+rVjTkE0DnYeJ8pBunFYKFS2FtA/KFH7hTOanwF80m6+Bro5w7Zqmji2 f0YlIYYGaGGmaurFXwK3AvPyJO0TtGc4iSFXIFeZpngjeY9ZZqWRilJPRZsGf9pegavv STepcRKp7/g3wtFEzOh0wfje7GskrD187GFKB1Mv3ZKm9sluvsZN3RMbX618Lu/OOcqT Qpq0m0KDrk5ty5DsCU1Y3sq8D56a4gBV6uHmP0pYduA1W4weHOFvBaLYTbutd3mWwIl6 zYDw== X-Gm-Message-State: AAQBX9e4wfm1jsMW2SfV1aP/9tRxZEzUp7xv+IJ3URnqwljOrj119qNp wrTeLUUipcqPTV50zHF2DV3SMOHEtB0ptg3LPb3dGg== X-Received: by 2002:a05:6a20:6d09:b0:da:5084:2764 with SMTP id fv9-20020a056a206d0900b000da50842764mr11823300pzb.24.1681175199152; Mon, 10 Apr 2023 18:06:39 -0700 (PDT) Received: from stoup.WiFi.IPv4InfoBelow (h146.238.133.40.static.ip.windstream.net. [40.133.238.146]) by smtp.gmail.com with ESMTPSA id s10-20020a65690a000000b0051b0e564963sm1320291pgq.49.2023.04.10.18.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 18:06:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH v2 30/54] tcg/sparc64: Pass TCGType to tcg_out_qemu_{ld,st} Date: Mon, 10 Apr 2023 18:04:48 -0700 Message-Id: <20230411010512.5375-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230411010512.5375-1-richard.henderson@linaro.org> References: <20230411010512.5375-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 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, SUSPICIOUS_RECIPS=2.51 autolearn=no 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 We need to set this in TCGLabelQemuLdst, so plumb this all the way through from tcg_out_op. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- tcg/sparc64/tcg-target.c.inc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc index f3e5e856d6..7e6466d3b6 100644 --- a/tcg/sparc64/tcg-target.c.inc +++ b/tcg/sparc64/tcg-target.c.inc @@ -1178,7 +1178,7 @@ static const int qemu_st_opc[(MO_SIZE | MO_BSWAP) + 1] = { }; static void tcg_out_qemu_ld(TCGContext *s, TCGReg data, TCGReg addr, - MemOpIdx oi, bool is_64) + MemOpIdx oi, TCGType data_type) { MemOp memop = get_memop(oi); tcg_insn_unit *label_ptr; @@ -1324,7 +1324,7 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data, TCGReg addr, } static void tcg_out_qemu_st(TCGContext *s, TCGReg data, TCGReg addr, - MemOpIdx oi, bool is64) + MemOpIdx oi, TCGType data_type) { MemOp memop = get_memop(oi); tcg_insn_unit *label_ptr; @@ -1351,8 +1351,7 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data, TCGReg addr, tcg_out_mov(s, TCG_TYPE_REG, TCG_REG_O1, addrz); tcg_out_movext(s, (memop & MO_SIZE) == MO_64 ? TCG_TYPE_I64 : TCG_TYPE_I32, - TCG_REG_O2, is64 ? TCG_TYPE_I64 : TCG_TYPE_I32, - memop & MO_SIZE, data); + TCG_REG_O2, data_type, memop & MO_SIZE, data); func = qemu_st_trampoline[memop & (MO_BSWAP | MO_SIZE)]; tcg_debug_assert(func != NULL); @@ -1637,16 +1636,16 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_qemu_ld_i32: - tcg_out_qemu_ld(s, a0, a1, a2, false); + tcg_out_qemu_ld(s, a0, a1, a2, TCG_TYPE_I32); break; case INDEX_op_qemu_ld_i64: - tcg_out_qemu_ld(s, a0, a1, a2, true); + tcg_out_qemu_ld(s, a0, a1, a2, TCG_TYPE_I64); break; case INDEX_op_qemu_st_i32: - tcg_out_qemu_st(s, a0, a1, a2, false); + tcg_out_qemu_st(s, a0, a1, a2, TCG_TYPE_I32); break; case INDEX_op_qemu_st_i64: - tcg_out_qemu_st(s, a0, a1, a2, true); + tcg_out_qemu_st(s, a0, a1, a2, TCG_TYPE_I64); break; case INDEX_op_ld32s_i64: