From patchwork Mon Dec 17 03:35:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10732699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B35B56C5 for ; Mon, 17 Dec 2018 03:36:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F2C129A9B for ; Mon, 17 Dec 2018 03:36:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EFF929D46; Mon, 17 Dec 2018 03:36:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D790729A9B for ; Mon, 17 Dec 2018 03:36:11 +0000 (UTC) Received: from localhost ([::1]:44698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYjhT-0008TQ-3r for patchwork-qemu-devel@patchwork.kernel.org; Sun, 16 Dec 2018 22:36:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYjgT-0007n9-JB for qemu-devel@nongnu.org; Sun, 16 Dec 2018 22:35:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYjgQ-0002xP-O9 for qemu-devel@nongnu.org; Sun, 16 Dec 2018 22:35:09 -0500 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:43390) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gYjgQ-0002wN-GG for qemu-devel@nongnu.org; Sun, 16 Dec 2018 22:35:06 -0500 Received: by mail-pg1-x530.google.com with SMTP id v28so5405958pgk.10 for ; Sun, 16 Dec 2018 19:35:06 -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; bh=R/TJzSibEZqkNC5dwmPIbeXAziic1P/nm78ELgnI36Y=; b=PnbACCplRr9aoPzhR4a1YkYIKE9Vl/wztyreW99KoKbxu69WMhFfRVVsw964nkDz2F FNv2+LY8v79GYi9/BOWZp4m7zHN+53KjWphJmQOdb+qFu5CldsUi7uNO12zuIY6QbvCA 35lhaO2vUkl+j2NCOi9aE0tJumS8ZubZoigm8= 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; bh=R/TJzSibEZqkNC5dwmPIbeXAziic1P/nm78ELgnI36Y=; b=gk21nQckM4bf1jnO20Wpmtzgu1X4miNkRvD+G27+SbIYgbiB2rJTR46RrcLBj5IYXw aFck9svduGn59A7oS14aK1Sgj3oxH8uPLiFDQjoGqwDzvArdvF7wM4Y7LvJmGCQ+4c4t qVLdJGbH/ViqYhE2ClAq76zbNfo5aU52DyKnfqo+aORsP9eatdXUUOgiDHyDQvUlV+vg qgduC4b3D+oyTne2Bvr7+HoLpQqh/UwnPVNp/+y4pmE3SbXUm05rPeSlVRCoksxxtccM xXBxopTCuRqfoKsMb6X2kd+AVfa0rvCjJr79Yyy58HkwEob6QN3ZnnB9ynCyLFdeYmgt JjHQ== X-Gm-Message-State: AA+aEWZ/Rh9WiLxa6x+FbSurSionI6Smzwr+j4WS71srBUlN5FjTbY75 xfrWFxUHYyzvZLKE+FTyG2koYR4HoHg= X-Google-Smtp-Source: AFSGD/V4d+m8SfCky/3VjkZZ1+cf/wdNNdpQ0cr8wuSJmexPN8rFj85b2q05Xl2AAQEtOsCRAAHghg== X-Received: by 2002:a63:4246:: with SMTP id p67mr10665637pga.335.1545017705114; Sun, 16 Dec 2018 19:35:05 -0800 (PST) Received: from cloudburst.twiddle.net (97-126-115-157.tukw.qwest.net. [97.126.115.157]) by smtp.gmail.com with ESMTPSA id r76sm16212351pfb.69.2018.12.16.19.35.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Dec 2018 19:35:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 16 Dec 2018 19:35:01 -0800 Message-Id: <20181217033501.18073-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181217033501.18073-1-richard.henderson@linaro.org> References: <20181217033501.18073-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::530 Subject: [Qemu-devel] [PULL v2 01/33] target/sparc: Remove the constant pool X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Partially reverts ab20bdc1162. The 14-bit displacement that we allowed to reach the constant pool is not always sufficient. Retain the tb-relative addressing, as that is how most return values from the tb are computed. Signed-off-by: Richard Henderson --- tcg/sparc/tcg-target.inc.c | 47 ++++++++------------------------------ 1 file changed, 9 insertions(+), 38 deletions(-) diff --git a/tcg/sparc/tcg-target.inc.c b/tcg/sparc/tcg-target.inc.c index 04bdc3df5e..3237ae6a2f 100644 --- a/tcg/sparc/tcg-target.inc.c +++ b/tcg/sparc/tcg-target.inc.c @@ -311,24 +311,6 @@ static void patch_reloc(tcg_insn_unit *code_ptr, int type, insn &= ~INSN_OFF19(-1); insn |= INSN_OFF19(pcrel); break; - case R_SPARC_13: - /* Note that we're abusing this reloc type for our own needs. */ - if (!check_fit_ptr(value, 13)) { - int adj = (value > 0 ? 0xff8 : -0x1000); - value -= adj; - assert(check_fit_ptr(value, 13)); - *code_ptr++ = (ARITH_ADD | INSN_RD(TCG_REG_T2) - | INSN_RS1(TCG_REG_TB) | INSN_IMM13(adj)); - insn ^= INSN_RS1(TCG_REG_TB) ^ INSN_RS1(TCG_REG_T2); - } - insn &= ~INSN_IMM13(-1); - insn |= INSN_IMM13(value); - break; - case R_SPARC_32: - /* Note that we're abusing this reloc type for our own needs. */ - code_ptr[0] = deposit32(code_ptr[0], 0, 22, value >> 10); - code_ptr[1] = deposit32(code_ptr[1], 0, 10, value); - return; default: g_assert_not_reached(); } @@ -459,6 +441,15 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, return; } + /* A 13-bit constant relative to the TB. */ + if (!in_prologue && USE_REG_TB) { + test = arg - (uintptr_t)s->code_gen_ptr; + if (check_fit_ptr(test, 13)) { + tcg_out_arithi(s, ret, TCG_REG_TB, test, ARITH_ADD); + return; + } + } + /* A 32-bit constant, or 32-bit zero-extended to 64-bits. */ if (type == TCG_TYPE_I32 || arg == (uint32_t)arg) { tcg_out_sethi(s, ret, arg); @@ -488,26 +479,6 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, return; } - if (!in_prologue) { - if (USE_REG_TB) { - intptr_t diff = arg - (uintptr_t)s->code_gen_ptr; - if (check_fit_ptr(diff, 13)) { - tcg_out_arithi(s, ret, TCG_REG_TB, diff, ARITH_ADD); - } else { - new_pool_label(s, arg, R_SPARC_13, s->code_ptr, - -(intptr_t)s->code_gen_ptr); - tcg_out32(s, LDX | INSN_RD(ret) | INSN_RS1(TCG_REG_TB)); - /* May be used to extend the 13-bit range in patch_reloc. */ - tcg_out32(s, NOP); - } - } else { - new_pool_label(s, arg, R_SPARC_32, s->code_ptr, 0); - tcg_out_sethi(s, ret, 0); - tcg_out32(s, LDX | INSN_RD(ret) | INSN_RS1(ret) | INSN_IMM13(0)); - } - return; - } - /* A 64-bit constant decomposed into 2 32-bit pieces. */ if (check_fit_i32(lo, 13)) { hi = (arg - lo) >> 32;