From patchwork Thu Aug 17 18:08:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatsuyuki Ishi X-Patchwork-Id: 135931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp884096vqi; Thu, 17 Aug 2023 11:09:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFI0lUOzEVNXGXpl5l/iT+bADqT/j77ZMGIRRyFFwg6YAtmXkJZv7FD4Nu4uFi6AtPqKgt X-Received: by 2002:a05:6402:343:b0:523:2e30:aaee with SMTP id r3-20020a056402034300b005232e30aaeemr370958edw.32.1692295779882; Thu, 17 Aug 2023 11:09:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692295779; cv=none; d=google.com; s=arc-20160816; b=nYUxxPsm6jbg4q+4E5fLS13Dn5quT715vOLoK6tmaFnC0+vxGIQwhDOP/CObQvp/Sy BOqGd3jpWajdpXipBz0DVC8hktVPDbFSPcfIMskTWSV1yBv1OL7KkX/Qan5ApH0z3V11 pIe7ea2+gHh4AJSpe2tNUNiLb2bKMiritVJb6ITYlMguOotb4qhaQNIBv2fLo5l6n/em WWrcZyTXVqXXBHMmUqLhYSI7XjyeP+GPcgIDENbIHClfSly+01ZjFvGREKDNFNJDmH0V BGrIf+dm/GFpAxgtwYldnJovFEdAxU9aMr1bHWSueQTLsvJYsbX0vS1INk1Nh0+EUatp UDJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from: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:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=NdQ0hoXRGw8WKBEObjxsi9TcN/pwcwTfN8Nco08hiM4=; fh=RnOK2kMt7+DQSwabMVlm0F5hv9+FMo5J9F5oi1ILKLA=; b=SxFtm/y4OAUWF4Cf8Fnml/8WGuTkg5zkfRyie5BhueBEI7GqDpBaYFXm4obCcPHm8B jrlD5qSqlzYn3L4DIFp+Pq7rrlweLeeMzNRwqiko6jPd0qZD9+Dq2qgkdT87nl7bfbcp xxjHme67RmgXpTo4rbrPZBFoodEkkw/CgNdHwzbMlZGbtNt9hWdLlXGXWVGbO2bv3fJw CaBHdXMK+btGG0la6EJdb/RdHJI70/g8sbFmA+1Sf1lADLA5T7YDp4n8OEhSr9/7zdLs gsQEbzChY1Qel282ECdICZCvrWnbTyYNb+NvbGNM6eXBtq31hghk2evkqdaEW2me9nev nAPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Lgn8h6lX; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id u9-20020aa7d0c9000000b00522561facd7si67129edo.143.2023.08.17.11.09.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 11:09:39 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Lgn8h6lX; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36000385DC07 for ; Thu, 17 Aug 2023 18:09:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36000385DC07 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692295773; bh=NdQ0hoXRGw8WKBEObjxsi9TcN/pwcwTfN8Nco08hiM4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Lgn8h6lXcQbdr3GiEvXfOhRqsOf0tgl6J8iaSq89rWrPJZjZuSVWjXjHODu78bo0z 33tPE+OQoKVHDmzmD36oIO3l+n3h3L52KaAASZd5C085dLho2oBUSjBpX4Ii6qo0qS e7TKwprARa/WGsXf1sBV9gJSGo789Cwv1aD2K9m4= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by sourceware.org (Postfix) with ESMTPS id 6DD1E3854826 for ; Thu, 17 Aug 2023 18:09:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6DD1E3854826 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1bb91c20602so161895ad.0 for ; Thu, 17 Aug 2023 11:09:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692295762; x=1692900562; 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=NdQ0hoXRGw8WKBEObjxsi9TcN/pwcwTfN8Nco08hiM4=; b=gF2nf3ggv2JTupfcdKUUS4Gj7hmTlL+dcfSKie2GDJC7+Y60jf8rwJdqL1RW/EmREQ +Slx9Mv0uoOP7rlnUZrFxCSU09Ol4Y33nYZOyZGAFVYnTXr3N7UFwh4ADkzMpotiVIzx r36tTfBXCiWQRGyzE2/2k5Ezl3r/D2odIblvV0HERA4V8ASFGdr3uEGofFo6tZWb83G0 OtEfU0xs/Ly797tk0Pw1fRDXnx2uwRlkHDDVBf3uW2o1rGOppN/9/bOV7PiBvK+VcgXm 7APzeQXj3rhasW0dt4oOF7nwzPBEr0mlnDp/8IZ/gOc+LsvLRefpK7lr48PqI+bz0Ncp mmuA== X-Gm-Message-State: AOJu0YzZE/iTdk870vI3bqEAckgMSDhP3cem3EUW5J4ChhIKkDWmAM5M Vr9GOJW9S7wPFQDKs02XdQQHKEAoVuwApzMo X-Received: by 2002:a17:903:32c3:b0:1b8:9fc4:2733 with SMTP id i3-20020a17090332c300b001b89fc42733mr148869plr.3.1692295761849; Thu, 17 Aug 2023 11:09:21 -0700 (PDT) Received: from localhost (zz20184013906F627101.userreverse.dion.ne.jp. [111.98.113.1]) by smtp.gmail.com with ESMTPSA id b4-20020a170902d30400b001bdd700dc11sm50870plc.292.2023.08.17.11.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 11:09:20 -0700 (PDT) To: binutils@sourceware.org Cc: rui314@gmail.com, ruiu@bluewhale.systems, Tatsuyuki Ishi Subject: [PATCH 2/4] RISC-V: Add assembly support for TLSDESC. Date: Fri, 18 Aug 2023 03:08:35 +0900 Message-ID: <20230817180852.121628-4-ishitatsuyuki@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230817180852.121628-2-ishitatsuyuki@gmail.com> References: <20230817180852.121628-2-ishitatsuyuki@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tatsuyuki Ishi via Binutils From: Tatsuyuki Ishi Reply-To: Tatsuyuki Ishi Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774500739865715451 X-GMAIL-MSGID: 1774500739865715451 --- gas/config/tc-riscv.c | 18 +++++++++++++----- opcodes/riscv-opc.c | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 959cbbc32a5..0a1fac9de9d 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -2195,6 +2195,7 @@ static const struct percent_op_match percent_op_utype[] = {"tprel_hi", BFD_RELOC_RISCV_TPREL_HI20}, {"pcrel_hi", BFD_RELOC_RISCV_PCREL_HI20}, {"got_pcrel_hi", BFD_RELOC_RISCV_GOT_HI20}, + {"tlsdesc_hi", BFD_RELOC_RISCV_TLSDESC_HI20}, {"tls_ie_pcrel_hi", BFD_RELOC_RISCV_TLS_GOT_HI20}, {"tls_gd_pcrel_hi", BFD_RELOC_RISCV_TLS_GD_HI20}, {"hi", BFD_RELOC_RISCV_HI20}, @@ -2206,6 +2207,8 @@ static const struct percent_op_match percent_op_itype[] = {"lo", BFD_RELOC_RISCV_LO12_I}, {"tprel_lo", BFD_RELOC_RISCV_TPREL_LO12_I}, {"pcrel_lo", BFD_RELOC_RISCV_PCREL_LO12_I}, + {"tlsdesc_load_lo", BFD_RELOC_RISCV_TLSDESC_LOAD_LO12}, + {"tlsdesc_add_lo", BFD_RELOC_RISCV_TLSDESC_ADD_LO12}, {0, 0} }; @@ -2217,8 +2220,9 @@ static const struct percent_op_match percent_op_stype[] = {0, 0} }; -static const struct percent_op_match percent_op_rtype[] = +static const struct percent_op_match percent_op_relax_only[] = { + {"tlsdesc_call", BFD_RELOC_RISCV_TLSDESC_CALL}, {"tprel_add", BFD_RELOC_RISCV_TPREL_ADD}, {0, 0} }; @@ -3326,10 +3330,10 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr, *imm_reloc = BFD_RELOC_RISCV_LO12_I; goto load_store; case '1': - /* This is used for TLS, where the fourth operand is - %tprel_add, to get a relocation applied to an add - instruction, for relaxation to use. */ - p = percent_op_rtype; + /* This is used for TLS relocations that acts as relaxation + markers and do not change the instruction encoding, + i.e. %tprel_add and %tlsdesc_call. */ + p = percent_op_relax_only; goto alu_op; case '0': /* AMO displacement, which must be zero. */ load_store: @@ -4082,6 +4086,7 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) case BFD_RELOC_RISCV_TPREL_LO12_I: case BFD_RELOC_RISCV_TPREL_LO12_S: case BFD_RELOC_RISCV_TPREL_ADD: + case BFD_RELOC_RISCV_TLSDESC_HI20: relaxable = true; /* Fall through. */ @@ -4255,6 +4260,9 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) case BFD_RELOC_RISCV_CALL: case BFD_RELOC_RISCV_CALL_PLT: + case BFD_RELOC_RISCV_TLSDESC_LOAD_LO12: + case BFD_RELOC_RISCV_TLSDESC_ADD_LO12: + case BFD_RELOC_RISCV_TLSDESC_CALL: relaxable = true; break; diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 067e9fdb611..467666b9805 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -370,6 +370,7 @@ const struct riscv_opcode riscv_opcodes[] = {"jalr", 0, INSN_CLASS_I, "s,j", MATCH_JALR|(X_RA << OP_SH_RD), MASK_JALR|MASK_RD, match_opcode, INSN_ALIAS|INSN_JSR }, {"jalr", 0, INSN_CLASS_I, "d,s", MATCH_JALR, MASK_JALR|MASK_IMM, match_opcode, INSN_ALIAS|INSN_JSR }, {"jalr", 0, INSN_CLASS_I, "d,o(s)", MATCH_JALR, MASK_JALR, match_opcode, INSN_JSR }, +{"jalr", 0, INSN_CLASS_I, "d,s,1", MATCH_JALR, MASK_JALR|MASK_IMM, match_opcode, INSN_JSR }, {"jalr", 0, INSN_CLASS_I, "d,s,j", MATCH_JALR, MASK_JALR, match_opcode, INSN_JSR }, {"j", 0, INSN_CLASS_C, "Ca", MATCH_C_J, MASK_C_J, match_opcode, INSN_ALIAS|INSN_BRANCH }, {"j", 0, INSN_CLASS_I, "a", MATCH_JAL, MASK_JAL|MASK_RD, match_opcode, INSN_ALIAS|INSN_BRANCH },