From patchwork Thu Jan 7 20:14:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 358277 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp790421jai; Thu, 7 Jan 2021 12:38:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHqXkwuLRAROgaYJPf3L49RXVvyIWV5rDWapr/4h/a2HyMHc4N460bDnNc9dqP4c8DYIHt X-Received: by 2002:a25:26c7:: with SMTP id m190mr840180ybm.464.1610051888881; Thu, 07 Jan 2021 12:38:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610051888; cv=none; d=google.com; s=arc-20160816; b=GfHQFEawUBHwEckI70ts+gaQqnDw0a9yj10kn9OGg25rvS7I8tpiRWQEh0obQw9lDo WfS5XycN65EpJg92RAea6xujXF3qBc4sCvIc1w4x4UrivfIm9WaI7sOb7OuJUBnosj7I R4TcnmjhOHIXONZ+as/9iJ/gGf8yZkE6v6ZEXExNugai1WbnJtpI2adAfLyAUd+uGwry aJmYszcEqFPnY7QF7C4meaw5/elpT5BrhQLdXyRVmzAvVQdqxLX1cAta57o4d0ldJRf0 Yr9GurgLfn9yR1xPPZ34PVWs+VT9J7lyfvGJSFt2Jfql5mW3LCwFExjInB1rwEPfJFdY FUIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=qay0jNTmpyZq4ULzg3vkr0em7pJVaOqPAuzaBx5paoU=; b=fVp9kv8csWKcTqTKqVrEm74bVlizoAajk5X+OleEPvOSXlIR9FBgiYN5mDB8mBpXWa 1Qk8hrssg0sLDUCuxPZTGVOBeSjpEnOi6hB7WgXf1B5t+sZK8wWALfupC7ncRsfN8yg/ Xu400aVp+dV9/UPpmELEaATDlSR/wmCpW3OI5GKNl1THmONM4PowO+L55STv4Flnaao5 EPwBqYQzAaH240PSibynWFs2U24Fhpchujuhq3vm8ECHh4F9t/rNkPvF7CQ/hT7jzNlr EaXBD529LOWxlaRhVZqO82LNK6QCZpUdG9h42lwTLNbW2xryR0yROd9BvvTX/WTMIcyJ ZTSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j4k7cODb; 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 y2si7682685ybo.106.2021.01.07.12.38.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jan 2021 12:38:08 -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=j4k7cODb; 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]:58490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxc2q-0004h2-AP for patch@linaro.org; Thu, 07 Jan 2021 15:38:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxbhW-0001XU-4a for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:16:06 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:40025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxbhE-0001gT-Rr for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:16:03 -0500 Received: by mail-pl1-x630.google.com with SMTP id q4so4154306plr.7 for ; Thu, 07 Jan 2021 12:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qay0jNTmpyZq4ULzg3vkr0em7pJVaOqPAuzaBx5paoU=; b=j4k7cODbUlVvQ57DiYLgTqp2bcvpN+C+0KnuW8UCb+C/svfe3m9L7eyoWteQYQySZ1 2rv8KXr2nxCirPDDrM1leGwtgTlQ6e0UQfbFDH5dtu1yLtyVww7hwMK0ksNaGcIVBije 0GrNjHLwVJSNKuMj2N0KMvBB/jky0xygnccjx2cbSSfEH34yrS2zGvMiGUAk+ZiXwpyw qxc85AijBIVDUOf/BehJs39QnmrGqCA9+rKZTAAeV3ipM3gYGnjJD8Ho+/rgTExKheg/ 0vSRmOxlj5N4UHCmTYrkcyNe/nG4QMspPI22kaYHUCRgUswnDGLMoh3amtKR5uIQqRUU Jv3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qay0jNTmpyZq4ULzg3vkr0em7pJVaOqPAuzaBx5paoU=; b=bpEAHK8+BL3hpT3Z1DwIfKNoA9/+D/e5ZaRn1TuWcu11mUXiHNER+6GVORjTYqzNwO qiL7j18ZI4S2wnqho/uyvAyrMV24v1xtQr88nrfDbxg1ZpCncQIN7LtpaKkF/Zq7WWR2 8iYLwY5/N0i5vIeEihkLK+bF2lYQH5z9VUM3DYxJPV+IOQForKURxJNCwRyeeboKmnMo tmEfIqvvgMTJduzqSUG+ojuZ7H3Txm/z05AgTJgMpGmJF0OVNOC2TXAx/Gb3KtgnoEKq Drw1zBoUNqw+qM+HzRAyojQsOWPlYrP5xtd/O4tul4fl2jqXMoMmxhg9j7E7DpZUIBMW ipQg== X-Gm-Message-State: AOAM531p3MUyyGoiEpeX8TmQesKWnODGLvrUtyfEUQ9Pm21EV/8q/cAm wgcD404M+C2djpDm6D4JyfXjbqa/rnPIlQ== X-Received: by 2002:a17:90a:e60d:: with SMTP id j13mr211559pjy.52.1610050546543; Thu, 07 Jan 2021 12:15:46 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id v6sm6516265pfi.31.2021.01.07.12.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 12:15:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/47] tcg/ppc: Use tcg_tbrel_diff Date: Thu, 7 Jan 2021 10:14:32 -1000 Message-Id: <20210107201448.1152301-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107201448.1152301-1-richard.henderson@linaro.org> References: <20210107201448.1152301-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use tcg_tbrel_diff when we need a displacement to a label, and with a NULL argument when we need the normalizing addend. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 0eb9c4ebe2..ed7a201578 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -837,7 +837,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, } /* Load addresses within the TB with one insn. */ - tb_diff = arg - (intptr_t)s->code_gen_ptr; + tb_diff = tcg_tbrel_diff(s, (void *)arg); if (!in_prologue && USE_REG_TB && tb_diff == (int16_t)tb_diff) { tcg_out32(s, ADDI | TAI(ret, TCG_REG_TB, tb_diff)); return; @@ -890,7 +890,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, /* Use the constant pool, if possible. */ if (!in_prologue && USE_REG_TB) { new_pool_label(s, arg, R_PPC_ADDR16, s->code_ptr, - -(intptr_t)s->code_gen_ptr); + tcg_tbrel_diff(s, NULL)); tcg_out32(s, LD | TAI(ret, TCG_REG_TB, 0)); return; } @@ -940,7 +940,7 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType type, TCGReg ret, */ if (USE_REG_TB) { rel = R_PPC_ADDR16; - add = -(intptr_t)s->code_gen_ptr; + add = tcg_tbrel_diff(s, NULL); } else { rel = R_PPC_ADDR32; add = 0;