From: Alan Modra Date: Tue, 12 Jul 2022 01:40:08 +0000 (+0930) Subject: PowerPC: implement md_operand to parse register names X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00b37cc41e699faa30435fb6a302311a5ad44a3d;p=binutils-gdb.git PowerPC: implement md_operand to parse register names Allows register names to appear in symbol assignments, so for example tocp = %r2 mr %r3,tocp now assembles. * 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.c:operand(). (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