projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix generation of relocs for 32-bit Sparc Solaris targets.
[deliverable/binutils-gdb.git]
/
gas
/
config
/
tc-ppc.c
diff --git
a/gas/config/tc-ppc.c
b/gas/config/tc-ppc.c
index 3f6de73d1b801d3d4cc4952e153b411f083057e6..fc2a0458288d5228ad0598cd3e6ae7b8e1826293 100644
(file)
--- a/
gas/config/tc-ppc.c
+++ b/
gas/config/tc-ppc.c
@@
-1,5
+1,5
@@
/* tc-ppc.c -- Assemble for the PowerPC or POWER (RS/6000)
/* tc-ppc.c -- Assemble for the PowerPC or POWER (RS/6000)
- Copyright (C) 1994-201
5
Free Software Foundation, Inc.
+ Copyright (C) 1994-201
6
Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of GAS, the GNU Assembler.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of GAS, the GNU Assembler.
@@
-206,11
+206,13
@@
ppc_cpu_t sticky = 0;
/* Value for ELF e_flags EF_PPC64_ABI. */
unsigned int ppc_abiversion = 0;
/* Value for ELF e_flags EF_PPC64_ABI. */
unsigned int ppc_abiversion = 0;
+#ifdef OBJ_ELF
/* Flags set on encountering toc relocs. */
/* Flags set on encountering toc relocs. */
-enum {
+
static
enum {
has_large_toc_reloc = 1,
has_small_toc_reloc = 2
} toc_reloc_types;
has_large_toc_reloc = 1,
has_small_toc_reloc = 2
} toc_reloc_types;
+#endif
/* Warn on emitting data to code sections. */
int warn_476;
/* Warn on emitting data to code sections. */
int warn_476;
@@
-302,7
+304,7
@@
const pseudo_typeS md_pseudo_table[] =
/* Structure to hold information about predefined registers. */
struct pd_reg
{
/* Structure to hold information about predefined registers. */
struct pd_reg
{
- char *name;
+ c
onst c
har *name;
int value;
};
int value;
};
@@
-860,7
+862,7
@@
register_name (expressionS *expressionP)
else if (!reg_names_p || !ISALPHA (name[0]))
return FALSE;
else if (!reg_names_p || !ISALPHA (name[0]))
return FALSE;
- c = get_symbol_
end (
);
+ c = get_symbol_
name (&name
);
reg_number = reg_name_search (pre_defined_registers, REG_NAME_CNT, name);
/* Put back the delimiting char. */
reg_number = reg_name_search (pre_defined_registers, REG_NAME_CNT, name);
/* Put back the delimiting char. */
@@
-1046,18
+1048,6
@@
static segT ppc_current_section;
#ifdef OBJ_ELF
symbolS *GOT_symbol; /* Pre-defined "_GLOBAL_OFFSET_TABLE" */
#ifdef OBJ_ELF
symbolS *GOT_symbol; /* Pre-defined "_GLOBAL_OFFSET_TABLE" */
-#define PPC_APUINFO_ISEL 0x40
-#define PPC_APUINFO_PMR 0x41
-#define PPC_APUINFO_RFMCI 0x42
-#define PPC_APUINFO_CACHELCK 0x43
-#define PPC_APUINFO_SPE 0x100
-#define PPC_APUINFO_EFS 0x101
-#define PPC_APUINFO_BRLOCK 0x102
-#define PPC_APUINFO_VLE 0x104
-
-/*
- * We keep a list of APUinfo
- */
unsigned long *ppc_apuinfo_list;
unsigned int ppc_apuinfo_num;
unsigned int ppc_apuinfo_num_alloc;
unsigned long *ppc_apuinfo_list;
unsigned int ppc_apuinfo_num;
unsigned int ppc_apuinfo_num_alloc;
@@
-1078,7
+1068,7
@@
const struct option md_longopts[] = {
const size_t md_longopts_size = sizeof (md_longopts);
int
const size_t md_longopts_size = sizeof (md_longopts);
int
-md_parse_option (int c, char *arg)
+md_parse_option (int c, c
onst c
har *arg)
{
ppc_cpu_t new_cpu;
{
ppc_cpu_t new_cpu;
@@
-1281,7
+1271,8
@@
PowerPC options:\n\
-m476 generate code for PowerPC 476\n\
-m7400, -m7410, -m7450, -m7455\n\
generate code for PowerPC 7400/7410/7450/7455\n\
-m476 generate code for PowerPC 476\n\
-m7400, -m7410, -m7450, -m7455\n\
generate code for PowerPC 7400/7410/7450/7455\n\
--m750cl generate code for PowerPC 750cl\n"));
+-m750cl generate code for PowerPC 750cl\n\
+-m821, -m850, -m860 generate code for PowerPC 821/850/860\n"));
fprintf (stream, _("\
-mppc64, -m620 generate code for PowerPC 620/625/630\n\
-mppc64bridge generate code for PowerPC 64, including bridge insns\n\
fprintf (stream, _("\
-mppc64, -m620 generate code for PowerPC 620/625/630\n\
-mppc64bridge generate code for PowerPC 64, including bridge insns\n\
@@
-1293,6
+1284,7
@@
PowerPC options:\n\
-mpower6, -mpwr6 generate code for Power6 architecture\n\
-mpower7, -mpwr7 generate code for Power7 architecture\n\
-mpower8, -mpwr8 generate code for Power8 architecture\n\
-mpower6, -mpwr6 generate code for Power6 architecture\n\
-mpower7, -mpwr7 generate code for Power7 architecture\n\
-mpower8, -mpwr8 generate code for Power8 architecture\n\
+-mpower9, -mpwr9 generate code for Power9 architecture\n\
-mcell generate code for Cell Broadband Engine architecture\n\
-mcom generate code Power/PowerPC common instructions\n\
-many generate code for any architecture (PWR/PWRX/PPC)\n"));
-mcell generate code for Cell Broadband Engine architecture\n\
-mcom generate code Power/PowerPC common instructions\n\
-many generate code for any architecture (PWR/PWRX/PPC)\n"));
@@
-1400,7
+1392,7
@@
ppc_mach (void)
return bfd_mach_ppc;
}
return bfd_mach_ppc;
}
-extern char*
+extern c
onst c
har*
ppc_target_format (void)
{
#ifdef OBJ_COFF
ppc_target_format (void)
{
#ifdef OBJ_COFF
@@
-1456,7
+1448,7
@@
insn_validate (const struct powerpc_opcode *op)
else
{
const struct powerpc_operand *operand = &powerpc_operands[*o];
else
{
const struct powerpc_operand *operand = &powerpc_operands[*o];
- if (operand->shift != PPC_OPSHIFT_INV)
+ if (operand->shift !=
(int)
PPC_OPSHIFT_INV)
{
unsigned long mask;
{
unsigned long mask;
@@
-1559,6
+1551,18
@@
ppc_setup_opcodes (void)
bad_insn = TRUE;
}
}
bad_insn = TRUE;
}
}
+ if ((op->flags & PPC_OPCODE_VLE) != 0)
+ {
+ as_bad (_("%s is enabled by vle flag"), op->name);
+ bad_insn = TRUE;
+ }
+ if (PPC_OP (op->opcode) != 4
+ && PPC_OP (op->opcode) != 31
+ && (op->deprecated & PPC_OPCODE_VLE) == 0)
+ {
+ as_bad (_("%s not disabled by vle flag"), op->name);
+ bad_insn = TRUE;
+ }
bad_insn |= insn_validate (op);
}
bad_insn |= insn_validate (op);
}
@@
-1630,10
+1634,6
@@
ppc_setup_opcodes (void)
}
}
}
}
- if ((ppc_cpu & PPC_OPCODE_VLE) != 0)
- for (op = vle_opcodes; op < op_end; op++)
- hash_insert (ppc_hash, op->name, (void *) op);
-
/* Insert the macros into a hash table. */
ppc_macro_hash = hash_new ();
/* Insert the macros into a hash table. */
ppc_macro_hash = hash_new ();
@@
-1732,7
+1732,7
@@
ppc_cleanup (void)
unsigned int i;
/* Create the .PPC.EMB.apuinfo section. */
unsigned int i;
/* Create the .PPC.EMB.apuinfo section. */
- apuinfo_secp = subseg_new (
".PPC.EMB.apuinfo"
, 0);
+ apuinfo_secp = subseg_new (
APUINFO_SECTION_NAME
, 0);
bfd_set_section_flags (stdoutput,
apuinfo_secp,
SEC_HAS_CONTENTS | SEC_READONLY);
bfd_set_section_flags (stdoutput,
apuinfo_secp,
SEC_HAS_CONTENTS | SEC_READONLY);
@@
-1747,7
+1747,7
@@
ppc_cleanup (void)
md_number_to_chars (p, (valueT) 2, 4);
p = frag_more (8);
md_number_to_chars (p, (valueT) 2, 4);
p = frag_more (8);
- strcpy (p,
"APUinfo"
);
+ strcpy (p,
APUINFO_LABEL
);
for (i = 0; i < ppc_apuinfo_num; i++)
{
for (i = 0; i < ppc_apuinfo_num; i++)
{
@@
-1772,7
+1772,7
@@
ppc_insert_operand (unsigned long insn,
const struct powerpc_operand *operand,
offsetT val,
ppc_cpu_t cpu,
const struct powerpc_operand *operand,
offsetT val,
ppc_cpu_t cpu,
- char *file,
+ c
onst c
har *file,
unsigned int line)
{
long min, max, right;
unsigned int line)
{
long min, max, right;
@@
-1783,17
+1783,15
@@
ppc_insert_operand (unsigned long insn,
if ((operand->flags & PPC_OPERAND_SIGNOPT) != 0)
{
if ((operand->flags & PPC_OPERAND_SIGNOPT) != 0)
{
- /* Extend the allowed range for addis to [-
65536
, 65535].
- Similarly for
some VLE high part insns. For 64-bit
it
- would be good to disable this for signed fields since the
+ /* Extend the allowed range for addis to [-
32768
, 65535].
+ Similarly for
cmpli and some VLE high part insns. For 64-b
it
+
it
would be good to disable this for signed fields since the
value is sign extended into the high 32 bits of the register.
If the value is, say, an address, then we might care about
the high bits. However, gcc as of 2014-06 uses unsigned
values when loading the high part of 64-bit constants using
value is sign extended into the high 32 bits of the register.
If the value is, say, an address, then we might care about
the high bits. However, gcc as of 2014-06 uses unsigned
values when loading the high part of 64-bit constants using
- lis.
- Use the same extended range for cmpli, to allow at least
- [-32768, 65535]. */
- min = ~max & -right;
+ lis. */
+ min = ~(max >> 1) & -right;
}
else if ((operand->flags & PPC_OPERAND_SIGNED) != 0)
{
}
else if ((operand->flags & PPC_OPERAND_SIGNED) != 0)
{
@@
-1862,7
+1860,7
@@
static bfd_reloc_code_real_type
ppc_elf_suffix (char **str_p, expressionS *exp_p)
{
struct map_bfd {
ppc_elf_suffix (char **str_p, expressionS *exp_p)
{
struct map_bfd {
- char *string;
+ c
onst c
har *string;
unsigned int length : 8;
unsigned int valid32 : 1;
unsigned int valid64 : 1;
unsigned int length : 8;
unsigned int valid32 : 1;
unsigned int valid64 : 1;
@@
-2141,13
+2139,12
@@
ppc_elf_lcomm (int xxx ATTRIBUTE_UNUSED)
char *pfrag;
int align2;
char *pfrag;
int align2;
- name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&name);
- /*
j
ust after name is now '\0'. */
+ /*
J
ust after name is now '\0'. */
p = input_line_pointer;
*p = c;
p = input_line_pointer;
*p = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
if (*input_line_pointer != ',')
{
as_bad (_("expected comma after symbol-name: rest of line ignored."));
if (*input_line_pointer != ',')
{
as_bad (_("expected comma after symbol-name: rest of line ignored."));
@@
-2237,8
+2234,8
@@
ppc_elf_lcomm (int xxx ATTRIBUTE_UNUSED)
static void
ppc_elf_localentry (int ignore ATTRIBUTE_UNUSED)
{
static void
ppc_elf_localentry (int ignore ATTRIBUTE_UNUSED)
{
- char *name
= input_line_pointer
;
- char c = get_symbol_
end (
);
+ char *name;
+ char c = get_symbol_
name (&name
);
char *p;
expressionS exp;
symbolS *sym;
char *p;
expressionS exp;
symbolS *sym;
@@
-2247,7
+2244,7
@@
ppc_elf_localentry (int ignore ATTRIBUTE_UNUSED)
p = input_line_pointer;
*p = c;
p = input_line_pointer;
*p = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
if (*input_line_pointer != ',')
{
*p = 0;
if (*input_line_pointer != ',')
{
*p = 0;
@@
-2389,7
+2386,6
@@
ppc_frob_file_before_adjust (void)
const char *name;
char *dotname;
symbolS *dotsym;
const char *name;
char *dotname;
symbolS *dotsym;
- size_t len;
name = S_GET_NAME (symp);
if (name[0] == '.')
name = S_GET_NAME (symp);
if (name[0] == '.')
@@
-2399,10
+2395,7
@@
ppc_frob_file_before_adjust (void)
|| S_IS_DEFINED (symp))
continue;
|| S_IS_DEFINED (symp))
continue;
- len = strlen (name) + 1;
- dotname = xmalloc (len + 1);
- dotname[0] = '.';
- memcpy (dotname + 1, name, len);
+ dotname = concat (".", name, (char *) NULL);
dotsym = symbol_find_noref (dotname, 1);
free (dotname);
if (dotsym != NULL && (symbol_used_p (dotsym)
dotsym = symbol_find_noref (dotname, 1);
free (dotname);
if (dotsym != NULL && (symbol_used_p (dotsym)
@@
-2490,8
+2483,7
@@
parse_toc_entry (enum toc_size_qualifier *toc_kind)
SKIP_WHITESPACE ();
/* Find the spelling of the operand. */
SKIP_WHITESPACE ();
/* Find the spelling of the operand. */
- toc_spec = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&toc_spec);
if (strcmp (toc_spec, "toc") == 0)
{
if (strcmp (toc_spec, "toc") == 0)
{
@@
-2520,7
+2512,7
@@
parse_toc_entry (enum toc_size_qualifier *toc_kind)
/* Now find the ']'. */
*input_line_pointer = c;
/* Now find the ']'. */
*input_line_pointer = c;
- SKIP_WHITESPACE (); /* leading whitespace could be there. */
+ SKIP_WHITESPACE
_AFTER_NAME
(); /* leading whitespace could be there. */
c = *input_line_pointer++; /* input_line_pointer->past char in c. */
if (c != ']')
c = *input_line_pointer++; /* input_line_pointer->past char in c. */
if (c != ']')
@@
-2573,14
+2565,13
@@
ppc_apuinfo_section_add (unsigned int apu, unsigned int version)
if (ppc_apuinfo_num_alloc == 0)
{
ppc_apuinfo_num_alloc = 4;
if (ppc_apuinfo_num_alloc == 0)
{
ppc_apuinfo_num_alloc = 4;
- ppc_apuinfo_list = (unsigned long *)
- xmalloc (sizeof (unsigned long) * ppc_apuinfo_num_alloc);
+ ppc_apuinfo_list = XNEWVEC (unsigned long, ppc_apuinfo_num_alloc);
}
else
{
ppc_apuinfo_num_alloc += 4;
}
else
{
ppc_apuinfo_num_alloc += 4;
- ppc_apuinfo_list =
(unsigned long *) xrealloc (
ppc_apuinfo_list,
-
sizeof (unsigned long) *
ppc_apuinfo_num_alloc);
+ ppc_apuinfo_list =
XRESIZEVEC (unsigned long,
ppc_apuinfo_list,
+
ppc_apuinfo_num_alloc);
}
}
ppc_apuinfo_list[ppc_apuinfo_num++] = APUID (apu, version);
}
}
ppc_apuinfo_list[ppc_apuinfo_num++] = APUID (apu, version);
@@
-2752,12
+2743,18
@@
md_assemble (char *str)
if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0
&& skip_optional)
{
if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0
&& skip_optional)
{
+ long val = ppc_optional_operand_value (operand);
if (operand->insert)
{
if (operand->insert)
{
- insn = (*operand->insert) (insn,
0L
, ppc_cpu, &errmsg);
+ insn = (*operand->insert) (insn,
val
, ppc_cpu, &errmsg);
if (errmsg != (const char *) NULL)
as_bad ("%s", errmsg);
}
if (errmsg != (const char *) NULL)
as_bad ("%s", errmsg);
}
+ else if (operand->shift >= 0)
+ insn |= ((long) val & operand->bitm) << operand->shift;
+ else
+ insn |= ((long) val & operand->bitm) >> -operand->shift;
+
if ((operand->flags & PPC_OPERAND_NEXT) != 0)
next_opindex = *opindex_ptr + 1;
continue;
if ((operand->flags & PPC_OPERAND_NEXT) != 0)
next_opindex = *opindex_ptr + 1;
continue;
@@
-3080,11
+3077,16
@@
md_assemble (char *str)
break;
}
break;
}
+ /* addpcis. */
+ if (opcode->opcode == (19 << 26) + (2 << 1)
+ && reloc == BFD_RELOC_HI16_S)
+ reloc = BFD_RELOC_PPC_REL16DX_HA;
+
/* If VLE-mode convert LO/HI/HA relocations. */
if (opcode->flags & PPC_OPCODE_VLE)
{
int tmp_insn = insn & opcode->mask;
/* If VLE-mode convert LO/HI/HA relocations. */
if (opcode->flags & PPC_OPCODE_VLE)
{
int tmp_insn = insn & opcode->mask;
-
+
int use_d_reloc = (tmp_insn == E_OR2I_INSN
|| tmp_insn == E_AND2I_DOT_INSN
|| tmp_insn == E_OR2IS_INSN
int use_d_reloc = (tmp_insn == E_OR2I_INSN
|| tmp_insn == E_AND2I_DOT_INSN
|| tmp_insn == E_OR2IS_INSN
@@
-3122,7
+3124,7
@@
md_assemble (char *str)
else if (use_a_reloc)
reloc = BFD_RELOC_PPC_VLE_HI16A;
break;
else if (use_a_reloc)
reloc = BFD_RELOC_PPC_VLE_HI16A;
break;
-
+
case BFD_RELOC_HI16_S:
if (use_d_reloc)
reloc = BFD_RELOC_PPC_VLE_HA16D;
case BFD_RELOC_HI16_S:
if (use_d_reloc)
reloc = BFD_RELOC_PPC_VLE_HA16D;
@@
-3512,7
+3514,7
@@
ppc_macro (char *str, const struct powerpc_macro *macro)
}
/* Put the string together. */
}
/* Put the string together. */
- complete = s =
(char *) alloca (
len + 1);
+ complete = s =
XNEWVEC (char,
len + 1);
format = macro->format;
while (*format != '\0')
{
format = macro->format;
while (*format != '\0')
{
@@
-3530,6
+3532,7
@@
ppc_macro (char *str, const struct powerpc_macro *macro)
/* Assemble the constructed instruction. */
md_assemble (complete);
/* Assemble the constructed instruction. */
md_assemble (complete);
+ free (complete);
}
\f
#ifdef OBJ_ELF
}
\f
#ifdef OBJ_ELF
@@
-3623,10
+3626,9
@@
ppc_comm (int lcomm)
symbolS *sym;
char *pfrag;
symbolS *sym;
char *pfrag;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
end_name = input_line_pointer;
end_name = input_line_pointer;
-
*end_name = endc
;
+
(void) restore_line_pointer (endc)
;
if (*input_line_pointer != ',')
{
if (*input_line_pointer != ',')
{
@@
-3677,12
+3679,11
@@
ppc_comm (int lcomm)
}
++input_line_pointer;
}
++input_line_pointer;
- lcomm_name = input_line_pointer;
- lcomm_endc = get_symbol_end ();
+ lcomm_endc = get_symbol_name (&lcomm_name);
lcomm_sym = symbol_find_or_make (lcomm_name);
lcomm_sym = symbol_find_or_make (lcomm_name);
-
*input_line_pointer = lcomm_endc
;
+
(void) restore_line_pointer (lcomm_endc)
;
/* The fourth argument to .lcomm is the alignment. */
if (*input_line_pointer != ',')
/* The fourth argument to .lcomm is the alignment. */
if (*input_line_pointer != ',')
@@
-3785,12
+3786,11
@@
ppc_csect (int ignore ATTRIBUTE_UNUSED)
symbolS *sym;
offsetT align;
symbolS *sym;
offsetT align;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
sym = symbol_find_or_make (name);
sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
if (S_GET_NAME (sym)[0] == '\0')
{
if (S_GET_NAME (sym)[0] == '\0')
{
@@
-3958,15
+3958,14
@@
ppc_dwsect (int ignore ATTRIBUTE_UNUSED)
/* Parse opt-label. */
if (*input_line_pointer == ',')
{
/* Parse opt-label. */
if (*input_line_pointer == ',')
{
- c
onst c
har *label;
+ char *label;
char c;
++input_line_pointer;
char c;
++input_line_pointer;
- label = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&label);
opt_label = symbol_find_or_make (label);
opt_label = symbol_find_or_make (label);
-
*input_line_pointer = c
;
+
(void) restore_line_pointer (c)
;
}
else
opt_label = NULL;
}
else
opt_label = NULL;
@@
-4006,8
+4005,7
@@
ppc_dwsect (int ignore ATTRIBUTE_UNUSED)
else
{
/* Create a new dw subsection. */
else
{
/* Create a new dw subsection. */
- subseg = (struct dw_subsection *)
- xmalloc (sizeof (struct dw_subsection));
+ subseg = XNEW (struct dw_subsection);
if (opt_label == NULL)
{
if (opt_label == NULL)
{
@@
-4096,8
+4094,7
@@
ppc_named_section (int ignore ATTRIBUTE_UNUSED)
char c;
symbolS *sym;
char c;
symbolS *sym;
- user_name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&user_name);
if (strcmp (user_name, ".text") == 0)
real_name = ".text[PR]";
if (strcmp (user_name, ".text") == 0)
real_name = ".text[PR]";
@@
-4106,12
+4103,12
@@
ppc_named_section (int ignore ATTRIBUTE_UNUSED)
else
{
as_bad (_("the XCOFF file format does not support arbitrary sections"));
else
{
as_bad (_("the XCOFF file format does not support arbitrary sections"));
-
*input_line_pointer = c
;
+
(void) restore_line_pointer (c)
;
ignore_rest_of_line ();
return;
}
ignore_rest_of_line ();
return;
}
-
*input_line_pointer = c
;
+
(void) restore_line_pointer (c)
;
sym = symbol_find_or_make (real_name);
sym = symbol_find_or_make (real_name);
@@
-4128,12
+4125,11
@@
ppc_extern (int ignore ATTRIBUTE_UNUSED)
char *name;
char endc;
char *name;
char endc;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
(void) symbol_find_or_make (name);
(void) symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
demand_empty_rest_of_line ();
}
demand_empty_rest_of_line ();
}
@@
-4147,12
+4143,11
@@
ppc_lglobl (int ignore ATTRIBUTE_UNUSED)
char endc;
symbolS *sym;
char endc;
symbolS *sym;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
sym = symbol_find_or_make (name);
sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
symbol_get_tc (sym)->output = 1;
symbol_get_tc (sym)->output = 1;
@@
-4185,14
+4180,13
@@
ppc_ref (int ignore ATTRIBUTE_UNUSED)
do
{
do
{
- name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&name);
fix_at_start (symbol_get_frag (ppc_current_csect), 0,
symbol_find_or_make (name), 0, FALSE, BFD_RELOC_NONE);
*input_line_pointer = c;
fix_at_start (symbol_get_frag (ppc_current_csect), 0,
symbol_find_or_make (name), 0, FALSE, BFD_RELOC_NONE);
*input_line_pointer = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
c = *input_line_pointer;
if (c == ',')
{
c = *input_line_pointer;
if (c == ',')
{
@@
-4222,12
+4216,11
@@
ppc_rename (int ignore ATTRIBUTE_UNUSED)
symbolS *sym;
int len;
symbolS *sym;
int len;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
sym = symbol_find_or_make (name);
sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
if (*input_line_pointer != ',')
{
if (*input_line_pointer != ',')
{
@@
-4386,8
+4379,7
@@
ppc_function (int ignore ATTRIBUTE_UNUSED)
symbolS *ext_sym;
symbolS *lab_sym;
symbolS *ext_sym;
symbolS *lab_sym;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
/* Ignore any [PR] suffix. */
name = ppc_canonicalize_symbol_name (name);
/* Ignore any [PR] suffix. */
name = ppc_canonicalize_symbol_name (name);
@@
-4398,7
+4390,7
@@
ppc_function (int ignore ATTRIBUTE_UNUSED)
ext_sym = symbol_find_or_make (name);
ext_sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
if (*input_line_pointer != ',')
{
if (*input_line_pointer != ',')
{
@@
-4408,12
+4400,11
@@
ppc_function (int ignore ATTRIBUTE_UNUSED)
}
++input_line_pointer;
}
++input_line_pointer;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
lab_sym = symbol_find_or_make (name);
lab_sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
if (ext_sym != lab_sym)
{
if (ext_sym != lab_sym)
{
@@
-4592,12
+4583,11
@@
ppc_bs (int ignore ATTRIBUTE_UNUSED)
if (ppc_current_block != NULL)
as_bad (_("nested .bs blocks"));
if (ppc_current_block != NULL)
as_bad (_("nested .bs blocks"));
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
csect = symbol_find_or_make (name);
csect = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
sym = symbol_make (".bs");
S_SET_SEGMENT (sym, now_seg);
sym = symbol_make (".bs");
S_SET_SEGMENT (sym, now_seg);
@@
-4874,12
+4864,11
@@
ppc_tc (int ignore ATTRIBUTE_UNUSED)
return;
}
return;
}
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
sym = symbol_find_or_make (name);
sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
if (S_IS_DEFINED (sym))
{
if (S_IS_DEFINED (sym))
{
@@
-4945,6
+4934,7
@@
ppc_tc (int ignore ATTRIBUTE_UNUSED)
static void
ppc_machine (int ignore ATTRIBUTE_UNUSED)
{
static void
ppc_machine (int ignore ATTRIBUTE_UNUSED)
{
+ char c;
char *cpu_string;
#define MAX_HISTORY 100
static ppc_cpu_t *cpu_history;
char *cpu_string;
#define MAX_HISTORY 100
static ppc_cpu_t *cpu_history;
@@
-4952,19
+4942,9
@@
ppc_machine (int ignore ATTRIBUTE_UNUSED)
SKIP_WHITESPACE ();
SKIP_WHITESPACE ();
- if (*input_line_pointer == '"')
- {
- int len;
- cpu_string = demand_copy_C_string (&len);
- }
- else
- {
- char c;
- cpu_string = input_line_pointer;
- c = get_symbol_end ();
- cpu_string = xstrdup (cpu_string);
- *input_line_pointer = c;
- }
+ c = get_symbol_name (&cpu_string);
+ cpu_string = xstrdup (cpu_string);
+ (void) restore_line_pointer (c);
if (cpu_string != NULL)
{
if (cpu_string != NULL)
{
@@
-4978,7
+4958,7
@@
ppc_machine (int ignore ATTRIBUTE_UNUSED)
if (strcmp (cpu_string, "push") == 0)
{
if (cpu_history == NULL)
if (strcmp (cpu_string, "push") == 0)
{
if (cpu_history == NULL)
- cpu_history =
xmalloc (MAX_HISTORY * sizeof (*cpu_history)
);
+ cpu_history =
XNEWVEC (ppc_cpu_t, MAX_HISTORY
);
if (curr_hist >= MAX_HISTORY)
as_bad (_(".machine stack overflow"));
if (curr_hist >= MAX_HISTORY)
as_bad (_(".machine stack overflow"));
@@
-5203,17
+5183,15
@@
ppc_znop (int ignore ATTRIBUTE_UNUSED)
char *name;
/* Strip out the symbol name. */
char *name;
/* Strip out the symbol name. */
- symbol_name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&symbol_name);
- name = xmalloc (input_line_pointer - symbol_name + 1);
- strcpy (name, symbol_name);
+ name = xstrdup (symbol_name);
sym = symbol_find_or_make (name);
*input_line_pointer = c;
sym = symbol_find_or_make (name);
*input_line_pointer = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
/* Look up the opcode in the hash table. */
opcode = (const struct powerpc_opcode *) hash_find (ppc_hash, "nop");
/* Look up the opcode in the hash table. */
opcode = (const struct powerpc_opcode *) hash_find (ppc_hash, "nop");
@@
-5249,13
+5227,12
@@
ppc_pe_comm (int lcomm)
symbolS *symbolP;
offsetT align;
symbolS *symbolP;
offsetT align;
- name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (&name);
/* just after name is now '\0'. */
p = input_line_pointer;
*p = c;
/* just after name is now '\0'. */
p = input_line_pointer;
*p = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
if (*input_line_pointer != ',')
{
as_bad (_("expected comma after symbol-name: rest of line ignored."));
if (*input_line_pointer != ',')
{
as_bad (_("expected comma after symbol-name: rest of line ignored."));
@@
-5380,15
+5357,13
@@
ppc_pe_section (int ignore ATTRIBUTE_UNUSED)
segT sec;
int align;
segT sec;
int align;
- section_name = input_line_pointer;
- c = get_symbol_end ();
+ c = get_symbol_name (§ion_name);
- name = xmalloc (input_line_pointer - section_name + 1);
- strcpy (name, section_name);
+ name = xstrdup (section_name);
*input_line_pointer = c;
*input_line_pointer = c;
- SKIP_WHITESPACE ();
+ SKIP_WHITESPACE
_AFTER_NAME
();
exp = 0;
flags = SEC_NO_FLAGS;
exp = 0;
flags = SEC_NO_FLAGS;
@@
-5536,12
+5511,11
@@
ppc_pe_function (int ignore ATTRIBUTE_UNUSED)
char endc;
symbolS *ext_sym;
char endc;
symbolS *ext_sym;
- name = input_line_pointer;
- endc = get_symbol_end ();
+ endc = get_symbol_name (&name);
ext_sym = symbol_find_or_make (name);
ext_sym = symbol_find_or_make (name);
-
*input_line_pointer = endc
;
+
(void) restore_line_pointer (endc)
;
S_SET_DATA_TYPE (ext_sym, DT_FCN << N_BTSHFT);
SF_SET_FUNCTION (ext_sym);
S_SET_DATA_TYPE (ext_sym, DT_FCN << N_BTSHFT);
SF_SET_FUNCTION (ext_sym);
@@
-5782,9
+5756,7
@@
ppc_frob_symbol (symbolS *sym)
char *snew;
len = s - name;
char *snew;
len = s - name;
- snew = xmalloc (len + 1);
- memcpy (snew, name, len);
- snew[len] = '\0';
+ snew = xstrndup (name, len);
S_SET_NAME (sym, snew);
}
S_SET_NAME (sym, snew);
}
@@
-6083,7
+6055,7
@@
ppc_frob_section (asection *sec)
#endif /* OBJ_XCOFF */
\f
#endif /* OBJ_XCOFF */
\f
-char *
+c
onst c
har *
md_atof (int type, char *litp, int *sizep)
{
return ieee_md_atof (type, litp, sizep, target_big_endian);
md_atof (int type, char *litp, int *sizep)
{
return ieee_md_atof (type, litp, sizep, target_big_endian);
@@
-6111,7
+6083,7
@@
md_section_align (asection *seg ATTRIBUTE_UNUSED, valueT addr)
#else
int align = bfd_get_section_alignment (stdoutput, seg);
#else
int align = bfd_get_section_alignment (stdoutput, seg);
- return ((addr + (1 << align) - 1) &
(-
1 << align));
+ return ((addr + (1 << align) - 1) &
-(
1 << align));
#endif
}
#endif
}
@@
-6436,13
+6408,14
@@
ppc_handle_align (struct frag *fragP)
if ((ppc_cpu & PPC_OPCODE_POWER6) != 0
|| (ppc_cpu & PPC_OPCODE_POWER7) != 0
if ((ppc_cpu & PPC_OPCODE_POWER6) != 0
|| (ppc_cpu & PPC_OPCODE_POWER7) != 0
- || (ppc_cpu & PPC_OPCODE_POWER8) != 0)
+ || (ppc_cpu & PPC_OPCODE_POWER8) != 0
+ || (ppc_cpu & PPC_OPCODE_POWER9) != 0)
{
{
- /* For power6, power7
and power8, we want the last nop to be a group
- terminating one. Do this by inserting an rs_fill frag immediately
- after this one, with its address set to the last nop location.
- This will automatically reduce the number of nops in the current
- frag by one. */
+ /* For power6, power7
, power8 and power9, we want the last nop to be
+ a group terminating one. Do this by inserting an rs_fill frag
+ immediately after this one, with its address set to the last nop
+ location. This will automatically reduce the number of nops in
+
the current
frag by one. */
if (count > 4)
{
struct frag *group_nop = xmalloc (SIZEOF_STRUCT_FRAG + 4);
if (count > 4)
{
struct frag *group_nop = xmalloc (SIZEOF_STRUCT_FRAG + 4);
@@
-6457,13
+6430,14
@@
ppc_handle_align (struct frag *fragP)
}
if ((ppc_cpu & PPC_OPCODE_POWER7) != 0
}
if ((ppc_cpu & PPC_OPCODE_POWER7) != 0
- || (ppc_cpu & PPC_OPCODE_POWER8) != 0)
+ || (ppc_cpu & PPC_OPCODE_POWER8) != 0
+ || (ppc_cpu & PPC_OPCODE_POWER9) != 0)
{
if (ppc_cpu & PPC_OPCODE_E500MC)
/* e500mc group terminating nop: "ori 0,0,0". */
md_number_to_chars (dest, 0x60000000, 4);
else
{
if (ppc_cpu & PPC_OPCODE_E500MC)
/* e500mc group terminating nop: "ori 0,0,0". */
md_number_to_chars (dest, 0x60000000, 4);
else
- /* power7/power8 group terminating nop: "ori 2,2,0". */
+ /* power7/power8
/power9
group terminating nop: "ori 2,2,0". */
md_number_to_chars (dest, 0x60420000, 4);
}
else
md_number_to_chars (dest, 0x60420000, 4);
}
else
@@
-6489,6
+6463,9
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
/* Hack around bfd_install_relocation brain damage. */
if (fixP->fx_pcrel)
value += fixP->fx_frag->fr_address + fixP->fx_where;
/* Hack around bfd_install_relocation brain damage. */
if (fixP->fx_pcrel)
value += fixP->fx_frag->fr_address + fixP->fx_where;
+
+ if (fixP->fx_addsy == abs_section_sym)
+ fixP->fx_done = 1;
}
else
fixP->fx_done = 1;
}
else
fixP->fx_done = 1;
@@
-6599,6
+6576,7
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
case BFD_RELOC_HI16_S:
case BFD_RELOC_HI16_S_PCREL:
case BFD_RELOC_HI16_S:
case BFD_RELOC_HI16_S_PCREL:
+ case BFD_RELOC_PPC_REL16DX_HA:
#ifdef OBJ_ELF
if (REPORT_OVERFLOW_HI && ppc_obj64)
{
#ifdef OBJ_ELF
if (REPORT_OVERFLOW_HI && ppc_obj64)
{
@@
-6644,9
+6622,6
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
if (operand != NULL)
{
/* Handle relocs in an insn. */
if (operand != NULL)
{
/* Handle relocs in an insn. */
- char *where;
- unsigned long insn;
-
switch (fixP->fx_r_type)
{
#ifdef OBJ_ELF
switch (fixP->fx_r_type)
{
#ifdef OBJ_ELF
@@
-6807,22
+6782,25
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
#endif
if ((fieldval != 0 && APPLY_RELOC) || operand->insert != NULL)
{
#endif
if ((fieldval != 0 && APPLY_RELOC) || operand->insert != NULL)
{
+ unsigned long insn;
+ unsigned char *where;
+
/* Fetch the instruction, insert the fully resolved operand
value, and stuff the instruction back again. */
/* Fetch the instruction, insert the fully resolved operand
value, and stuff the instruction back again. */
- where = fixP->fx_frag->fr_literal + fixP->fx_where;
+ where =
(unsigned char *)
fixP->fx_frag->fr_literal + fixP->fx_where;
if (target_big_endian)
{
if (fixP->fx_size == 4)
if (target_big_endian)
{
if (fixP->fx_size == 4)
- insn = bfd_getb32 (
(unsigned char *)
where);
+ insn = bfd_getb32 (where);
else
else
- insn = bfd_getb16 (
(unsigned char *)
where);
+ insn = bfd_getb16 (where);
}
else
{
if (fixP->fx_size == 4)
}
else
{
if (fixP->fx_size == 4)
- insn = bfd_getl32 (
(unsigned char *)
where);
+ insn = bfd_getl32 (where);
else
else
- insn = bfd_getl16 (
(unsigned char *)
where);
+ insn = bfd_getl16 (where);
}
insn = ppc_insert_operand (insn, operand, fieldval,
fixP->tc_fix_data.ppc_cpu,
}
insn = ppc_insert_operand (insn, operand, fieldval,
fixP->tc_fix_data.ppc_cpu,
@@
-6830,16
+6808,16
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
if (target_big_endian)
{
if (fixP->fx_size == 4)
if (target_big_endian)
{
if (fixP->fx_size == 4)
- bfd_putb32 (
(bfd_vma) insn, (unsigned char *)
where);
+ bfd_putb32 (
insn,
where);
else
else
- bfd_putb16 (
(bfd_vma) insn, (unsigned char *)
where);
+ bfd_putb16 (
insn,
where);
}
else
{
if (fixP->fx_size == 4)
}
else
{
if (fixP->fx_size == 4)
- bfd_putl32 (
(bfd_vma) insn, (unsigned char *)
where);
+ bfd_putl32 (
insn,
where);
else
else
- bfd_putl16 (
(bfd_vma) insn, (unsigned char *)
where);
+ bfd_putl16 (
insn,
where);
}
}
}
}
@@
-6850,7
+6828,7
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
gas_assert (fixP->fx_addsy != NULL);
if (fixP->fx_r_type == BFD_RELOC_NONE)
{
gas_assert (fixP->fx_addsy != NULL);
if (fixP->fx_r_type == BFD_RELOC_NONE)
{
- char *sfile;
+ c
onst c
har *sfile;
unsigned int sline;
/* Use expr_symbol_where to see if this is an expression
unsigned int sline;
/* Use expr_symbol_where to see if this is an expression
@@
-7058,6
+7036,7
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
case BFD_RELOC_LO16_PCREL:
case BFD_RELOC_HI16_PCREL:
case BFD_RELOC_HI16_S_PCREL:
case BFD_RELOC_LO16_PCREL:
case BFD_RELOC_HI16_PCREL:
case BFD_RELOC_HI16_S_PCREL:
+ case BFD_RELOC_PPC_REL16DX_HA:
case BFD_RELOC_64_PCREL:
case BFD_RELOC_32_PCREL:
case BFD_RELOC_16_PCREL:
case BFD_RELOC_64_PCREL:
case BFD_RELOC_32_PCREL:
case BFD_RELOC_16_PCREL:
@@
-7077,7
+7056,7
@@
md_apply_fix (fixS *fixP, valueT *valP, segT seg)
default:
if (fixP->fx_addsy)
{
default:
if (fixP->fx_addsy)
{
- char *sfile;
+ c
onst c
har *sfile;
unsigned int sline;
/* Use expr_symbol_where to see if this is an
unsigned int sline;
/* Use expr_symbol_where to see if this is an
@@
-7148,9
+7127,9
@@
tc_gen_reloc (asection *seg ATTRIBUTE_UNUSED, fixS *fixp)
{
arelent *reloc;
{
arelent *reloc;
- reloc =
(arelent *) xmalloc (sizeof (arelent)
);
+ reloc =
XNEW (arelent
);
- reloc->sym_ptr_ptr =
(asymbol **) 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;
reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);
*reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
reloc->howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);
@@
-7179,7
+7158,7
@@
tc_ppc_regname_to_dw2regnum (char *regname)
unsigned int i;
const char *p;
char *q;
unsigned int i;
const char *p;
char *q;
- static struct { char *name; int dw2regnum; } regnames[] =
+ static struct { c
onst c
har *name; int dw2regnum; } regnames[] =
{
{ "sp", 1 }, { "r.sp", 1 }, { "rtoc", 2 }, { "r.toc", 2 },
{ "mq", 64 }, { "lr", 65 }, { "ctr", 66 }, { "ap", 67 },
{
{ "sp", 1 }, { "r.sp", 1 }, { "rtoc", 2 }, { "r.toc", 2 },
{ "mq", 64 }, { "lr", 65 }, { "ctr", 66 }, { "ap", 67 },
This page took
0.044855 seconds
and
4
git commands to generate.
projects / deliverable / binutils-gdb.git / blobdiff