diff options
| author |   Alan Modra <amodra@gmail.com> | 2017-10-25 21:59:14 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2017-10-25 22:14:58 +1030 |
| commit | e5d70d6b5a5c2832ad199ac1b91f68324b4a12c9 (patch) | |
| tree | 1d81154693c5ac8086c05b89a519a6ae5807e490 /opcodes/cr16-dis.c | |
| parent | Add common AARCH64 REGNUM defines (diff) | |
| download | binutils-gdb-e5d70d6b5a5c2832ad199ac1b91f68324b4a12c9.tar.gz binutils-gdb-e5d70d6b5a5c2832ad199ac1b91f68324b4a12c9.tar.bz2 binutils-gdb-e5d70d6b5a5c2832ad199ac1b91f68324b4a12c9.zip | |
PR22348, conflicting global vars in crx and cr16
include/
PR 22348
* opcode/cr16.h (instruction): Delete.
(cr16_words, cr16_allWords, cr16_currInsn): Delete.
* opcode/crx.h (crx_cst4_map): Rename from cst4_map.
(crx_cst4_maps): Rename from cst4_maps.
(crx_no_op_insn): Rename from no_op_insn.
(instruction): Delete.
opcodes/
PR 22348
* cr16-dis.c (cr16_cinvs, instruction, cr16_currInsn): Make static.
(cr16_words, cr16_allWords, processing_argument_number): Likewise.
(imm4flag, size_changed): Likewise.
* crx-dis.c (crx_cinvs, NUMCINVS, instruction, currInsn): Likewise.
(words, allWords, processing_argument_number): Likewise.
(cst4flag, size_changed): Likewise.
* crx-opc.c (crx_cst4_map): Rename from cst4_map.
(crx_cst4_maps): Rename from cst4_maps.
(crx_no_op_insn): Rename from no_op_insn.
gas/
PR 22348
* config/tc-crx.c (instruction, output_opcode): Make static.
(relocatable, ins_parse, cur_arg_num): Likewise.
(parse_insn): Adjust for renamed opcodes globals.
(check_range): Likewise
Diffstat (limited to 'opcodes/cr16-dis.c')
| -rw-r--r-- | opcodes/cr16-dis.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c index 16385c35c94..4a3f3b7833e 100644 --- a/opcodes/cr16-dis.c +++ b/opcodes/cr16-dis.c @@ -54,7 +54,7 @@ typedef struct cinv_entry; /* CR16 'cinv' options mapping. */ -const cinv_entry cr16_cinvs[] = +static const cinv_entry cr16_cinvs[] = { {"cinv[i]", "cinv [i]"}, {"cinv[i,u]", "cinv [i,u]"}, @@ -78,20 +78,20 @@ typedef enum REG_ARG_TYPE REG_ARG_TYPE; /* Current opcode table entry we're disassembling. */ -const inst *instruction; +static const inst *instruction; /* Current instruction we're disassembling. */ -ins cr16_currInsn; +static ins cr16_currInsn; /* The current instruction is read into 3 consecutive words. */ -wordU cr16_words[3]; +static wordU cr16_words[3]; /* Contains all words in appropriate order. */ -ULONGLONG cr16_allWords; +static ULONGLONG cr16_allWords; /* Holds the current processed argument number. */ -int processing_argument_number; +static int processing_argument_number; /* Nonzero means a IMM4 instruction. */ -int imm4flag; +static int imm4flag; /* Nonzero means the instruction's original size is incremented (escape sequence is used). */ -int size_changed; +static int size_changed; /* Print the constant expression length. */ |