diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-aarch64.c | 16 | ||||
| -rw-r--r-- | include/opcode/ChangeLog | 5 | ||||
| -rw-r--r-- | include/opcode/aarch64.h | 2 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/aarch64-dis.c | 4 | ||||
| -rw-r--r-- | opcodes/aarch64-opc.c | 2 |
7 files changed, 28 insertions, 12 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 14b1647..1d08101 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2015-10-07 Yao Qi <yao.qi@linaro.org> + + * config/tc-aarch64.c (md_begin): Access field 'name' rather + than 'template'. + 2015-10-07 Claudiu Zissulescu <claziss@synopsys.com> * config/tc-arc.c: Revamped file for ARC support. diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index a0cf976..81b8e2d 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -7511,24 +7511,24 @@ md_begin (void) aarch64_pstatefields[i].name, (void *) (aarch64_pstatefields + i)); - for (i = 0; aarch64_sys_regs_ic[i].template != NULL; i++) + for (i = 0; aarch64_sys_regs_ic[i].name != NULL; i++) checked_hash_insert (aarch64_sys_regs_ic_hsh, - aarch64_sys_regs_ic[i].template, + aarch64_sys_regs_ic[i].name, (void *) (aarch64_sys_regs_ic + i)); - for (i = 0; aarch64_sys_regs_dc[i].template != NULL; i++) + for (i = 0; aarch64_sys_regs_dc[i].name != NULL; i++) checked_hash_insert (aarch64_sys_regs_dc_hsh, - aarch64_sys_regs_dc[i].template, + aarch64_sys_regs_dc[i].name, (void *) (aarch64_sys_regs_dc + i)); - for (i = 0; aarch64_sys_regs_at[i].template != NULL; i++) + for (i = 0; aarch64_sys_regs_at[i].name != NULL; i++) checked_hash_insert (aarch64_sys_regs_at_hsh, - aarch64_sys_regs_at[i].template, + aarch64_sys_regs_at[i].name, (void *) (aarch64_sys_regs_at + i)); - for (i = 0; aarch64_sys_regs_tlbi[i].template != NULL; i++) + for (i = 0; aarch64_sys_regs_tlbi[i].name != NULL; i++) checked_hash_insert (aarch64_sys_regs_tlbi_hsh, - aarch64_sys_regs_tlbi[i].template, + aarch64_sys_regs_tlbi[i].name, (void *) (aarch64_sys_regs_tlbi + i)); for (i = 0; i < ARRAY_SIZE (reg_names); i++) diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 67b4e41..ea833f7 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,5 +1,10 @@ 2015-10-07 Yao Qi <yao.qi@linaro.org> + * aarch64.h (aarch64_sys_ins_reg) <template>: Removed. + <name>: New field. + +2015-10-07 Yao Qi <yao.qi@linaro.org> + * aarch64.h [__cplusplus]: Wrap in extern "C". 2015-10-07 Claudiu Zissulescu <claziss@synopsys.com> diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h index a8b1f89..c423858 100644 --- a/include/opcode/aarch64.h +++ b/include/opcode/aarch64.h @@ -652,7 +652,7 @@ extern bfd_boolean aarch64_pstatefield_supported_p (const aarch64_feature_set, typedef struct { - const char *template; + const char *name; uint32_t value; int has_xt; } aarch64_sys_ins_reg; diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index c9c576f..1effd13 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2015-10-07 Yao Qi <yao.qi@linaro.org> + + * aarch64-dis.c (aarch64_ext_sysins_op): Access field + 'name' rather than 'template'. + * aarch64-opc.c (aarch64_print_operand): Likewise. + 2015-10-07 Claudiu Zissulescu <claziss@synopsys.com> * arc-dis.c: Revamped file for ARC support diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c index fe3caac..9b96cff 100644 --- a/opcodes/aarch64-dis.c +++ b/opcodes/aarch64-dis.c @@ -1027,12 +1027,12 @@ aarch64_ext_sysins_op (const aarch64_operand *self ATTRIBUTE_UNUSED, default: assert (0); return 0; } - for (i = 0; sysins_ops[i].template != NULL; ++i) + for (i = 0; sysins_ops[i].name != NULL; ++i) if (sysins_ops[i].value == value) { info->sysins_op = sysins_ops + i; DEBUG_TRACE ("%s found value: %x, has_xt: %d, i: %d.", - info->sysins_op->template, + info->sysins_op->name, (unsigned)info->sysins_op->value, info->sysins_op->has_xt, i); return 1; diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index 9880142..c6ab4b2 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -2667,7 +2667,7 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc, case AARCH64_OPND_SYSREG_DC: case AARCH64_OPND_SYSREG_IC: case AARCH64_OPND_SYSREG_TLBI: - snprintf (buf, size, "%s", opnd->sysins_op->template); + snprintf (buf, size, "%s", opnd->sysins_op->name); break; case AARCH64_OPND_BARRIER: |