From patchwork Mon Sep 9 15:44:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 173398 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp4537160ilq; Mon, 9 Sep 2019 08:49:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzKLp5BX9A9eSG0qI0/03Ufek8aQPOViWf2FCQCxYx6NtmF2+ICdV3sEq3Fyre+eVYBUNX5 X-Received: by 2002:a17:906:1a12:: with SMTP id i18mr15047122ejf.19.1568044142984; Mon, 09 Sep 2019 08:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568044142; cv=none; d=google.com; s=arc-20160816; b=v8a9iZdkMB/mS00arIl9M6TbwalQiBT9I9HSHevBP2S/uRomsJ3/xpVgxTc4pZqEGH e+4+vk2FC6bZKt4NF6MblTs+YHgZhom4/nO6jXOdySk0G9jZkbpWDeKK4usfTA3w0YbJ GJvH+qUuvz4PcCJv/ydlvJpNEooTZyXn4bXuWfGcxGayvkepM7KVNzPb6TXP4YjoZReI 6ZlDcGcXq9CxSbhZwSrsvH6OsCA2F1SrxctIuU8qDV5v0WxpqwKUY4fUvAkNuT0Eptjk fqpNhDNHhV4cUWgGK4QfARjYHhah1j/gyYvz4JMjayctcK/ymffojXxA4Btl97GRWzaZ I5YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature:delivered-to:sender :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mailing-list:dkim-signature:domainkey-signature; bh=qSwSlsC1jddyg4w+tj74Rsaa3g06R/660Q/W3hv4LFI=; b=QXrIv10F3FSLCk+MoNGQyosT3i3k6cBrKJAGHvPGoRiN1N010X8oyf5ZtXTTtetw3Z 4LSm2k6p4dnqfcaA9wXftC/K9KDN8BX/URebvoBg/cb0h60UyVDrZy1LHaYjKQK4jou7 0gX10mOtWwbfoPJl/7+JZSLhfJT2nvx6vD6irzgHA4J9pCwioLM7sFwfdhv7AW+Jurp1 aKg7MSbvjIVk9r5OI0XtxlSTP5JuNCEZQTm9SKj4HkdsLbV5Q20MMmbW9vYvawyuPte6 Bnup8Hn0lnmnMbGdKc3M78EW/S7gAWJg2LaNgZZPol9plQisqb5ySa716+U4nyfPtSd2 PS7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wTG9CkwI; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b="esY/0CaO"; spf=pass (google.com: domain of gcc-patches-return-508651-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-508651-patch=linaro.org@gcc.gnu.org" Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id x17si5632381ejf.230.2019.09.09.08.49.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Sep 2019 08:49:02 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-508651-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wTG9CkwI; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b="esY/0CaO"; spf=pass (google.com: domain of gcc-patches-return-508651-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-508651-patch=linaro.org@gcc.gnu.org" DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=HTS L5M2/FwQrDORiN78RwV5+3xDC4ILrxnn69xKYtTRDQFVvGokUWF2GsqCEzcbjddd WCzfIcSiJaSDb2dHG+i4xabFFjtAc6gqi10xXmAzE3iF73pGt4bX7X2RJ3Xt/iyy IwP2wyYg9bn/BVwSugjDjk0M4OFPpJ1g/54f1Xac= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=default; bh=WJaEkxmiU Xfc8idxEO+icy8m/9A=; b=wTG9CkwIe2MfgPZ65GDj37IVDsLgXtScb4pBScqxF H4eSTZTf6wFXFy/bsTLhXN8zhRuuhyAVotXjY6+BMHkFPf5sP9JjHs8Qm7sO39Qr UTupqZU+GUo9t62yxMDkMpToA+3+jCEOPMxKw6xl4N1uIiQ308W19H8zgEU4F7lF sA= Received: (qmail 122907 invoked by alias); 9 Sep 2019 15:48:50 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 122899 invoked by uid 89); 9 Sep 2019 15:48:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=Arm, block_op_normal, emit_block_move, BLOCK_OP_NORMAL X-HELO: mx07-00178001.pphosted.com Received: from mx08-00178001.pphosted.com (HELO mx07-00178001.pphosted.com) (91.207.212.93) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 09 Sep 2019 15:48:48 +0000 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x89FkhFe027618 for ; Mon, 9 Sep 2019 17:48:46 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=STMicroelectronics; bh=qSwSlsC1jddyg4w+tj74Rsaa3g06R/660Q/W3hv4LFI=; b=esY/0CaOU9C1p2tIyUct+SoSZf/9K510Yg+kYXM6P4PNYcXm28k9RSIiGVqNL8HP0ME9 KfwfPSxbujUXjQEVCwM8O/Z335krwLAYwJypY9bgOyZGncCsAc/KYnJ6wMnZ7iOhNK1X PwU1PgzkO9l+Vk9uo4Ba7PJ0TYiHlsT2kmzQi6wHoZFpFsokC3peBTjQp7KRbHYt033H l5Pt/STFCIT7BFqfEGzHppDZYmZ/NuN4Eoy6URmkHNsoN5TL3MuVXobqq/a3gObzEjGu /1HWaIn4meVrsGN8ruddQMjwTFWiFpeKfd34TinxY9rWVKITkcbkdKXVIB1iZBEvdXLr /Q== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx08-00178001.pphosted.com with ESMTP id 2uv3ehpjsh-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 09 Sep 2019 17:48:46 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 9769D23 for ; Mon, 9 Sep 2019 15:48:35 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag5node1.st.com [10.75.127.13]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id DA3FE2ADEEE for ; Mon, 9 Sep 2019 17:48:34 +0200 (CEST) Received: from gnb.st.com (10.75.127.46) by SFHDAG5NODE1.st.com (10.75.127.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 9 Sep 2019 17:48:34 +0200 From: Christophe Lyon To: Subject: [ARM/FDPIC v6 09/24] [ARM] FDPIC: Add support for taking address of nested function Date: Mon, 9 Sep 2019 17:44:51 +0200 Message-ID: <20190909154526.11630-10-christophe.lyon@st.com> In-Reply-To: <20190909154526.11630-1-christophe.lyon@st.com> References: <20190909154526.11630-1-christophe.lyon@st.com> MIME-Version: 1.0 X-IsSubscribed: yes From: Christophe Lyon In FDPIC mode, the trampoline generated to support pointers to nested functions looks like: .word trampoline address .word trampoline GOT address ldr r12, [pc, #8] ldr r9, [pc, #8] ldr pc, [pc, #8] .word static chain value .word GOT address .word function's address because in FDPIC function pointers are actually pointers to function descriptors, we have to actually generate a function descriptor for the trampoline. 2019-XX-XX Christophe Lyon Mickaël Guêné gcc/ * config/arm/arm.c (arm_asm_trampoline_template): Add FDPIC support. (arm_trampoline_init): Likewise. (arm_trampoline_adjust_address): Likewise. * config/arm/arm.h (TRAMPOLINE_SIZE): Likewise. Change-Id: Idc4d5f629ae4f8d79bdf9623517481d524a0c144 -- 2.6.3 diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 6b0c95f..d01fae3 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3939,14 +3939,52 @@ arm_warn_func_return (tree decl) ldr pc, [pc] .word static chain value .word function's address - XXX FIXME: When the trampoline returns, r8 will be clobbered. */ + XXX FIXME: When the trampoline returns, r8 will be clobbered. + + In FDPIC mode, the trampoline looks like: + .word trampoline address + .word trampoline GOT address + ldr r12, [pc, #8] ; #4 for Arm mode + ldr r9, [pc, #8] ; #4 for Arm mode + ldr pc, [pc, #8] ; #4 for Arm mode + .word static chain value + .word GOT address + .word function's address +*/ static void arm_asm_trampoline_template (FILE *f) { fprintf (f, "\t.syntax unified\n"); - if (TARGET_ARM) + if (TARGET_FDPIC) + { + /* The first two words are a function descriptor pointing to the + trampoline code just below. */ + if (TARGET_ARM) + fprintf (f, "\t.arm\n"); + else if (TARGET_THUMB2) + fprintf (f, "\t.thumb\n"); + else + /* Only ARM and Thumb-2 are supported. */ + gcc_unreachable (); + + assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); + assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); + /* Trampoline code which sets the static chain register but also + PIC register before jumping into real code. */ + asm_fprintf (f, "\tldr\t%r, [%r, #%d]\n", + STATIC_CHAIN_REGNUM, PC_REGNUM, + TARGET_THUMB2 ? 8 : 4); + asm_fprintf (f, "\tldr\t%r, [%r, #%d]\n", + PIC_OFFSET_TABLE_REGNUM, PC_REGNUM, + TARGET_THUMB2 ? 8 : 4); + asm_fprintf (f, "\tldr\t%r, [%r, #%d]\n", + PC_REGNUM, PC_REGNUM, + TARGET_THUMB2 ? 8 : 4); + assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); + } + else if (TARGET_ARM) { fprintf (f, "\t.arm\n"); asm_fprintf (f, "\tldr\t%r, [%r, #0]\n", STATIC_CHAIN_REGNUM, PC_REGNUM); @@ -3987,12 +4025,40 @@ arm_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) emit_block_move (m_tramp, assemble_trampoline_template (), GEN_INT (TRAMPOLINE_SIZE), BLOCK_OP_NORMAL); - mem = adjust_address (m_tramp, SImode, TARGET_32BIT ? 8 : 12); - emit_move_insn (mem, chain_value); + if (TARGET_FDPIC) + { + rtx funcdesc = XEXP (DECL_RTL (fndecl), 0); + rtx fnaddr = gen_rtx_MEM (Pmode, funcdesc); + rtx gotaddr = gen_rtx_MEM (Pmode, plus_constant (Pmode, funcdesc, 4)); + /* The function start address is at offset 8, but in Thumb mode + we want bit 0 set to 1 to indicate Thumb-ness, hence 9 + below. */ + rtx trampoline_code_start + = plus_constant (Pmode, XEXP (m_tramp, 0), TARGET_THUMB2 ? 9 : 8); + + /* Write initial funcdesc which points to the trampoline. */ + mem = adjust_address (m_tramp, SImode, 0); + emit_move_insn (mem, trampoline_code_start); + mem = adjust_address (m_tramp, SImode, 4); + emit_move_insn (mem, gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM)); + /* Setup static chain. */ + mem = adjust_address (m_tramp, SImode, 20); + emit_move_insn (mem, chain_value); + /* GOT + real function entry point. */ + mem = adjust_address (m_tramp, SImode, 24); + emit_move_insn (mem, gotaddr); + mem = adjust_address (m_tramp, SImode, 28); + emit_move_insn (mem, fnaddr); + } + else + { + mem = adjust_address (m_tramp, SImode, TARGET_32BIT ? 8 : 12); + emit_move_insn (mem, chain_value); - mem = adjust_address (m_tramp, SImode, TARGET_32BIT ? 12 : 16); - fnaddr = XEXP (DECL_RTL (fndecl), 0); - emit_move_insn (mem, fnaddr); + mem = adjust_address (m_tramp, SImode, TARGET_32BIT ? 12 : 16); + fnaddr = XEXP (DECL_RTL (fndecl), 0); + emit_move_insn (mem, fnaddr); + } a_tramp = XEXP (m_tramp, 0); emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__clear_cache"), @@ -4006,7 +4072,9 @@ arm_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value) static rtx arm_trampoline_adjust_address (rtx addr) { - if (TARGET_THUMB) + /* For FDPIC don't fix trampoline address since it's a function + descriptor and not a function address. */ + if (TARGET_THUMB && !TARGET_FDPIC) addr = expand_simple_binop (Pmode, IOR, addr, const1_rtx, NULL, 0, OPTAB_LIB_WIDEN); return addr; diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 490d22d..8b67c9c 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -1595,7 +1595,7 @@ typedef struct #define INIT_EXPANDERS arm_init_expanders () /* Length in units of the trampoline for entering a nested function. */ -#define TRAMPOLINE_SIZE (TARGET_32BIT ? 16 : 20) +#define TRAMPOLINE_SIZE (TARGET_FDPIC ? 32 : (TARGET_32BIT ? 16 : 20)) /* Alignment required for a trampoline in bits. */ #define TRAMPOLINE_ALIGNMENT 32