From 47cbc7aa5e942f7529b88568dc9bd1e71637ad3a Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 30 Sep 2009 01:10:56 +0200 Subject: [PATCH] bdf: Remove last users of FALSE/TRUE This brings bfd_boolean to the wonderful world of , it is needed because it defines bdf_boolean as an enum with values true and false, and some architectures use TRUE, FALSE and give problems when you try to use Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- arm-dis.c | 60 +++++++++++++++++++++++------------------------- cris-dis.c | 18 +++++++-------- dis-asm.h | 4 ++-- microblaze-dis.c | 2 +- 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/arm-dis.c b/arm-dis.c index 5c736c190..2c67d8fca 100644 --- a/arm-dis.c +++ b/arm-dis.c @@ -23,8 +23,6 @@ for things we don't care about. */ #include "dis-asm.h" -#define FALSE 0 -#define TRUE (!FALSE) #define ATTRIBUTE_UNUSED __attribute__((unused)) #define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n') @@ -1531,7 +1529,7 @@ static unsigned int regname_selected = 1; #define NUM_ARM_REGNAMES NUM_ELEM (regnames) #define arm_regnames regnames[regname_selected].reg_names -static bfd_boolean force_thumb = FALSE; +static bfd_boolean force_thumb = false; /* Current IT instruction state. This contains the same state as the IT bits in the CPSR. */ @@ -1628,7 +1626,7 @@ arm_decode_shift (long given, fprintf_ftype func, void *stream, } /* Print one coprocessor instruction on INFO->STREAM. - Return TRUE if the instuction matched, FALSE if this is not a + Return true if the instuction matched, false if this is not a recognised coprocessor instruction. */ static bfd_boolean @@ -2121,10 +2119,10 @@ print_insn_coprocessor (bfd_vma pc, struct disassemble_info *info, long given, else func (stream, "%c", *c); } - return TRUE; + return true; } } - return FALSE; + return false; } static void @@ -2218,7 +2216,7 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given) } /* Print one neon instruction on INFO->STREAM. - Return TRUE if the instuction matched, FALSE if this is not a + Return true if the instuction matched, false if this is not a recognised neon instruction. */ static bfd_boolean @@ -2244,7 +2242,7 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb) else if ((given & 0xff000000) == 0xf9000000) given ^= 0xf9000000 ^ 0xf4000000; else - return FALSE; + return false; } for (insn = neon_opcodes; insn->assembler; insn++) @@ -2334,34 +2332,34 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb) { int amask = (1 << size) - 1; if ((idx_align & (1 << size)) != 0) - return FALSE; + return false; if (size > 0) { if ((idx_align & amask) == amask) align = 8 << size; else if ((idx_align & amask) != 0) - return FALSE; + return false; } } break; case 2: if (size == 2 && (idx_align & 2) != 0) - return FALSE; + return false; align = (idx_align & 1) ? 16 << size : 0; break; case 3: if ((size == 2 && (idx_align & 3) != 0) || (idx_align & 1) != 0) - return FALSE; + return false; break; case 4: if (size == 2) { if ((idx_align & 3) == 3) - return FALSE; + return false; align = (idx_align & 3) * 64; } else @@ -2670,10 +2668,10 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb) else func (stream, "%c", *c); } - return TRUE; + return true; } } - return FALSE; + return false; } /* Print one ARM instruction from PC on INFO->STREAM. */ @@ -2685,10 +2683,10 @@ print_insn_arm_internal (bfd_vma pc, struct disassemble_info *info, long given) void *stream = info->stream; fprintf_ftype func = info->fprintf_func; - if (print_insn_coprocessor (pc, info, given, FALSE)) + if (print_insn_coprocessor (pc, info, given, false)) return; - if (print_insn_neon (info, given, FALSE)) + if (print_insn_neon (info, given, false)) return; for (insn = arm_opcodes; insn->assembler; insn++) @@ -3321,10 +3319,10 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given) void *stream = info->stream; fprintf_ftype func = info->fprintf_func; - if (print_insn_coprocessor (pc, info, given, TRUE)) + if (print_insn_coprocessor (pc, info, given, true)) return; - if (print_insn_neon (info, given, TRUE)) + if (print_insn_neon (info, given, true)) return; for (insn = thumb32_opcodes; insn->assembler; insn++) @@ -3459,7 +3457,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given) unsigned int op = (given & 0x00000f00) >> 8; unsigned int i12 = (given & 0x00000fff); unsigned int i8 = (given & 0x000000ff); - bfd_boolean writeback = FALSE, postind = FALSE; + bfd_boolean writeback = false, postind = false; int offset = 0; func (stream, "[%s", arm_regnames[Rn]); @@ -3489,22 +3487,22 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given) case 0xF: /* 8-bit + preindex with wb */ offset = i8; - writeback = TRUE; + writeback = true; break; case 0xD: /* 8-bit - preindex with wb */ offset = -i8; - writeback = TRUE; + writeback = true; break; case 0xB: /* 8-bit + postindex */ offset = i8; - postind = TRUE; + postind = true; break; case 0x9: /* 8-bit - postindex */ offset = -i8; - postind = TRUE; + postind = true; break; default: @@ -3877,12 +3875,12 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) unsigned char b[4]; long given; int status; - int is_thumb = FALSE; - int is_data = FALSE; + int is_thumb = false; + int is_data = false; unsigned int size = 4; void (*printer) (bfd_vma, struct disassemble_info *, long); #if 0 - bfd_boolean found = FALSE; + bfd_boolean found = false; if (info->disassembler_options) { @@ -3905,7 +3903,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) if (pc <= last_mapping_addr) last_mapping_sym = -1; is_thumb = (last_type == MAP_THUMB); - found = FALSE; + found = false; /* Start scanning at the start of the function, or wherever we finished last time. */ n = info->symtab_pos + 1; @@ -3923,7 +3921,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) && get_sym_code_type (info, n, &type)) { last_sym = n; - found = TRUE; + found = true; } } @@ -3940,7 +3938,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) if (get_sym_code_type (info, n, &type)) { last_sym = n; - found = TRUE; + found = true; break; } } @@ -4012,7 +4010,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info) #endif if (force_thumb) - is_thumb = TRUE; + is_thumb = true; info->bytes_per_line = 4; diff --git a/cris-dis.c b/cris-dis.c index f6932a056..455ba8af3 100644 --- a/cris-dis.c +++ b/cris-dis.c @@ -26,8 +26,6 @@ void *qemu_malloc(size_t len); /* can't include qemu-common.h here */ -#define FALSE 0 -#define TRUE 1 #define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0) /* cris-opc.c -- Table of opcodes for the CRIS processor. @@ -1320,7 +1318,7 @@ cris_parse_disassembler_options (disassemble_info *info, info->private_data = calloc (1, sizeof (struct cris_disasm_data)); disdata = (struct cris_disasm_data *) info->private_data; if (disdata == NULL) - return FALSE; + return false; /* Default true. */ disdata->trace_case @@ -1328,7 +1326,7 @@ cris_parse_disassembler_options (disassemble_info *info, || (strcmp (info->disassembler_options, "nocase") != 0)); disdata->distype = distype; - return TRUE; + return true; } static const struct cris_spec_reg * @@ -2779,7 +2777,7 @@ print_insn_cris_with_register_prefix (bfd_vma vma, if (info->private_data == NULL && !cris_parse_disassembler_options (info, cris_dis_v0_v10)) return -1; - return print_insn_cris_generic (vma, info, TRUE); + return print_insn_cris_generic (vma, info, true); } #endif /* Disassemble, prefixing register names with `$'. CRIS v32. */ @@ -2791,7 +2789,7 @@ print_insn_crisv32_with_register_prefix (bfd_vma vma, if (info->private_data == NULL && !cris_parse_disassembler_options (info, cris_dis_v32)) return -1; - return print_insn_cris_generic (vma, info, TRUE); + return print_insn_cris_generic (vma, info, true); } #if 0 @@ -2805,7 +2803,7 @@ print_insn_crisv10_v32_with_register_prefix (bfd_vma vma, if (info->private_data == NULL && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32)) return -1; - return print_insn_cris_generic (vma, info, TRUE); + return print_insn_cris_generic (vma, info, true); } /* Disassemble, no prefixes on register names. CRIS v0..v10. */ @@ -2817,7 +2815,7 @@ print_insn_cris_without_register_prefix (bfd_vma vma, if (info->private_data == NULL && !cris_parse_disassembler_options (info, cris_dis_v0_v10)) return -1; - return print_insn_cris_generic (vma, info, FALSE); + return print_insn_cris_generic (vma, info, false); } /* Disassemble, no prefixes on register names. CRIS v32. */ @@ -2829,7 +2827,7 @@ print_insn_crisv32_without_register_prefix (bfd_vma vma, if (info->private_data == NULL && !cris_parse_disassembler_options (info, cris_dis_v32)) return -1; - return print_insn_cris_generic (vma, info, FALSE); + return print_insn_cris_generic (vma, info, false); } /* Disassemble, no prefixes on register names. @@ -2842,7 +2840,7 @@ print_insn_crisv10_v32_without_register_prefix (bfd_vma vma, if (info->private_data == NULL && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32)) return -1; - return print_insn_cris_generic (vma, info, FALSE); + return print_insn_cris_generic (vma, info, false); } #endif diff --git a/dis-asm.h b/dis-asm.h index 1d8f4bdbc..5f6f06cf6 100644 --- a/dis-asm.h +++ b/dis-asm.h @@ -10,6 +10,7 @@ #define DIS_ASM_H #include +#include #include #include #include @@ -471,7 +472,6 @@ bfd_vma bfd_getl32 (const bfd_byte *addr); bfd_vma bfd_getb32 (const bfd_byte *addr); bfd_vma bfd_getl16 (const bfd_byte *addr); bfd_vma bfd_getb16 (const bfd_byte *addr); -typedef enum bfd_boolean {false, true} boolean; -typedef boolean bfd_boolean; +typedef bool bfd_boolean; #endif /* ! defined (DIS_ASM_H) */ diff --git a/microblaze-dis.c b/microblaze-dis.c index 6144334e6..016b25e80 100644 --- a/microblaze-dis.c +++ b/microblaze-dis.c @@ -543,7 +543,7 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info) unsigned long inst, prev_inst; struct op_code_struct * op, *pop; int immval = 0; - boolean immfound = false; + bfd_boolean immfound = false; static bfd_vma prev_insn_addr = -1; /*init the prev insn addr */ static int prev_insn_vma = -1; /*init the prev insn vma */ int curr_insn_vma = info->buffer_vma;