From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 5B7C4385695A for ; Tue, 12 Jul 2022 21:22:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5B7C4385695A Received: by mail-lj1-x234.google.com with SMTP id c15so11413829ljr.0 for ; Tue, 12 Jul 2022 14:22:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/0hlLHIPE275PL4A1cmE4AlrTh2NQNE6Hq1rzRarYTE=; b=v+UNqRqxGxQn1Jpgkok+B3RWy+MIRAWOJXT4cbN8AfOosX6PhcmeWSeRljFR5enGTu NM45X3b5SAUXjS4n8PfMhiThljQu3tH8TrIIsIun/oNv8Ay7ey4nBklsm/n/EAl+1Q6e nqCqeJhC2LXgISuN34pbE8+KKe2ku5f0f76eIpaJXb6Sfaa+/BUENHRlFN3SX23HzM3n GFWoqKVukgpYCy72PB94vWoqH6hdDEQ0YFSmH6Oau/EqXcwilZRJoDFacIqtE9GlIboD BbvVaeOTXtQFCt3rOZ+iiYwWYklgHB4kRywgIRXqeCtJbuZfX+7+XSdUvJE8kkO4jeOM 86aQ== X-Gm-Message-State: AJIora8a1Uj8Z9+aN0ZICOUKSmBvEH3835xV0mhod3Y2OjoKjqfdl/b9 tLoNq9dHkoUOOl4b8OuIm/Gu+7tvsM0= X-Google-Smtp-Source: AGRyM1soX5446wys/cw+lTDjrsq3BG2RuXPeWrikxHqiNDhDZQI+HPy30Y3md7NLsUqegF9whnQ7wg== X-Received: by 2002:a05:651c:11cd:b0:25d:5b07:53cc with SMTP id z13-20020a05651c11cd00b0025d5b0753ccmr202ljo.446.1657660954512; Tue, 12 Jul 2022 14:22:34 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-220-156.ip.moscow.rt.ru. [188.32.220.156]) by smtp.gmail.com with ESMTPSA id v4-20020a056512348400b00489545df9f3sm2398519lfr.148.2022.07.12.14.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 14:22:33 -0700 (PDT) Sender: Dmitry Selyutin From: Dmitry Selyutin To: binutils@sourceware.org Cc: Alan Modra , Luke Leighton , Jan Beulich , Dmitry Selyutin Subject: [PATCH v2 1/1] ppc: support register names in macros Date: Wed, 13 Jul 2022 00:22:23 +0300 Message-Id: <20220712212223.87226-2-ghostmansd@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220712212223.87226-1-ghostmansd@gmail.com> References: <20220712135057.170969-1-ghostmansd@gmail.com> <20220712212223.87226-1-ghostmansd@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 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, 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.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2022 21:22:38 -0000 This patch is a follow-up of discussion: https://sourceware.org/pipermail/binutils/2022-July/121719.html Form now on, PPC assembly becomes capable of compiling such code: .set VREG, %r0 .set REG, VREG extsw REG, 2 extsw %r1, 1 The custom register_name() code path, as well as checks for CRs, are deprecated; from now on, we use md_operand() routine everywhere. Whilst we're here, let's also reuse register lookup for CFI. --- gas/config/tc-ppc.c | 232 +++++++++++++++++--------------------------- gas/config/tc-ppc.h | 9 +- 2 files changed, 96 insertions(+), 145 deletions(-) diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 5015777d60..283cefc3a4 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -317,7 +317,7 @@ struct pd_reg The table is sorted. Suitable for searching by a binary search. */ -static const struct pd_reg pre_defined_registers[] = +static const struct pd_reg reg_names[] = { /* VSX accumulators. */ { "a0", 0, PPC_OPERAND_ACC }, @@ -784,95 +784,7 @@ static const struct pd_reg pre_defined_registers[] = { "xer", 1, PPC_OPERAND_SPR } }; - -#define REG_NAME_CNT (sizeof (pre_defined_registers) / sizeof (struct pd_reg)) - -/* Given NAME, find the register number associated with that name, return - the integer value associated with the given name or -1 on failure. */ - -static const struct pd_reg * -reg_name_search (const struct pd_reg *regs, int regcount, const char *name) -{ - int middle, low, high; - int cmp; - - low = 0; - high = regcount - 1; - - do - { - middle = (low + high) / 2; - cmp = strcasecmp (name, regs[middle].name); - if (cmp < 0) - high = middle - 1; - else if (cmp > 0) - low = middle + 1; - else - return ®s[middle]; - } - while (low <= high); - - return NULL; -} - -/* - * Summary of register_name. - * - * in: Input_line_pointer points to 1st char of operand. - * - * out: A expressionS. - * The operand may have been a register: in this case, X_op == O_register, - * X_add_number is set to the register number, and truth is returned. - * Input_line_pointer->(next non-blank) char after operand, or is in its - * original state. - */ - -static bool -register_name (expressionS *expressionP) -{ - const struct pd_reg *reg; - char *name; - char *start; - char c; - - /* Find the spelling of the operand. */ - start = name = input_line_pointer; - if (name[0] == '%' && ISALPHA (name[1])) - name = ++input_line_pointer; - - else if (!reg_names_p || !ISALPHA (name[0])) - return false; - - c = get_symbol_name (&name); - reg = reg_name_search (pre_defined_registers, REG_NAME_CNT, name); - - /* Put back the delimiting char. */ - *input_line_pointer = c; - - /* Look to see if it's in the register table. */ - if (reg != NULL) - { - expressionP->X_op = O_register; - expressionP->X_add_number = reg->value; - expressionP->X_md = reg->flags; - - /* Make the rest nice. */ - expressionP->X_add_symbol = NULL; - expressionP->X_op_symbol = NULL; - return true; - } - - /* Reset the line as if we had not done anything. */ - input_line_pointer = start; - return false; -} - -/* This function is called for each symbol seen in an expression. It - handles the special parsing which PowerPC assemblers are supposed - to use for condition codes. */ - -/* Whether to do the special parsing. */ -static bool cr_operand; +#define REG_NAME_CNT (sizeof (reg_names) / sizeof (struct pd_reg)) /* Names to recognize in a condition code. This table is sorted. */ static const struct pd_reg cr_names[] = @@ -891,6 +803,10 @@ static const struct pd_reg cr_names[] = { "so", 3, PPC_OPERAND_CR_BIT }, { "un", 3, PPC_OPERAND_CR_BIT } }; +#define CR_NAME_CNT (sizeof (cr_names) / sizeof (struct pd_reg)) + +/* Whether to do the special parsing. */ +static bool cr_operand; /* Parsing function. This returns non-zero if it recognized an expression. */ @@ -900,23 +816,79 @@ ppc_parse_name (const char *name, expressionS *exp) { const struct pd_reg *reg; - if (! cr_operand) - return 0; - - if (*name == '%') + if (name[0] == '%' && ISALPHA (name[1])) ++name; - reg = reg_name_search (cr_names, sizeof cr_names / sizeof cr_names[0], - name); - if (reg == NULL) + else if (!cr_operand && (!reg_names_p || !ISALPHA (name[0]))) return 0; - exp->X_op = O_register; - exp->X_add_number = reg->value; - exp->X_md = reg->flags; + if (cr_operand) + reg = reg_name_search (cr_names, CR_NAME_CNT, name); + else + reg = reg_name_search (reg_names, REG_NAME_CNT, name); + if (reg != NULL) + { + exp->X_op = O_register; + exp->X_add_number = reg->value; + exp->X_md = reg->flags; - return 1; + if (! cr_operand) + { + /* Make the rest nice. */ + exp->X_add_symbol = NULL; + exp->X_op_symbol = NULL; + } + + return 1; + } + + return 0; +} + +void +ppc_operand (expressionS *exp) +{ + char endc; + char *name; + char *origin = input_line_pointer; + + endc = get_symbol_name (&name); + if (! ppc_parse_name (name, exp)) + { + restore_line_pointer (endc); + input_line_pointer = origin; + } } +/* Given NAME, find the register number associated with that name, return + the integer value associated with the given name or -1 on failure. */ + +static const struct pd_reg * +reg_name_search (const struct pd_reg *regs, int regcount, const char *name) +{ + int middle, low, high; + int cmp; + + low = 0; + high = regcount - 1; + + do + { + middle = (low + high) / 2; + cmp = strcasecmp (name, regs[middle].name); + if (cmp < 0) + high = middle - 1; + else if (cmp > 0) + low = middle + 1; + else + return ®s[middle]; + } + while (low <= high); + + return NULL; +} + + + /* Propagate X_md and check register expressions. This is to support condition codes like 4*cr5+eq. */ @@ -3437,25 +3409,11 @@ md_assemble (char *str) /* Gather the operand. */ hold = input_line_pointer; input_line_pointer = str; - - if ((reg_names_p - && (((operand->flags & PPC_OPERAND_CR_BIT) != 0) - || ((operand->flags & PPC_OPERAND_CR_REG) != 0))) - || !register_name (&ex)) - { - char save_lex = lex_type['%']; - - if (((operand->flags & PPC_OPERAND_CR_REG) != 0) - || (operand->flags & PPC_OPERAND_CR_BIT) != 0) - { - cr_operand = true; - lex_type['%'] |= LEX_BEGIN_NAME; - } - expression (&ex); - cr_operand = false; - lex_type['%'] = save_lex; - } - + memset (&ex, 0, sizeof (expressionS)); + if (operand->flags & (PPC_OPERAND_CR_BIT | PPC_OPERAND_CR_REG)) + cr_operand = true; + expression (&ex); + cr_operand = false; str = input_line_pointer; input_line_pointer = hold; @@ -7734,10 +7692,8 @@ ppc_cfi_frame_initial_instructions (void) int tc_ppc_regname_to_dw2regnum (char *regname) { - unsigned int regnum = -1; unsigned int i; - const char *p; - char *q; + const struct pd_reg *reg; static struct { const char *name; int dw2regnum; } regnames[] = { { "sp", 1 }, { "r.sp", 1 }, { "rtoc", 2 }, { "r.toc", 2 }, @@ -7750,23 +7706,15 @@ tc_ppc_regname_to_dw2regnum (char *regname) if (strcmp (regnames[i].name, regname) == 0) return regnames[i].dw2regnum; - if (regname[0] == 'r' || regname[0] == 'f' || regname[0] == 'v') - { - p = regname + 1 + (regname[1] == '.'); - regnum = strtoul (p, &q, 10); - if (p == q || *q || regnum >= 32) - return -1; - if (regname[0] == 'f') - regnum += 32; - else if (regname[0] == 'v') - regnum += 77; - } - else if (regname[0] == 'c' && regname[1] == 'r') - { - p = regname + 2 + (regname[2] == '.'); - if (p[0] < '0' || p[0] > '7' || p[1]) - return -1; - regnum = p[0] - '0' + 68; - } - return regnum; + if (regname[0] == '%' && ISALPHA (regname[1])) + ++regname; + + reg = reg_name_search (reg_names, REG_NAME_CNT, regname); + if (reg == NULL) + reg = reg_name_search (cr_names, CR_NAME_CNT, regname); + + if (reg != NULL) + return reg->value; + + return -1; } diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h index ed06a29638..da3c427c4a 100644 --- a/gas/config/tc-ppc.h +++ b/gas/config/tc-ppc.h @@ -322,14 +322,17 @@ extern void ppc_frob_label (symbolS *); /* call md_pcrel_from_section, not md_pcrel_from */ #define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section(FIX, SEC) +#define LEX_PCT (LEX_BEGIN_NAME) + +extern int ppc_parse_name (const char *name, struct expressionS *exp); #define md_parse_name(name, exp, mode, c) ppc_parse_name (name, exp) -extern int ppc_parse_name (const char *, struct expressionS *); + +extern void ppc_operand (expressionS *exp); +#define md_operand ppc_operand #define md_optimize_expr(left, op, right) ppc_optimize_expr (left, op, right) extern int ppc_optimize_expr (expressionS *, operatorT, expressionS *); -#define md_operand(x) - #define md_cleanup() ppc_cleanup () extern void ppc_cleanup (void); -- 2.37.0