From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id C571A3858C1F for ; Thu, 30 Mar 2023 10:24:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C571A3858C1F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E62501596; Thu, 30 Mar 2023 03:25:03 -0700 (PDT) Received: from e121540-lin.manchester.arm.com (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 291613F663; Thu, 30 Mar 2023 03:24:19 -0700 (PDT) From: Richard Sandiford To: binutils@sourceware.org Cc: Richard Sandiford Subject: [PATCH 07/43] aarch64: Add REG_TYPE_ZATHV Date: Thu, 30 Mar 2023 11:23:23 +0100 Message-Id: <20230330102359.3327695-8-richard.sandiford@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230330102359.3327695-1-richard.sandiford@arm.com> References: <20230330102359.3327695-1-richard.sandiford@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-33.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_NONE,SPF_NONE,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 List-Id: This patch adds a multi-register type that includes both REG_TYPE_ZATH and REG_TYPE_ZATV. This slightly simplifies the existing code, but the main purpose is to enable later patches. --- gas/config/tc-aarch64.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index c8b4129202c..98091f564d9 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -326,6 +326,8 @@ struct reloc_entry MULTI_REG_TYPE(R_N, REG_TYPE(R_32) | REG_TYPE(R_64) \ | REG_TYPE(SP_32) | REG_TYPE(SP_64) \ | REG_TYPE(Z_32) | REG_TYPE(Z_64)) \ + /* A horizontal or vertical slice of a ZA tile. */ \ + MULTI_REG_TYPE(ZATHV, REG_TYPE(ZATH) | REG_TYPE(ZATV)) \ /* Pseudo type to mark the end of the enumerator sequence. */ \ BASIC_REG_TYPE(MAX) @@ -4248,7 +4250,7 @@ parse_reg_with_qual (char **str, aarch64_reg_type reg_type, char *q; reg_entry *reg = parse_reg (str); - if (reg != NULL && reg->type == reg_type) + if (reg != NULL && aarch64_check_reg_type (reg, reg_type)) { if (!skip_past_char (str, '.')) { @@ -4440,26 +4442,19 @@ parse_sme_za_hv_tiles_operand (char **str, int *imm, aarch64_opnd_qualifier_t *qualifier) { - char *qh, *qv; int regno; int regno_limit; int64_t imm_limit; int64_t imm_value; const reg_entry *reg; - qh = qv = *str; - if ((reg = parse_reg_with_qual (&qh, REG_TYPE_ZATH, qualifier)) != NULL) - { - *slice_indicator = HV_horizontal; - *str = qh; - } - else if ((reg = parse_reg_with_qual (&qv, REG_TYPE_ZATV, qualifier)) != NULL) - { - *slice_indicator = HV_vertical; - *str = qv; - } - else + reg = parse_reg_with_qual (str, REG_TYPE_ZATHV, qualifier); + if (!reg) return PARSE_FAIL; + + *slice_indicator = (aarch64_check_reg_type (reg, REG_TYPE_ZATH) + ? HV_horizontal + : HV_vertical); regno = reg->number; switch (*qualifier) -- 2.25.1