From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id A0B7D384F01E for ; Wed, 13 Jul 2022 15:34:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A0B7D384F01E Received: by mail-pf1-x436.google.com with SMTP id y141so10556416pfb.7 for ; Wed, 13 Jul 2022 08:34:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=WvygDwDnX648LOhdcrvucsWdHI89bJjsUKD+tsbgfIg=; b=uxV5QocB+3nN2XqSXOBRZHboI9r55yRp04gABjef9ppql7JSj+H74T1AwlmCrjXDXf ZKdNAefbisoStJEw1AlUDTbusNMd+LS1v41ELNcKVXf/UyNwDf5Aae9yKq0wl3sAWZXZ TYocKyUGAn/Y9GAMhhSF4V1LyOBhMTkF/LkLuJdcBasrLwDxmqSjSPl+Fq0IKu26MKbp fjGWQW7dHp4wZzCUrD0PN0+YY4YfYv71xBSxVVT0pvP2s241PMWUlPeAoXlcvh5Ywp4M SPR+It1/9zr5n1YpuhQ8MkFiwrA1eS2aGIMCr+9cL4BxufN5mGndoYwo/phad02aBrEn zthA== X-Gm-Message-State: AJIora/pVKpYsNVSS32EBWJO25IB7ETVj9eDPV+1aSRiAoH7ZhW2n3GF o1i+opqzGxCHfJatZJWHRMM= X-Google-Smtp-Source: AGRyM1vBCz083JaDt0GeTQcTt2clUEFrWbLdtIkRSP9iGJOq8ZMDBSgm7lx2ygkXBvqilRs3EMmPeg== X-Received: by 2002:a05:6a00:c91:b0:52a:cad7:d755 with SMTP id a17-20020a056a000c9100b0052acad7d755mr3874112pfv.66.1657726459723; Wed, 13 Jul 2022 08:34:19 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:26c2:3e9f:c2a0:6c34]) by smtp.gmail.com with ESMTPSA id q5-20020a170902a3c500b0015e8d4eb2easm8957217plb.308.2022.07.13.08.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 08:34:19 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 95BB91140046; Thu, 14 Jul 2022 01:04:16 +0930 (ACST) Date: Thu, 14 Jul 2022 01:04:16 +0930 From: Alan Modra To: Dmitry Selyutin Cc: binutils@sourceware.org, Luke Leighton , Jan Beulich Subject: Re: [PATCH v3 1/1] ppc: support register names in macros Message-ID: References: <20220712212223.87226-2-ghostmansd@gmail.com> <20220712212959.94767-1-ghostmansd@gmail.com> <20220712212959.94767-2-ghostmansd@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220712212959.94767-2-ghostmansd@gmail.com> X-Spam-Status: No, score=-3036.1 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: Wed, 13 Jul 2022 15:34:24 -0000 On Wed, Jul 13, 2022 at 12:29:59AM +0300, Dmitry Selyutin wrote: > +#define LEX_PCT (LEX_BEGIN_NAME) > + This would allow '%' to start symbols and labels, and I think that is a bad idea. I've also been working on a patch, wasting a lot of time trying to change expr.c:operand in a way that allows the powerpc register type checks in X_md to work. ie. .set a,%f4 .set b,%cr3 .set c,%r31 addi a,b,c ought to warn about invalid registers. In the end I gave up and just moved some code from operand() to ppc_parse_name(). I'll commit the following tomorrow assuming overnight checks pass. * gas/config/tc-ppc.c (REG_NAME_CNT): Delete, replace uses with ARRAY_SIZE. (register_name): Rename to.. (md_operand): ..this. Only handle %reg. (cr_names): Rename to.. (cr_cond): ..this. Just keep conditions. (ppc_parse_name): Add mode param. Search both cr_cond and pre_defined_registers. Handle absolute and register symbol values here rather than in expr. (md_assemble): Don't special case register name matching in operands, except to set cr_operand as appropriate. * gas/config/tc-ppc.h (md_operand): Don't define. (md_parse_name, ppc_parse_name): Update. * read.c (pseudo_set): Copy over entire O_register value. * testsuite/gas/ppc/regsyms.d. * testsuite/gas/ppc/regsyms.s: New test. * testsuite/gas/ppc/ppc.exp: Run it. diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 5015777d600..05d8ee19be7 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -785,8 +785,6 @@ 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. */ @@ -815,76 +813,43 @@ reg_name_search (const struct pd_reg *regs, int regcount, const char *name) 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. - */ +/* Called for a non-symbol, non-number operand. Handles %reg. */ -static bool -register_name (expressionS *expressionP) +void +md_operand (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; + if (input_line_pointer[0] != '%' || !ISALPHA (input_line_pointer[1])) + return; - else if (!reg_names_p || !ISALPHA (name[0])) - return false; + start = input_line_pointer; + ++input_line_pointer; c = get_symbol_name (&name); - reg = reg_name_search (pre_defined_registers, REG_NAME_CNT, name); - - /* Put back the delimiting char. */ + reg = reg_name_search (pre_defined_registers, + ARRAY_SIZE (pre_defined_registers), name); *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; + else + input_line_pointer = start; } - -/* 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; -/* Names to recognize in a condition code. This table is sorted. */ -static const struct pd_reg cr_names[] = +/* Extra names to recognise in a condition code. This table is sorted. */ +static const struct pd_reg cr_cond[] = { - { "cr0", 0, PPC_OPERAND_CR_REG }, - { "cr1", 1, PPC_OPERAND_CR_REG }, - { "cr2", 2, PPC_OPERAND_CR_REG }, - { "cr3", 3, PPC_OPERAND_CR_REG }, - { "cr4", 4, PPC_OPERAND_CR_REG }, - { "cr5", 5, PPC_OPERAND_CR_REG }, - { "cr6", 6, PPC_OPERAND_CR_REG }, - { "cr7", 7, PPC_OPERAND_CR_REG }, { "eq", 2, PPC_OPERAND_CR_BIT }, { "gt", 1, PPC_OPERAND_CR_BIT }, { "lt", 0, PPC_OPERAND_CR_BIT }, @@ -892,29 +857,60 @@ static const struct pd_reg cr_names[] = { "un", 3, PPC_OPERAND_CR_BIT } }; -/* Parsing function. This returns non-zero if it recognized an - expression. */ +/* 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, and recognises other registers when + -mregnames. */ int -ppc_parse_name (const char *name, expressionS *exp) +ppc_parse_name (const char *name, expressionS *exp, enum expr_mode mode) { - const struct pd_reg *reg; + const struct pd_reg *reg = NULL; - if (! cr_operand) - return 0; + if (cr_operand) + reg = reg_name_search (cr_cond, ARRAY_SIZE (cr_cond), name); + if (reg == NULL && (cr_operand || reg_names_p)) + reg = reg_name_search (pre_defined_registers, + ARRAY_SIZE (pre_defined_registers), name); + if (reg != NULL) + { + exp->X_op = O_register; + exp->X_add_number = reg->value; + exp->X_md = reg->flags; + return true; + } - if (*name == '%') - ++name; - reg = reg_name_search (cr_names, sizeof cr_names / sizeof cr_names[0], - name); - if (reg == NULL) - return 0; + /* The following replaces code in expr.c operand() after the + md_parse_name call. There is too much difference between targets + in the way X_md is used to move this code into expr.c. If you + do, you'll get failures on x86 due to uninitialised X_md fields, + failures on alpha and other targets due to creating register + symbols as O_constant rather than O_register, and failures on arc + and others due to expecting expr() to leave X_md alone. */ + symbolS *sym = symbol_find_or_make (name); - exp->X_op = O_register; - exp->X_add_number = reg->value; - exp->X_md = reg->flags; + /* If we have an absolute symbol or a reg, then we know its value + now. Copy the symbol value expression to propagate X_md. */ + bool done = false; + if (mode != expr_defer + && !S_FORCE_RELOC (sym, 0)) + { + segT segment = S_GET_SEGMENT (sym); + if (segment == absolute_section || segment == reg_section) + { + resolve_symbol_value (sym); + *exp = *symbol_get_value_expression (sym); + done = true; + } + } + if (!done) + { + exp->X_op = O_symbol; + exp->X_add_symbol = sym; + exp->X_add_number = 0; + } - return 1; + return true; } /* Propagate X_md and check register expressions. This is to support @@ -3437,25 +3433,10 @@ 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; - } - + cr_operand = ((operand->flags & PPC_OPERAND_CR_BIT) != 0 + || (operand->flags & PPC_OPERAND_CR_REG) != 0); + expression (&ex); + cr_operand = false; str = input_line_pointer; input_line_pointer = hold; diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h index ed06a296382..480c952be45 100644 --- a/gas/config/tc-ppc.h +++ b/gas/config/tc-ppc.h @@ -322,14 +322,12 @@ 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 md_parse_name(name, exp, mode, c) ppc_parse_name (name, exp) -extern int ppc_parse_name (const char *, struct expressionS *); +#define md_parse_name(name, exp, mode, c) ppc_parse_name (name, exp, mode) +extern int ppc_parse_name (const char *, struct expressionS *, enum expr_mode); #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); diff --git a/gas/read.c b/gas/read.c index 6f3a51df761..559fd05a8db 100644 --- a/gas/read.c +++ b/gas/read.c @@ -3934,10 +3934,9 @@ pseudo_set (symbolS *symbolP) return; } #endif + symbol_set_value_expression (symbolP, &exp); S_SET_SEGMENT (symbolP, reg_section); - S_SET_VALUE (symbolP, (valueT) exp.X_add_number); set_zero_frag (symbolP); - symbol_get_value_expression (symbolP)->X_op = O_register; break; case O_symbol: diff --git a/gas/testsuite/gas/ppc/ppc.exp b/gas/testsuite/gas/ppc/ppc.exp index a2e23a2c6af..9844ce7e4a1 100644 --- a/gas/testsuite/gas/ppc/ppc.exp +++ b/gas/testsuite/gas/ppc/ppc.exp @@ -36,6 +36,7 @@ run_dump_test "bcy" run_dump_test "bcaterr" run_dump_test "bcat" run_dump_test "regnames" +run_dump_test "regsyms" run_dump_test "misalign" run_dump_test "misalign2" run_dump_test "machine" diff --git a/gas/testsuite/gas/ppc/regsyms.d b/gas/testsuite/gas/ppc/regsyms.d new file mode 100644 index 00000000000..7586b0df4ca --- /dev/null +++ b/gas/testsuite/gas/ppc/regsyms.d @@ -0,0 +1,10 @@ +#as: -mregnames +#objdump: -d + +.*: file format .* + +Disassembly of section \.text: + +0+ <.text>: + 0: (7c 43 13 78|78 13 43 7c) mr r3,r2 + 4: (7f c3 f3 78|78 f3 c3 7f) mr r3,r30 diff --git a/gas/testsuite/gas/ppc/regsyms.s b/gas/testsuite/gas/ppc/regsyms.s new file mode 100644 index 00000000000..6dc3ddc070b --- /dev/null +++ b/gas/testsuite/gas/ppc/regsyms.s @@ -0,0 +1,4 @@ + tocp = %r2 + mr %r3,tocp + x = r30 + mr 3,x -- Alan Modra Australia Development Lab, IBM