From patchwork Mon Dec 14 14:03:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 343547 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3048300jai; Mon, 14 Dec 2020 06:34:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw13SZMYzPOthETRBgCMpDGzpGqMbKCJcGrzRlI0RECdgrhxkICPHUsH/rNOw45VYU+id+l X-Received: by 2002:a25:4f0a:: with SMTP id d10mr36245985ybb.100.1607956482089; Mon, 14 Dec 2020 06:34:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607956482; cv=none; d=google.com; s=arc-20160816; b=irmk2ibiBRrZ4/NeCMR1UUdneOMUGlAhB4cnHngCL7cAmFEu26Tbsz50EpF0ILw6FB 4TXG2+xFqIbZUmA2h2Q/3cpailQdGVY10GmSdr0/GK22/RdjKiD713Pmnwn61bcuAJ+d x0nv7uSlVj5kO7+qv+0uYBbghqTRNuM8J8YmRt7o6K0ljuUWfXQqnO2MzxhY10AwihKX wZnBjDf/fZrI0Si2vsttwstmTuvyVhwORkmdDErzQ8rv8bNpL1WWlEUP8S30vVTPT6Xo rpG/7Vm8/vbNAL0OWp8R/5VfFuporqtCD/zIMwQ4l6vMVlr9qTwEs3ON0t1+08PxAcMi Q6CA== 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:to:from :dkim-signature; bh=746olrr4Rbmh5ZNHTyxNWXv98LGv+Z4R3bTpMGSCzAU=; b=dWq4jZ/9WnzzmMAKELD8sENhBhSQbwvTXA4GEpLsL/WH58GekCwtpNACIHgMCZhgzm 5VzjF3WTzKeaCH2BX4wRV+7YshHFQNRgZy9WtujDzRiCTXU63tkx5CNi2pHc9xduv2n3 Jx13xoN1l2XPEdrJMF4lHLkaeAb6qOYuuW4pdqrRx3kM3+Gsp8tJFGH+/Y9sbXhUBA2U Hge/9G6o4X9+WeQoUoIpU56KrS0fiFNDsfZ19HEA8S2fMskxeesWqNP10gYhaOuglPzz HcbjXxZwvZ9NETRbp83rnt/kyrQOabzDjU9b7VbIfjHm7U/EXXxTbe7AsABPg9vAZ/xz zqcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uFZRB6fh; 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 n6si17520350ybc.481.2020.12.14.06.34.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Dec 2020 06:34:42 -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=uFZRB6fh; 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]:47172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koovx-00051r-Hd for patch@linaro.org; Mon, 14 Dec 2020 09:34:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kooSo-0002Of-QN for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:04:36 -0500 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]:43369) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kooSi-00042b-Ux for qemu-devel@nongnu.org; Mon, 14 Dec 2020 09:04:33 -0500 Received: by mail-oi1-x22d.google.com with SMTP id q25so19224231oij.10 for ; Mon, 14 Dec 2020 06:04:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=746olrr4Rbmh5ZNHTyxNWXv98LGv+Z4R3bTpMGSCzAU=; b=uFZRB6fhRQLL2WjlERqxS89DDU2VB1i6SpxbhnNfpJSUbVjF15neCQnxjKJL/ZmmpD UNnJQLftPwHY7zBF0nYwVTXZ4YCTsu1S8fculEHhko9pOFuU+krou8jIw7/f7oxMfv9D dDizvbO0PzETicr7JG36vSM6vsgNQls+NEInoF+jy+XQ1EjYNdKL0PoV800zC+c1MV66 rCw91dJlzvigG3hCQGP7+eGTXxICQjrPCtKp1eUL1Qi7fC0X+naoeQ4OJ6eOXwFhRCOF dyQ88jvsdsSPkWL3GU7vUCOS4kPPmJ7BdVEEzuyDr93D2vGyKYBFE3/e1njtMEalpX+M j4Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=746olrr4Rbmh5ZNHTyxNWXv98LGv+Z4R3bTpMGSCzAU=; b=kMMRqfXDtaM2H7s2y53UyTQNOcxNN91UtHi6X5jqkgJq0FOS/VJ7t9sv3r/CCpLfr5 e16YkFz9Aohy+4Ezl6NjMBa0XE5884Ck4b1WwNNGRDqw7Ub3FjnpCdZcG19sS5x9p+1X yCBQkwdXCBgDYVPxwHML337yPHx5KFnzXdFYgn2vholhzs6JWfEEqcxo/YDKCUApl7O/ 3oyvlmWp8vnUh0bIMRqjbHyeTu4njFHXaum5k81VQVUEanlxM+cxfXaaxkt0u/0Otanu DmGKRBJ9QgEPeP/QcuuVbSlOVpUpm3K1X2Kh8nzPRtbrpczL3DjIvlLGPnDWpM7D14IC 4/qw== X-Gm-Message-State: AOAM531Rq1k4oqVlkLRbM9AVKuvj8hSztIQIYeZxp8uVRVSYI8lKq29i QLwz/e+VfwYPGMW8w91Qky1L48+w6LgLtpuj X-Received: by 2002:aca:4b16:: with SMTP id y22mr18186707oia.148.1607954665966; Mon, 14 Dec 2020 06:04:25 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id t24sm3940146oou.4.2020.12.14.06.04.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 06:04:25 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 40/43] tcg/arm: Support split-wx code generation Date: Mon, 14 Dec 2020 08:03:11 -0600 Message-Id: <20201214140314.18544-41-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201214140314.18544-1-richard.henderson@linaro.org> References: <20201214140314.18544-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22d.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.23 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" Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.h | 2 +- tcg/arm/tcg-target.c.inc | 37 +++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) -- 2.25.1 diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index 7e04755428..856d6dd4b0 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -141,6 +141,6 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 0 +#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc index 9b9400f164..3d2717aeb0 100644 --- a/tcg/arm/tcg-target.c.inc +++ b/tcg/arm/tcg-target.c.inc @@ -187,29 +187,32 @@ static const uint8_t tcg_cond_to_arm_cond[] = { [TCG_COND_GTU] = COND_HI, }; -static inline bool reloc_pc24(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +static bool reloc_pc24(tcg_insn_unit *src_rw, const tcg_insn_unit *target) { - ptrdiff_t offset = (tcg_ptr_byte_diff(target, code_ptr) - 8) >> 2; + const tcg_insn_unit *src_rx = tcg_splitwx_to_rx(src_rw); + ptrdiff_t offset = (tcg_ptr_byte_diff(target, src_rx) - 8) >> 2; + if (offset == sextract32(offset, 0, 24)) { - *code_ptr = (*code_ptr & ~0xffffff) | (offset & 0xffffff); + *src_rw = deposit32(*src_rw, 0, 24, offset); return true; } return false; } -static inline bool reloc_pc13(tcg_insn_unit *code_ptr, tcg_insn_unit *target) +static bool reloc_pc13(tcg_insn_unit *src_rw, const tcg_insn_unit *target) { - ptrdiff_t offset = tcg_ptr_byte_diff(target, code_ptr) - 8; + const tcg_insn_unit *src_rx = tcg_splitwx_to_rx(src_rw); + ptrdiff_t offset = tcg_ptr_byte_diff(target, src_rx) - 8; if (offset >= -0xfff && offset <= 0xfff) { - tcg_insn_unit insn = *code_ptr; + tcg_insn_unit insn = *src_rw; bool u = (offset >= 0); if (!u) { offset = -offset; } insn = deposit32(insn, 23, 1, u); insn = deposit32(insn, 0, 12, offset); - *code_ptr = insn; + *src_rw = insn; return true; } return false; @@ -221,9 +224,9 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type, tcg_debug_assert(addend == 0); if (type == R_ARM_PC24) { - return reloc_pc24(code_ptr, (tcg_insn_unit *)value); + return reloc_pc24(code_ptr, (const tcg_insn_unit *)value); } else if (type == R_ARM_PC13) { - return reloc_pc13(code_ptr, (tcg_insn_unit *)value); + return reloc_pc13(code_ptr, (const tcg_insn_unit *)value); } else { g_assert_not_reached(); } @@ -617,7 +620,7 @@ static void tcg_out_movi32(TCGContext *s, int cond, int rd, uint32_t arg) /* Check for a pc-relative address. This will usually be the TB, or within the TB, which is immediately before the code block. */ - diff = arg - ((intptr_t)s->code_ptr + 8); + diff = tcg_pcrel_diff(s, (void *)arg) - 8; if (diff >= 0) { rot = encode_imm(diff); if (rot >= 0) { @@ -1337,7 +1340,8 @@ static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOpIdx oi, label->datahi_reg = datahi; label->addrlo_reg = addrlo; label->addrhi_reg = addrhi; - label->raddr = raddr; + /* TODO: Cast goes away when all hosts converted */ + label->raddr = (void *)tcg_splitwx_to_rx(raddr); label->label_ptr[0] = label_ptr; } @@ -1348,7 +1352,7 @@ static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) MemOp opc = get_memop(oi); void *func; - if (!reloc_pc24(lb->label_ptr[0], s->code_ptr)) { + if (!reloc_pc24(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) { return false; } @@ -1411,7 +1415,7 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) TCGMemOpIdx oi = lb->oi; MemOp opc = get_memop(oi); - if (!reloc_pc24(lb->label_ptr[0], s->code_ptr)) { + if (!reloc_pc24(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) { return false; } @@ -1762,8 +1766,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGReg base = TCG_REG_PC; tcg_debug_assert(s->tb_jmp_insn_offset == 0); - ptr = (intptr_t)(s->tb_jmp_target_addr + args[0]); - dif = ptr - ((intptr_t)s->code_ptr + 8); + ptr = (intptr_t)tcg_splitwx_to_rx(s->tb_jmp_target_addr + args[0]); + dif = tcg_pcrel_diff(s, (void *)ptr) - 8; dil = sextract32(dif, 0, 12); if (dif != dil) { /* The TB is close, but outside the 12 bits addressable by @@ -2297,7 +2301,8 @@ static void tcg_target_qemu_prologue(TCGContext *s) * Return path for goto_ptr. Set return value to 0, a-la exit_tb, * and fall through to the rest of the epilogue. */ - tcg_code_gen_epilogue = s->code_ptr; + /* TODO: Cast goes away when all hosts converted */ + tcg_code_gen_epilogue = (void *)tcg_splitwx_to_rx(s->code_ptr); tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R0, 0); tcg_out_epilogue(s); }