From patchwork Fri Dec 30 00:02:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 637850 Delivered-To: patch@linaro.org Received: by 2002:a17:906:1189:b0:7d5:1b03:224a with SMTP id n9csp4172905eja; Thu, 29 Dec 2022 16:18:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsEmjkkqVfrFQHY4LIOfPwdnV7i7GWKlskbtWkpvrD0xJ03V1+5UCDZ/dC5sdKGe+5bB+Jb X-Received: by 2002:a05:6214:3788:b0:4c6:d77b:8b4a with SMTP id ni8-20020a056214378800b004c6d77b8b4amr45683676qvb.33.1672359535577; Thu, 29 Dec 2022 16:18:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672359535; cv=none; d=google.com; s=arc-20160816; b=0REvebf78k9fuqHH7IiKktFht21AfaDFqH/xokzPbBxdQtDC7rk+JRFTqKi7fHzGdK 3be3QrD1m+v9DQFS0PTKOqJIXUuIjB1FLVBmqk9Tm3F26/Ekc/mz8s3vc45AN6VPL+Iy G4wOu/vtF96hZ6GG3AxycaWwV3vIjwKGyNN5R4UkH9bdkhnMKKVfnhQIyMdQgruEuG9s 9IrXpXCRjZz1zYZEnqU+Po58CwZrWSqt6xYcg3y9ZjzFeNc1ACS5yjF805YHCURTj60k aJlaIZoFBmYrVCURkFadvBK/YjjC05nTInA9VgllQrGAf3kvLqTS6ZPBusmz16QSF8yk IUEA== 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=AOYCCYtPdnKj+yfIPyQ3b3Eju8B6onYQzX1BsWT7Kq0=; b=NyTPUFVgPFr5iS2Rrp/CqgZ/l9FLaQJ6+3dYcB1q3hDPDIdD+Tx7JnLgrbXf9f3mFS GBouubGDh3QAArD7fjnvdg2LBty0ApPaj2xSJ8UzdTWg5w0n6sjdMxf+3NuRLZRztR55 BNKSFyxTNsdzdonrs9NC6HJcRS5OO8V4g5AZsfw2ihHokzK4gdGSi3lzaP+ApKGOFxzG jKdy7RKhjCoadZ3KRxvMoMsmwMYa1xqlSidIpoBzn7mK4922atG8UxSv/wGkLpBSedEI zJWy6i9TTuJ+SJ/COK58oyYEJCIB9j8buiyFleqr9biWPhVDn33eAjfJs5g1YF6R/Ci2 C85A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FrRUf/qc"; 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 hu5-20020a056214234500b00496d0f8702dsi9079350qvb.392.2022.12.29.16.18.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Dec 2022 16:18:55 -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="FrRUf/qc"; 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 1pB2ud-0006Wq-2g; Thu, 29 Dec 2022 19:06:15 -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 1pB2uU-0006Lm-J3 for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:06:11 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pB2uR-0004Eb-5N for qemu-devel@nongnu.org; Thu, 29 Dec 2022 19:06:06 -0500 Received: by mail-pj1-x102f.google.com with SMTP id i12-20020a17090a4b8c00b0022632104a6eso2932501pjh.1 for ; Thu, 29 Dec 2022 16:06:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=AOYCCYtPdnKj+yfIPyQ3b3Eju8B6onYQzX1BsWT7Kq0=; b=FrRUf/qcH9Q/WrAN1L7qb4gmwYXQzfjik8G8COMXFrVbQi1bzvLiMOVoTJvdrzGk8r 3ySY/owK9yRO6hJ6K1Dji8hwA8kiLgowIylSm9Ns+eJRX5GKQjsNxv13/CKEqisx5WEb x7UtB3u77G5cMDKqDR0aWNa2t2FsLpCO6wujflfq4WKbEEszXRUVHuPwYd6Cw9FuKnUb yuPgiX9/RX6Mr+UNIkUwie+h5vP9DfbY/J/nxS4d3DZpC52GYNSXolS0KcSSkUiwcS8Z an0eFIZWrsiKljHjyEovWoCr5T6zMGcVr9T8nXwCMCHZyKDKZGp7h3ySqSbeYlc8ksG7 uEeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=AOYCCYtPdnKj+yfIPyQ3b3Eju8B6onYQzX1BsWT7Kq0=; b=BbwuT+2t2SC7MaxshDb9eyaQdKDtte5NUSJqGnece33p8oMXuUhaoLqc5xhqPuJF3g bVxz/XE2rzUja2ib2H64IHqHvgtHPJ8EMKShoUOYv2H7JLcBeBUV7zvF2XtuLY/KLkJI LN7jacKW+H0Zk9TpzVIM4l+rmOjxSD3f0G2S8wZso947URTKGyTOpwj+rPsI5o8NoRs3 B7nzgWniddbTZ5eMwujl2LuaSvHEsRvrRNx1Se2UzcGlKOEgAy6BDi2YjDmXXXC+OXs2 jzoaa26WVmFMsLvFGfbzY3/Ot4/Jbfv0uOx6peW+0fBNVhAo7i84ZQsBgYEpwJFiOIgk RvPg== X-Gm-Message-State: AFqh2ko/INfJlaMDZ/SiQ/nUQcQR/qopKwDs5jMroXz/vpUEGnr1m0QF F6/KIzxKu8DEz81BRnucjagEwp3FjrHg2uWv X-Received: by 2002:a05:6a20:7da8:b0:a2:c45f:f0fc with SMTP id v40-20020a056a207da800b000a2c45ff0fcmr45394107pzj.27.1672358761898; Thu, 29 Dec 2022 16:06:01 -0800 (PST) Received: from stoup.. (76-14-210-194.or.wavecable.com. [76.14.210.194]) by smtp.gmail.com with ESMTPSA id x185-20020a6286c2000000b0056bfebfa6e4sm12586151pfd.190.2022.12.29.16.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 16:06:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 42/47] tcg/aarch64: Merge tcg_out_callr into tcg_out_call Date: Thu, 29 Dec 2022 16:02:16 -0800 Message-Id: <20221230000221.2764875-43-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221230000221.2764875-1-richard.henderson@linaro.org> References: <20221230000221.2764875-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.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 There is only one use, and BLR is perhaps even more self-documentary than CALLR. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.c.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 344b63e20f..1af879e6f5 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -1336,11 +1336,6 @@ static void tcg_out_goto_long(TCGContext *s, const tcg_insn_unit *target) } } -static inline void tcg_out_callr(TCGContext *s, TCGReg reg) -{ - tcg_out_insn(s, 3207, BLR, reg); -} - static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) { ptrdiff_t offset = tcg_pcrel_diff(s, target) >> 2; @@ -1348,7 +1343,7 @@ static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) tcg_out_insn(s, 3206, BL, offset); } else { tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, (intptr_t)target); - tcg_out_callr(s, TCG_REG_TMP); + tcg_out_insn(s, 3207, BLR, TCG_REG_TMP); } }