espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 00:32:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

ODR warning for "struct instruction_type"

Browse Source 
"struct instruction_type" is defined in multiple .c files, causing an
ODR warning.  This patch renames the types.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=22395
This commit is contained in:
Tom Tromey
2022-05-18 09:45:33 -06:00
parent 94e079e76e
commit cc55e4ef62
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ia64-tdep.c
View File

@ -75,7 +75,7 @@ static gdb::optional<gdb::byte_vector> ktab_buf;
/* An enumeration of the different IA-64 instruction types. */ /* An enumeration of the different IA-64 instruction types. */
enum instruction_type enum ia64_instruction_type
{ {
A, /* Integer ALU ; I-unit or M-unit */ A, /* Integer ALU ; I-unit or M-unit */
I, /* Non-ALU integer; I-unit */ I, /* Non-ALU integer; I-unit */
@ -470,7 +470,7 @@ replace_slotN_contents (gdb_byte *bundle, long long instr, int slotnum)
replace_bit_field (bundle, instr, 5+41*slotnum, 41); replace_bit_field (bundle, instr, 5+41*slotnum, 41);
} }
static const enum instruction_type template_encoding_table[32][3] = static const enum ia64_instruction_type template_encoding_table[32][3] =
{ {
{ M, I, I }, /* 00 */ { M, I, I }, /* 00 */
{ M, I, I }, /* 01 */ { M, I, I }, /* 01 */
@ -510,7 +510,7 @@ static const enum instruction_type template_encoding_table[32][3] =
address of the next instruction to fetch. */ address of the next instruction to fetch. */
static CORE_ADDR static CORE_ADDR
fetch_instruction (CORE_ADDR addr, instruction_type *it, long long *instr) fetch_instruction (CORE_ADDR addr, ia64_instruction_type *it, long long *instr)
{ {
gdb_byte bundle[BUNDLE_LEN]; gdb_byte bundle[BUNDLE_LEN];
int slotnum = (int) (addr & 0x0f) / SLOT_MULTIPLIER; int slotnum = (int) (addr & 0x0f) / SLOT_MULTIPLIER;
@ -1363,7 +1363,7 @@ examine_prologue (CORE_ADDR pc, CORE_ADDR lim_pc,
{ {
CORE_ADDR next_pc; CORE_ADDR next_pc;
CORE_ADDR last_prologue_pc = pc; CORE_ADDR last_prologue_pc = pc;
instruction_type it; ia64_instruction_type it;
long long instr; long long instr;
int cfm_reg = 0; int cfm_reg = 0;
int ret_reg = 0; int ret_reg = 0;

4
gdb/z80-tdep.c
View File

@ -109,7 +109,7 @@ struct z80_unwind_cache
struct trad_frame_saved_reg *saved_regs; struct trad_frame_saved_reg *saved_regs;
}; };
enum instruction_type enum z80_instruction_type
{ {
insn_default, insn_default,
insn_z80, insn_z80,
@ -144,7 +144,7 @@ struct insn_info
gdb_byte code; gdb_byte code;
gdb_byte mask; gdb_byte mask;
gdb_byte size; /* without prefix(es) */ gdb_byte size; /* without prefix(es) */
enum instruction_type type; enum z80_instruction_type type;
}; };
/* Constants */ /* Constants */