From patchwork Thu Dec 28 06:24:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lulu Cai X-Patchwork-Id: 183643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1833293dyb; Wed, 27 Dec 2023 22:25:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IEaMCCJmYYkdiwVnWNpTBvAz+wnYswnR/2Vf/nCObG7y7VWpTMFiCzMzZsxMLfpLl+bdvFX X-Received: by 2002:a05:6214:2aa9:b0:67f:27b6:9bb7 with SMTP id js9-20020a0562142aa900b0067f27b69bb7mr17321520qvb.45.1703744717085; Wed, 27 Dec 2023 22:25:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1703744717; cv=pass; d=google.com; s=arc-20160816; b=TpXNVH/Kyea3RARl/cKboR5I72N7pKBgTaMXKWvAq+KgFzcLADnPtaT1L8OJjtiErJ ORIjDALXgq2LQxQ16CsFnlO5IiukZKaoBuWlNDgAE3CHP2cSW2azt1lNDCOpLT2kEfNt Bf4QYvARktKBXfXz1FYZjnOKyIgqv6jo6+8nwM/ZPNCyr6tQuDsj+XXQzBBmQrm381Jr aHQBlsZ3lNs94LsIvJBsKM4Uy5u3GHTPtfVenIKRRUa1Xhc6EiIQnSYPyuZO1QNPVM2W m0Jj0o99DxAh9CslNBf+F2RbAWEdZEF9RgODxho1JwDO2TeXLDz1nvtzof9FOag1ZrFc dTIw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:arc-filter :dmarc-filter:delivered-to; bh=8maYubuyKcHw4hmc4jzVhydj47mRlLRVt3xmTkpMk/E=; fh=FvlVQEmCpm5H8oBXQswexzCupeeQXnbssobXN+3R2Wg=; b=Z0BQQp2vr0pDokWOMdoxmXWWgxZNVxY5XBrC6+UX0b8r+9eWR0QoVYcasel6ktYSfI ygwLQaZafmkLSmRAwYApX0OP5lq649uLK/DjxIySUf94k2lMhuod/fyICxvJdGx3AEC6 BhDtwitirYzx4+aBt9BmuuHJ84tmTv2hxLikvYEm84Yfd63FBoaaDr2DjGNtCR4XvGib InrL0X4AKLZJ21+MFhCAoVs3ypVz5Z79A8iTCgG9dgvdyoBt6VVcdL77mBCKuoiptslR S4MFPcsFIiL8ivRB15ozSQYONZZXe0qJ/8qvORew4Ow+grp1Fti1NwginXfXpueIKfmS Hb3w== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id bm31-20020a05620a199f00b007681446a032si17293482qkb.269.2023.12.27.22.25.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 22:25:17 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C8F763858C36 for ; Thu, 28 Dec 2023 06:25:16 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 32EDE3858D28 for ; Thu, 28 Dec 2023 06:25:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 32EDE3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 32EDE3858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703744709; cv=none; b=wluR04O+oCOnvc/mXEsg/5DCCkZP2HKlAI1sVMiVc2cIAQr343GfjHNnixhaN3GIUXX8PC0NFz5Xg3LN9xWWgsoVjQJ2fKzzGFMvAPRU/cOYeuQ9H1nYKZriJGoxHD20mheZx/WUqNCi1eeX4uYHI9REFlFfewU/f2N9cEiEKmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703744709; c=relaxed/simple; bh=qkD8wput/Zi2fOJtAJo2ioQAuuZlfVkDWEwALSvLrUs=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=lSgR0j73SAvkQ/JzFCcMCJZiMsW6Pad1F0rYj1qD8e7/08Ke5VX27rWe5MeQ2HnoolMSSvGD6/pXKoJeHz98erXm9WIWYjmOabEElfTUh6P1vQvMT/wil1NIpkcFzXhIRDVqt+2Wl0nAHy/5Z7NxYwNEyANVvGlULYZ0lLIfNIU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8Ax3eq_FI1ldggAAA--.236S3; Thu, 28 Dec 2023 14:25:03 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Dx6r29FI1lEcUNAA--.19247S4; Thu, 28 Dec 2023 14:25:02 +0800 (CST) From: Lulu Cai To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, mengqinggang@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, luweining@loongson.cn, wanglei@loongson.cn, hejinyang@loongson.cn, Lulu Cai Subject: [PATCH] LoongArch: Fix some macro that cannot be expanded properly. Date: Thu, 28 Dec 2023 14:24:55 +0800 Message-Id: <20231228062455.2965889-1-cailulu@loongson.cn> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Dx6r29FI1lEcUNAA--.19247S4 X-CM-SenderInfo: xfdlz3tox6z05rqj20fqof0/1tbiAQATB2WM2y8EIQABss X-Coremail-Antispam: 1Uk129KBj93XoWxGry5Cry5CrWkGF48tF4fZwc_yoW5tw1Dpa y5Ar12qw1kKFn5ur1rA3yUX3s3Jw15XrW3Kr47KF13tr10qw1qvFZxtrnaqa42vFnagr93 ZF4rAw1xWa47CFbCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUvEb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ Gr0_Gr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYI kI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUtVWr XwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI4 8JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v26r1Y 6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7 AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE 2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcV C2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73 UjIFyTuYvjxU4AhLUUUUU X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786505820528131859 X-GMAIL-MSGID: 1786505820528131859 --- opcodes/loongarch-opc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/opcodes/loongarch-opc.c b/opcodes/loongarch-opc.c index a632373f5ed..9c2f936958d 100644 --- a/opcodes/loongarch-opc.c +++ b/opcodes/loongarch-opc.c @@ -171,7 +171,7 @@ const char *const loongarch_x_normal_name[32] = "lu32i.d %1,%%got64_lo20(%2);" \ "lu52i.d %1,%1,%%got64_hi12(%2);" \ "ld.d %1,%1,0", \ - &LARCH_opts.ase_lp64, \ + &LARCH_opts.ase_gabs, \ &LARCH_opts.ase_gpcr /* got64 pic. */ #define INSN_LA_GOT64_LARGE_PCREL \ @@ -229,7 +229,7 @@ const char *const loongarch_x_normal_name[32] = "lu32i.d %1,%%ie64_lo20(%2);" \ "lu52i.d %1,%1,%%ie64_hi12(%2);" \ "ld.d %1,%1,0", \ - &LARCH_opts.ase_lp64, \ + &LARCH_opts.ase_gabs, \ &LARCH_opts.ase_gpcr /* For LoongArch32/64 cmode=normal. */ @@ -260,7 +260,7 @@ const char *const loongarch_x_normal_name[32] = "ori %1,%1,%%got_lo12(%2);" \ "lu32i.d %1,%%got64_lo20(%2);" \ "lu52i.d %1,%1,%%got64_hi12(%2);", \ - &LARCH_opts.ase_lp64, \ + &LARCH_opts.ase_gabs, \ &LARCH_opts.ase_gpcr #define INSN_LA_TLS_GD32 \ @@ -290,7 +290,7 @@ const char *const loongarch_x_normal_name[32] = "ori %1,%1,%%got_lo12(%2);" \ "lu32i.d %1,%%got64_lo20(%2);" \ "lu52i.d %1,%1,%%got64_hi12(%2);", \ - &LARCH_opts.ase_lp64, \ + &LARCH_opts.ase_gabs, \ &LARCH_opts.ase_gpcr #define INSN_LA_CALL \ @@ -376,27 +376,27 @@ static struct loongarch_opcode loongarch_macro_opcodes[] = { 0, 0, "la.pcrel", "r,la", INSN_LA_PCREL32, 0 }, { 0, 0, "la.pcrel", "r,la", INSN_LA_PCREL64, 0 }, { 0, 0, "la.pcrel", "r,r,la", INSN_LA_PCREL64_LARGE, 0 }, - { 0, 0, "la.got", "r,la", INSN_LA_GOT32, 0 }, { 0, 0, "la.got", "r,la", INSN_LA_GOT32_ABS, 0 }, - { 0, 0, "la.got", "r,la", INSN_LA_GOT64, 0 }, + { 0, 0, "la.got", "r,la", INSN_LA_GOT32, 0 }, { 0, 0, "la.got", "r,la", INSN_LA_GOT64_LARGE_ABS, 0 }, + { 0, 0, "la.got", "r,la", INSN_LA_GOT64, 0 }, { 0, 0, "la.got", "r,r,la", INSN_LA_GOT64_LARGE_PCREL, 0 }, { 0, 0, "la.tls.le", "r,l", INSN_LA_TLS_LE, 0 }, { 0, 0, "la.tls.le", "r,l", INSN_LA_TLS_LE64_LARGE, 0 }, - { 0, 0, "la.tls.ie", "r,l", INSN_LA_TLS_IE32, 0 }, { 0, 0, "la.tls.ie", "r,l", INSN_LA_TLS_IE32_ABS, 0 }, - { 0, 0, "la.tls.ie", "r,l", INSN_LA_TLS_IE64, 0 }, + { 0, 0, "la.tls.ie", "r,l", INSN_LA_TLS_IE32, 0 }, { 0, 0, "la.tls.ie", "r,l", INSN_LA_TLS_IE64_LARGE_ABS, 0 }, + { 0, 0, "la.tls.ie", "r,l", INSN_LA_TLS_IE64, 0 }, { 0, 0, "la.tls.ie", "r,r,l", INSN_LA_TLS_IE64_LARGE_PCREL, 0 }, - { 0, 0, "la.tls.ld", "r,l", INSN_LA_TLS_LD32, 0 }, { 0, 0, "la.tls.ld", "r,l", INSN_LA_TLS_LD32_ABS, 0 }, - { 0, 0, "la.tls.ld", "r,l", INSN_LA_TLS_LD64, 0 }, + { 0, 0, "la.tls.ld", "r,l", INSN_LA_TLS_LD32, 0 }, { 0, 0, "la.tls.ld", "r,l", INSN_LA_TLS_LD64_LARGE_ABS, 0 }, + { 0, 0, "la.tls.ld", "r,l", INSN_LA_TLS_LD64, 0 }, { 0, 0, "la.tls.ld", "r,r,l", INSN_LA_TLS_LD64_LARGE_PCREL, 0 }, - { 0, 0, "la.tls.gd", "r,l", INSN_LA_TLS_GD32, 0 }, { 0, 0, "la.tls.gd", "r,l", INSN_LA_TLS_GD32_ABS, 0 }, - { 0, 0, "la.tls.gd", "r,l", INSN_LA_TLS_GD64, 0 }, + { 0, 0, "la.tls.gd", "r,l", INSN_LA_TLS_GD32, 0 }, { 0, 0, "la.tls.gd", "r,l", INSN_LA_TLS_GD64_LARGE_ABS, 0 }, + { 0, 0, "la.tls.gd", "r,l", INSN_LA_TLS_GD64, 0 }, { 0, 0, "la.tls.gd", "r,r,l", INSN_LA_TLS_GD64_LARGE_PCREL, 0 }, { 0, 0, "call36", "la", INSN_LA_CALL, 0 }, { 0, 0, "tail36", "r,la", INSN_LA_TAIL, 0 },