From patchwork Sat Apr 8 02:42:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 671474 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp608067wrt; Fri, 7 Apr 2023 19:49:56 -0700 (PDT) X-Google-Smtp-Source: AKy350Y0zRfGydZBB2BK36Kt42yg/xOBJSJNiMmZQVQChiWPGOHieN31Nvapv0zzxASbekxVVUUR X-Received: by 2002:a05:622a:c4:b0:3e4:e2fa:66b0 with SMTP id p4-20020a05622a00c400b003e4e2fa66b0mr7927127qtw.29.1680922195901; Fri, 07 Apr 2023 19:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680922195; cv=none; d=google.com; s=arc-20160816; b=Ema6r8+xoxuqTgt3sBjx1DKJygsGxsHD5yA3LpuZ79EKPnJu4uCL5si5Lx9/L9haye qsAIRSyX3IG3rCKRX+qs0v7hMIeR1fPBazwCe6xEVs56iosVe2hPwO2QDGay5SO9V6FA /zMGdA5qeHSDLpwVS6mXpWJaIBkbffcugSe1imylp+kiDAbcunlDyHBYymFGGdPg9YT8 Gqgb7BIafqAn7M1HlUsN8aTRKwZ1Vf3YMGttdSQ5S8NWOPqO6ier2w+UvPdIjsqL1Q6h kXIYyw8EMbyVShnlkfY4hMyMFrrtnXC753+p6Bkf8gVW4MsKSxbyTGdH8gofqNDix0dA A3uQ== 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=eotj0MrHKLP1v2S4T/0WUNCjwFrcd26O8tCK+46bnIc=; b=DhHXj16/jrehPVuYqJYxloIvo4JvJIsnMwQxFhlgqS1hSPXBmW/9PqfRVinh3k71Ca Bxk+gY0QRBOI2nv0urIrpjmkQST3hqMUpmtRXNW2Ha4f4yQ3zQEQeei4twW2q/7axJ7B Tld7tlPQWZTliQnhyNkk35DVZwgODnKrU2SJkjoOHWM5C/HBHwRQKhVoFmxEGvTglv0P 4Mc/wQjww/wUtc+Qr6AP1nDNgHBVzSqVor807fMLH76l9tK98eTmlMuksSWNF0JaWUP0 7gINZYaimHgEXTIr4IUtTKt7NuXAMcSP66UVRHia+0ctB4cYko/PjHSYZUFybtr4qkY/ cLbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uojDrGl3; 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 q3-20020a374303000000b0074868af7b7asi3474235qka.401.2023.04.07.19.49.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Apr 2023 19:49:55 -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=uojDrGl3; 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 1pkyYe-0007nl-MO; Fri, 07 Apr 2023 22:44:04 -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 1pkyYc-0007lT-LB for qemu-devel@nongnu.org; Fri, 07 Apr 2023 22:44:02 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkyYD-0005jQ-BW for qemu-devel@nongnu.org; Fri, 07 Apr 2023 22:44:02 -0400 Received: by mail-pj1-x102e.google.com with SMTP id v9so5046522pjk.0 for ; Fri, 07 Apr 2023 19:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680921816; 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=eotj0MrHKLP1v2S4T/0WUNCjwFrcd26O8tCK+46bnIc=; b=uojDrGl3eBNqzY5LM9a1aMvyIB1I/hWsByM81JC12eAyd5BoqzrCT5BChoHq7dcm0Y uCx6eIiIvNrMi+8kRfadXvogKYZE4luZi9tEhRCt/wAkO435ld0GTwT2EBTHYwIoHmn+ 1hisCidySMHAdRwmjRkdUrz3U3lA3+rx8qlM+Nd2EJFSTBwQ+9mnAHZYUxNJDy5qzVv2 xXQkGXFeSYVB6z+czETKxlozaWXxs6rsWjWxOfOeD/iWE//tNbZaPNOkKkyl0ZLk//s+ amg8AEQ6WhtpGGybh5e245WB9UUZiVDo2AzxsDLmNyHxS/+Qp+se6w4TorJ2ZDrvoWS9 Tymw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680921816; 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=eotj0MrHKLP1v2S4T/0WUNCjwFrcd26O8tCK+46bnIc=; b=fA3QYAvOSTdoKsrlBvy9fJJgWfpuGZJnk0wx1YPPFpyW6aPzenh74ZtiZmclIePQsP KaAg3XqcOwIjZw//mEUl6w2uB1WzwwFLInGuyDb1zUBiEqlz621mmRjiRhkoRcfyeiVy Z4fY9A085IP36HY4kkHe1U+qIOcvRhrAKHkKz/CZYNn6+H++LDJ8623kAI7pa8Ha/YKf UQ/1wPaHZVdUCWtptp1NhCLBrHeJcDpJWKVd18yyDS4q7IJmJSRLRz3D06nLUtkBN4Yd 3Zfb0waewd7cg382/Twf137ugpbU8Kyd98T5IYA+IdWub2gYEyN7Pb0xtGUpWlnQXgI3 5yEA== X-Gm-Message-State: AAQBX9fvTCKgtIdyOrTOhT6LDheH9vVM++gxMxfazZHz37HOfh/gxS6A G+1eka663pHRxLQA0wB/AaVAzUR22XPV9IMDskE= X-Received: by 2002:a17:902:f291:b0:19c:d7a9:8be1 with SMTP id k17-20020a170902f29100b0019cd7a98be1mr3829634plc.61.1680921815975; Fri, 07 Apr 2023 19:43:35 -0700 (PDT) Received: from stoup.. ([2602:ae:1541:f901:8bb4:5a9d:7ab7:b4b8]) by smtp.gmail.com with ESMTPSA id d9-20020a170902c18900b0019d397b0f18sm3530780pld.214.2023.04.07.19.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 19:43:35 -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 22/42] tcg/aarch64: Pass TGType to tcg_out_qemu_st Date: Fri, 7 Apr 2023 19:42:54 -0700 Message-Id: <20230408024314.3357414-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230408024314.3357414-1-richard.henderson@linaro.org> References: <20230408024314.3357414-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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 This evens out the interface to match tcg_out_qemu_ld, and makes the argument to add_qemu_ldst_label less obscure. Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 40122e1471..f8d3ef4714 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1884,7 +1884,7 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, } static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, - MemOpIdx oi) + MemOpIdx oi, TCGType d_type) { MemOp memop = get_memop(oi); const TCGType otype = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32; @@ -1899,8 +1899,8 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, tcg_out_tlb_read(s, addr_reg, memop, &label_ptr, mem_index, 0); tcg_out_qemu_st_direct(s, memop, data_reg, TCG_REG_X1, otype, addr_reg); - add_qemu_ldst_label(s, false, oi, (memop & MO_SIZE)== MO_64, - data_reg, addr_reg, s->code_ptr, label_ptr); + add_qemu_ldst_label(s, false, oi, d_type, data_reg, addr_reg, + s->code_ptr, label_ptr); #else /* !CONFIG_SOFTMMU */ unsigned a_bits = get_alignment_bits(memop); if (a_bits) { @@ -2249,7 +2249,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_qemu_st_i32: case INDEX_op_qemu_st_i64: - tcg_out_qemu_st(s, REG0(0), a1, a2); + tcg_out_qemu_st(s, REG0(0), a1, a2, ext); break; case INDEX_op_bswap64_i64: