X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gas%2Fconfig%2Ftc-aarch64.c;h=415663b5504bb2a6622f90107bb9f4d30a9baa50;hb=add39d2344036db9334bdeb1ec20a90beaa3ca49;hp=5cb9ab5e65aee8cacbf52519a4f3a017730fc5a0;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 5cb9ab5e65..415663b550 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -573,7 +573,7 @@ my_get_expression (expressionS * ep, char **str, int prefix_mode, of LITTLENUMS emitted is stored in *SIZEP. An error message is returned, or NULL on OK. */ -char * +const char * md_atof (int type, char *litP, int *sizeP) { return ieee_md_atof (type, litP, sizeP, target_big_endian); @@ -1187,7 +1187,7 @@ insert_reg_alias (char *str, int number, aarch64_reg_type type) } name = xstrdup (str); - new = xmalloc (sizeof (reg_entry)); + new = XNEW (reg_entry); new->name = name; new->number = number; @@ -1241,9 +1241,7 @@ create_register_alias (char *newname, char *p) nlen = strlen (newname); #endif - nbuf = alloca (nlen + 1); - memcpy (nbuf, newname, nlen); - nbuf[nlen] = '\0'; + nbuf = xmemdup0 (newname, nlen); /* Create aliases under the new name as stated; an all-lowercase version of the new name; and an all-uppercase version of the new @@ -1265,7 +1263,10 @@ create_register_alias (char *newname, char *p) the artificial FOO alias because it has already been created by the first .req. */ if (insert_reg_alias (nbuf, old->number, old->type) == NULL) - return TRUE; + { + free (nbuf); + return TRUE; + } } for (p = nbuf; *p; p++) @@ -1275,6 +1276,7 @@ create_register_alias (char *newname, char *p) insert_reg_alias (nbuf, old->number, old->type); } + free (nbuf); return TRUE; } @@ -1573,7 +1575,7 @@ find_or_make_literal_pool (int size) if (pool == NULL) { /* Create a new pool. */ - pool = xmalloc (sizeof (*pool)); + pool = XNEW (literal_pool); if (!pool) return NULL; @@ -1650,7 +1652,8 @@ add_to_lit_pool (expressionS *exp, int size) { /* PR 16688: Bignums are held in a single global array. We must copy and preserve that value now, before it is overwritten. */ - pool->literals[entry].bignum = xmalloc (CHARS_PER_LITTLENUM * exp->X_add_number); + pool->literals[entry].bignum = XNEWVEC (LITTLENUM_TYPE, + exp->X_add_number); memcpy (pool->literals[entry].bignum, generic_bignum, CHARS_PER_LITTLENUM * exp->X_add_number); } @@ -3473,10 +3476,8 @@ parse_address_reloc (char **str, aarch64_opnd_info *operand) static bfd_boolean parse_half (char **str, int *internal_fixup_p) { - char *p, *saved; - int dummy; + char *p = *str; - p = *str; skip_past_char (&p, '#'); gas_assert (internal_fixup_p); @@ -3506,12 +3507,6 @@ parse_half (char **str, int *internal_fixup_p) else *internal_fixup_p = 1; - /* Avoid parsing a register as a general symbol. */ - saved = p; - if (aarch64_reg_parse_32_64 (&p, 0, 0, &dummy, &dummy) != PARSE_FAIL) - return FALSE; - p = saved; - if (! my_get_expression (&inst.reloc.exp, &p, GE_NO_PREFIX, 1)) return FALSE; @@ -4055,9 +4050,7 @@ add_operand_error_record (const operand_error_record* new_record) /* Get one empty record. */ if (free_opnd_error_record_nodes == NULL) { - record = xmalloc (sizeof (operand_error_record)); - if (record == NULL) - abort (); + record = XNEW (operand_error_record); } else { @@ -4267,11 +4260,11 @@ print_operands (char *buf, const aarch64_opcode *opcode, static void output_info (const char *format, ...) { - char *file; + const char *file; unsigned int line; va_list args; - as_where (&file, &line); + file = as_where (&line); if (file) { if (line != 0) @@ -6106,8 +6099,7 @@ md_assemble (char *str) store the instruction information for the future fix-up. */ struct aarch64_inst *copy; gas_assert (inst.reloc.type != BFD_RELOC_UNUSED); - if ((copy = xmalloc (sizeof (struct aarch64_inst))) == NULL) - abort (); + copy = XNEW (struct aarch64_inst); memcpy (copy, &inst.base, sizeof (struct aarch64_inst)); output_inst (copy); } @@ -6326,7 +6318,7 @@ aarch64_handle_align (fragS * fragP) { /* NOP = d503201f */ /* AArch64 instructions are always little-endian. */ - static char const aarch64_noop[4] = { 0x1f, 0x20, 0x03, 0xd5 }; + static unsigned char const aarch64_noop[4] = { 0x1f, 0x20, 0x03, 0xd5 }; int bytes, fix, noop_size; char *p; @@ -7202,9 +7194,9 @@ tc_gen_reloc (asection * section, fixS * fixp) arelent *reloc; bfd_reloc_code_real_type code; - reloc = xmalloc (sizeof (arelent)); + reloc = XNEW (arelent); - reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + reloc->sym_ptr_ptr = XNEW (asymbol *); *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; @@ -7514,7 +7506,7 @@ fill_instruction_hash_table (void) templates *templ, *new_templ; templ = hash_find (aarch64_ops_hsh, opcode->name); - new_templ = (templates *) xmalloc (sizeof (templates)); + new_templ = XNEW (templates); new_templ->opcode = opcode; new_templ->next = NULL; @@ -7545,8 +7537,7 @@ get_upper_str (const char *str) { char *ret; size_t len = strlen (str); - if ((ret = xmalloc (len + 1)) == NULL) - abort (); + ret = XNEWVEC (char, len + 1); convert_to_upper (ret, str, len); return ret; } @@ -7723,8 +7714,8 @@ size_t md_longopts_size = sizeof (md_longopts); struct aarch64_option_table { - char *option; /* Option name to match. */ - char *help; /* Help information. */ + const char *option; /* Option name to match. */ + const char *help; /* Help information. */ int *var; /* Variable to change. */ int value; /* What to change it to. */ char *deprecated; /* If non-null, print this message. */ @@ -7746,7 +7737,7 @@ static struct aarch64_option_table aarch64_opts[] = { struct aarch64_cpu_option_table { - char *name; + const char *name; const aarch64_feature_set value; /* The canonical name of the CPU, or NULL to use NAME converted to upper case. */ @@ -7788,7 +7779,7 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = { struct aarch64_arch_option_table { - char *name; + const char *name; const aarch64_feature_set value; }; @@ -7805,7 +7796,7 @@ static const struct aarch64_arch_option_table aarch64_archs[] = { /* ISA extensions. */ struct aarch64_option_cpu_value_table { - char *name; + const char *name; const aarch64_feature_set value; }; @@ -7817,6 +7808,7 @@ static const struct aarch64_option_cpu_value_table aarch64_features[] = { {"simd", AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)}, {"pan", AARCH64_FEATURE (AARCH64_FEATURE_PAN, 0)}, {"lor", AARCH64_FEATURE (AARCH64_FEATURE_LOR, 0)}, + {"ras", AARCH64_FEATURE (AARCH64_FEATURE_RAS, 0)}, {"rdma", AARCH64_FEATURE (AARCH64_FEATURE_SIMD | AARCH64_FEATURE_RDMA, 0)}, {"fp16", AARCH64_FEATURE (AARCH64_FEATURE_F16 @@ -7827,14 +7819,14 @@ static const struct aarch64_option_cpu_value_table aarch64_features[] = { struct aarch64_long_option_table { - char *option; /* Substring to match. */ - char *help; /* Help information. */ - int (*func) (char *subopt); /* Function to decode sub-option. */ + const char *option; /* Substring to match. */ + const char *help; /* Help information. */ + int (*func) (const char *subopt); /* Function to decode sub-option. */ char *deprecated; /* If non-null, print this message. */ }; static int -aarch64_parse_features (char *str, const aarch64_feature_set **opt_p, +aarch64_parse_features (const char *str, const aarch64_feature_set **opt_p, bfd_boolean ext_only) { /* We insist on extensions being added before being removed. We achieve @@ -7842,7 +7834,7 @@ aarch64_parse_features (char *str, const aarch64_feature_set **opt_p, adding an extension (1) or removing it (0) and only allowing it to change in the order -1 -> 1 -> 0. */ int adding_value = -1; - aarch64_feature_set *ext_set = xmalloc (sizeof (aarch64_feature_set)); + aarch64_feature_set *ext_set = XNEW (aarch64_feature_set); /* Copy the feature set, so that we can modify it. */ *ext_set = **opt_p; @@ -7851,7 +7843,7 @@ aarch64_parse_features (char *str, const aarch64_feature_set **opt_p, while (str != NULL && *str != 0) { const struct aarch64_option_cpu_value_table *opt; - char *ext = NULL; + const char *ext = NULL; int optlen; if (!ext_only) @@ -7921,10 +7913,10 @@ aarch64_parse_features (char *str, const aarch64_feature_set **opt_p, } static int -aarch64_parse_cpu (char *str) +aarch64_parse_cpu (const char *str) { const struct aarch64_cpu_option_table *opt; - char *ext = strchr (str, '+'); + const char *ext = strchr (str, '+'); size_t optlen; if (ext != NULL) @@ -7953,10 +7945,10 @@ aarch64_parse_cpu (char *str) } static int -aarch64_parse_arch (char *str) +aarch64_parse_arch (const char *str) { const struct aarch64_arch_option_table *opt; - char *ext = strchr (str, '+'); + const char *ext = strchr (str, '+'); size_t optlen; if (ext != NULL) @@ -7987,7 +7979,7 @@ aarch64_parse_arch (char *str) /* ABIs. */ struct aarch64_option_abi_value_table { - char *name; + const char *name; enum aarch64_abi_type value; }; @@ -7998,7 +7990,7 @@ static const struct aarch64_option_abi_value_table aarch64_abis[] = { }; static int -aarch64_parse_abi (char *str) +aarch64_parse_abi (const char *str) { const struct aarch64_option_abi_value_table *opt; size_t optlen = strlen (str); @@ -8033,7 +8025,7 @@ static struct aarch64_long_option_table aarch64_long_opts[] = { }; int -md_parse_option (int c, char *arg) +md_parse_option (int c, const char *arg) { struct aarch64_option_table *opt; struct aarch64_long_option_table *lopt;