darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ARC] Rename "class" named attributes.

Browse source 
gas/
2016-05-23  Cupertino Miranda  <cmiranda@synopsys.com>

	* config/tc-arc.c (attributes_t): Renamed attribute class to
	attr_class.
	(find_opcode_match, assemble_insn, tokenize_extinsn): Changed.

opcode/
2016-05-23  Cupertino Miranda  <cmiranda@synopsys.com>

	* arc-dis.c (find_format, find_format, get_auxreg)
	(print_insn_arc): Changed.
	* arc-ext.h (INSERT_XOP): Likewise.

include/
2016-05-23  Cupertino Miranda  <cmiranda@synopsys.com>

	* opcode/arc.h (struct arc_opcode): Renamed attribute class to
	insn_class.
	(struct arc_flag_class): Renamed attribute class to flag_class.
This commit is contained in:
Claudiu Zissulescu 2016-05-23 17:25:46 +02:00
parent ffd19d610b
commit c810e0b87a
7 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gas/ChangeLog
View file

@ -1,3 +1,9 @@
2016-05-23 Cupertino Miranda <cmiranda@synopsys.com>
* config/tc-arc.c (attributes_t): Renamed attribute class to
attr_class.
(find_opcode_match, assemble_insn, tokenize_extinsn): Changed.
2016-05-23 Kuba Sejdak <jakub.sejdak@phoesys.com> 2016-05-23 Kuba Sejdak <jakub.sejdak@phoesys.com>
* configuse.tgt: Add entry for arm-phoenix. * configuse.tgt: Add entry for arm-phoenix.

24
gas/config/tc-arc.c
View file

@ -98,8 +98,8 @@ enum arc_rlx_types
#define is_spfp_p(op) (((sc) == SPX)) #define is_spfp_p(op) (((sc) == SPX))
#define is_dpfp_p(op) (((sc) == DPX)) #define is_dpfp_p(op) (((sc) == DPX))
#define is_fpuda_p(op) (((sc) == DPA)) #define is_fpuda_p(op) (((sc) == DPA))
#define is_br_jmp_insn_p(op) (((op)->class == BRANCH || (op)->class == JUMP)) #define is_br_jmp_insn_p(op) (((op)->insn_class == BRANCH || (op)->insn_class == JUMP))
#define is_kernel_insn_p(op) (((op)->class == KERNEL)) #define is_kernel_insn_p(op) (((op)->insn_class == KERNEL))
/* Generic assembler global variables which must be defined by all /* Generic assembler global variables which must be defined by all
targets. */ targets. */
@ -323,7 +323,7 @@ typedef struct
{ {
const char *name; const char *name;
int len; int len;
int class; int attr_class;
} attributes_t; } attributes_t;
static const attributes_t suffixclass[] = static const attributes_t suffixclass[] =
@ -1692,7 +1692,7 @@ find_opcode_match (const struct arc_opcode_hash_entry *entry,
const char *p; const char *p;
const struct arc_aux_reg *auxr; const struct arc_aux_reg *auxr;
if (opcode->class != AUXREG) if (opcode->insn_class != AUXREG)
goto de_fault; goto de_fault;
p = S_GET_NAME (tok[tokidx].X_add_symbol); p = S_GET_NAME (tok[tokidx].X_add_symbol);
@ -1846,7 +1846,7 @@ find_opcode_match (const struct arc_opcode_hash_entry *entry,
/* Check for extension conditional codes. */ /* Check for extension conditional codes. */
if (ext_condcode.arc_ext_condcode if (ext_condcode.arc_ext_condcode
&& cl_flags->class & F_CLASS_EXTEND) && cl_flags->flag_class & F_CLASS_EXTEND)
{ {
struct arc_flag_operand *pf = ext_condcode.arc_ext_condcode; struct arc_flag_operand *pf = ext_condcode.arc_ext_condcode;
while (pf->name) while (pf->name)
@ -1890,9 +1890,9 @@ find_opcode_match (const struct arc_opcode_hash_entry *entry,
} }
} }
if ((cl_flags->class & F_CLASS_REQUIRED) && cl_matches == 0) if ((cl_flags->flag_class & F_CLASS_REQUIRED) && cl_matches == 0)
goto match_failed; goto match_failed;
if ((cl_flags->class & F_CLASS_OPTIONAL) && cl_matches > 1) if ((cl_flags->flag_class & F_CLASS_OPTIONAL) && cl_matches > 1)
goto match_failed; goto match_failed;
} }
/* Did I check all the parsed flags? */ /* Did I check all the parsed flags? */
@ -3614,7 +3614,7 @@ assemble_insn (const struct arc_opcode *opcode,
switch (t->X_md) switch (t->X_md)
{ {
case O_plt: case O_plt:
if (opcode->class == JUMP) if (opcode->insn_class == JUMP)
as_bad_where (frag_now->fr_file, frag_now->fr_line, as_bad_where (frag_now->fr_file, frag_now->fr_line,
_("Unable to use @plt relocatio for insn %s"), _("Unable to use @plt relocatio for insn %s"),
opcode->name); opcode->name);
@ -3631,7 +3631,7 @@ assemble_insn (const struct arc_opcode *opcode,
break; break;
case O_pcl: case O_pcl:
reloc = ARC_RELOC_TABLE (t->X_md)->reloc; reloc = ARC_RELOC_TABLE (t->X_md)->reloc;
if (ARC_SHORT (opcode->mask) || opcode->class == JUMP) if (ARC_SHORT (opcode->mask) || opcode->insn_class == JUMP)
as_bad_where (frag_now->fr_file, frag_now->fr_line, as_bad_where (frag_now->fr_file, frag_now->fr_line,
_("Unable to use @pcl relocation for insn %s"), _("Unable to use @pcl relocation for insn %s"),
opcode->name); opcode->name);
@ -4063,7 +4063,7 @@ tokenize_extinsn (extInstruction_t *einsn)
if (!strncmp (suffixclass[i].name, input_line_pointer, if (!strncmp (suffixclass[i].name, input_line_pointer,
suffixclass[i].len)) suffixclass[i].len))
{ {
suffix_class |= suffixclass[i].class; suffix_class |= suffixclass[i].attr_class;
input_line_pointer += suffixclass[i].len; input_line_pointer += suffixclass[i].len;
break; break;
} }
@ -4103,7 +4103,7 @@ tokenize_extinsn (extInstruction_t *einsn)
input_line_pointer, input_line_pointer,
syntaxclassmod[i].len)) syntaxclassmod[i].len))
{ {
syntax_class_modifiers |= syntaxclassmod[i].class; syntax_class_modifiers |= syntaxclassmod[i].attr_class;
input_line_pointer += syntaxclassmod[i].len; input_line_pointer += syntaxclassmod[i].len;
break; break;
} }
@ -4117,7 +4117,7 @@ tokenize_extinsn (extInstruction_t *einsn)
input_line_pointer, input_line_pointer,
syntaxclass[i].len)) syntaxclass[i].len))
{ {
syntax_class |= syntaxclass[i].class; syntax_class |= syntaxclass[i].attr_class;
input_line_pointer += syntaxclass[i].len; input_line_pointer += syntaxclass[i].len;
break; break;
} }

6
include/ChangeLog
View file

@ -1,3 +1,9 @@
2016-05-23 Cupertino Miranda <cmiranda@synopsys.com>
* opcode/arc.h (struct arc_opcode): Renamed attribute class to
insn_class.
(struct arc_flag_class): Renamed attribute class to flag_class.
2016-05-23 Trevor Saunders <tbsaunde+binutils@tbsaunde.org> 2016-05-23 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* opcode/tic54x.h (struct symbol_): typedef to tic54x_symbol instead of * opcode/tic54x.h (struct symbol_): typedef to tic54x_symbol instead of

4
include/opcode/arc.h
View file

@ -116,7 +116,7 @@ struct arc_opcode
unsigned cpu; unsigned cpu;
/* The instruction class. This is used by gdb. */ /* The instruction class. This is used by gdb. */
insn_class_t class; insn_class_t insn_class;
/* The instruction subclass. */ /* The instruction subclass. */
insn_subclass_t subclass; insn_subclass_t subclass;
@ -335,7 +335,7 @@ extern const unsigned arc_num_flag_operands;
struct arc_flag_class struct arc_flag_class
{ {
/* Flag class. */ /* Flag class. */
flag_class_t class; flag_class_t flag_class;
/* List of valid flags (codes). */ /* List of valid flags (codes). */
unsigned flags[256]; unsigned flags[256];

6
opcodes/ChangeLog
View file

@ -1,3 +1,9 @@
2016-05-23 Cupertino Miranda <cmiranda@synopsys.com>
* arc-dis.c (find_format, find_format, get_auxreg)
(print_insn_arc): Changed.
* arc-ext.h (INSERT_XOP): Likewise.
2016-05-23 Trevor Saunders <tbsaunde+binutils@tbsaunde.org> 2016-05-23 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* tic54x-dis.c (sprint_mmr): Adjust. * tic54x-dis.c (sprint_mmr): Adjust.

8
opcodes/arc-dis.c
View file

@ -175,7 +175,7 @@ find_format (const struct arc_opcode *arc_table,
unsigned int value; unsigned int value;
/* Check first the extensions. */ /* Check first the extensions. */
if (cl_flags->class & F_CLASS_EXTEND) if (cl_flags->flag_class & F_CLASS_EXTEND)
{ {
value = (insn[0] & 0x1F); value = (insn[0] & 0x1F);
if (arcExtMap_condCodeName (value)) if (arcExtMap_condCodeName (value))
@ -226,7 +226,7 @@ print_flags (const struct arc_opcode *opcode,
const unsigned *flgopridx; const unsigned *flgopridx;
/* Check first the extensions. */ /* Check first the extensions. */
if (cl_flags->class & F_CLASS_EXTEND) if (cl_flags->flag_class & F_CLASS_EXTEND)
{ {
const char *name; const char *name;
value = (insn[0] & 0x1F); value = (insn[0] & 0x1F);
@ -289,7 +289,7 @@ get_auxreg (const struct arc_opcode *opcode,
unsigned int i; unsigned int i;
const struct arc_aux_reg *auxr = &arc_aux_regs[0]; const struct arc_aux_reg *auxr = &arc_aux_regs[0];
if (opcode->class != AUXREG) if (opcode->insn_class != AUXREG)
return NULL; return NULL;
name = arcExtMap_auxRegName (value); name = arcExtMap_auxRegName (value);
@ -527,7 +527,7 @@ print_insn_arc (bfd_vma memaddr,
(*info->fprintf_func) (info->stream, "%s", opcode->name); (*info->fprintf_func) (info->stream, "%s", opcode->name);
/* Preselect the insn class. */ /* Preselect the insn class. */
switch (opcode->class) switch (opcode->insn_class)
{ {
case BRANCH: case BRANCH:
case JUMP: case JUMP:

2
opcodes/arc-ext.h
View file

@ -80,7 +80,7 @@ enum ExtReadWrite
(OP)->opcode = CODE; \ (OP)->opcode = CODE; \
(OP)->mask = MASK; \ (OP)->mask = MASK; \
(OP)->cpu = CPU; \ (OP)->cpu = CPU; \
(OP)->class = ARITH; \ (OP)->insn_class = ARITH; \
(OP)->subclass = NONE; \ (OP)->subclass = NONE; \
memcpy ((OP)->operands, (ARG), MAX_INSN_ARGS); \ memcpy ((OP)->operands, (ARG), MAX_INSN_ARGS); \
memcpy ((OP)->flags, (FLG), MAX_INSN_FLGS); \ memcpy ((OP)->flags, (FLG), MAX_INSN_FLGS); \