diff options
| author | Alan Modra <amodra@gmail.com> | 2021-03-31 10:39:37 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2021-03-31 10:49:23 +1030 |
| commit | 015dc7e1f8a971692a910e6cfc64faf9216e75c3 (patch) | |
| tree | 53f0eb6489d86f4a6b734115c79c4e131af5416c /binutils/stabs.c | |
| parent | 78933a4ad9ae9c2e274d41e6b3036ea582c47810 (diff) | |
| download | binutils-015dc7e1f8a971692a910e6cfc64faf9216e75c3.zip binutils-015dc7e1f8a971692a910e6cfc64faf9216e75c3.tar.gz binutils-015dc7e1f8a971692a910e6cfc64faf9216e75c3.tar.bz2 | |
Use bool in binutils
* sysdep.h (POISON_BFD_BOOLEAN): Define.
* addr2line.c, * ar.c, * arsup.c, * bfdtest2.c, * binemul.c,
* binemul.h, * bucomm.c, * bucomm.h, * budbg.h, * coffgrok.c,
* debug.c, * debug.h, * dlltool.c, * dwarf.c, * dwarf.h,
* elfedit.c, * emul_aix.c, * mclex.c, * nm.c, * objcopy.c,
* objdump.c, * od-macho.c, * prdbg.c, * rdcoff.c, * rddbg.c,
* readelf.c, * rename.c, * stabs.c, * strings.c, * windint.h,
* windmc.c, * windmc.h, * windres.c, * winduni.c,
* wrstabs.c: Replace bfd_boolean with bool, FALSE with false,
and TRUE with true throughout.
Diffstat (limited to 'binutils/stabs.c')
| -rw-r--r-- | binutils/stabs.c | 1012 |
1 files changed, 506 insertions, 506 deletions
diff --git a/binutils/stabs.c b/binutils/stabs.c index 5b6842e..274bfb0 100644 --- a/binutils/stabs.c +++ b/binutils/stabs.c @@ -47,7 +47,7 @@ struct stab_handle /* The BFD. */ bfd *abfd; /* TRUE if this is stabs in sections. */ - bfd_boolean sections; + bool sections; /* The symbol table. */ asymbol **syms; /* The number of symbols. */ @@ -67,7 +67,7 @@ struct stab_handle int gcc_compiled; /* Whether an N_OPT symbol was seen that was not generated by gcc, so that we can detect the SunPRO compiler. */ - bfd_boolean n_opt_found; + bool n_opt_found; /* The main file name. */ char *main_filename; /* A stack of unfinished N_BINCL files. */ @@ -75,7 +75,7 @@ struct stab_handle /* A list of finished N_BINCL files. */ struct bincl_file *bincl_list; /* Whether we are inside a function or not. */ - bfd_boolean within_function; + bool within_function; /* The address of the end of the function, used if we have seen an N_FUN symbol while in a function. This is -1 if we have not seen an N_FUN (the normal case). */ @@ -94,7 +94,7 @@ struct stab_handle struct stab_tag *tags; /* Set by parse_stab_type if it sees a structure defined as a cross reference to itself. Reset by parse_stab_type otherwise. */ - bfd_boolean self_crossref; + bool self_crossref; }; /* A list of these structures is used to hold pending variable @@ -148,13 +148,13 @@ static char *savestring (const char *, int); static void bad_stab (const char *); static void warn_stab (const char *, const char *); -static bfd_boolean parse_stab_string +static bool parse_stab_string (void *, struct stab_handle *, int, int, bfd_vma, const char *, const char *); static debug_type parse_stab_type (void *, struct stab_handle *, const char *, const char **, debug_type **, const char *); -static bfd_boolean parse_stab_type_number +static bool parse_stab_type_number (const char **, int *, const char *); static debug_type parse_stab_range_type (void *, struct stab_handle *, const char *, const char **, @@ -167,53 +167,53 @@ static debug_type parse_stab_enum_type (void *, const char **, const char *); static debug_type parse_stab_struct_type (void *, struct stab_handle *, const char *, const char **, - bfd_boolean, const int *, const char *); -static bfd_boolean parse_stab_baseclasses + bool, const int *, const char *); +static bool parse_stab_baseclasses (void *, struct stab_handle *, const char **, debug_baseclass **, const char *); -static bfd_boolean parse_stab_struct_fields +static bool parse_stab_struct_fields (void *, struct stab_handle *, const char **, debug_field **, - bfd_boolean *, const char *); -static bfd_boolean parse_stab_cpp_abbrev + bool *, const char *); +static bool parse_stab_cpp_abbrev (void *, struct stab_handle *, const char **, debug_field *, const char *); -static bfd_boolean parse_stab_one_struct_field +static bool parse_stab_one_struct_field (void *, struct stab_handle *, const char **, const char *, - debug_field *, bfd_boolean *, const char *); -static bfd_boolean parse_stab_members + debug_field *, bool *, const char *); +static bool parse_stab_members (void *, struct stab_handle *, const char *, const char **, const int *, debug_method **, const char *); static debug_type parse_stab_argtypes (void *, struct stab_handle *, debug_type, const char *, const char *, - debug_type, const char *, bfd_boolean, bfd_boolean, const char **); -static bfd_boolean parse_stab_tilde_field + debug_type, const char *, bool, bool, const char **); +static bool parse_stab_tilde_field (void *, struct stab_handle *, const char **, const int *, debug_type *, - bfd_boolean *, const char *); + bool *, const char *); static debug_type parse_stab_array_type - (void *, struct stab_handle *, const char **, bfd_boolean, const char *); + (void *, struct stab_handle *, const char **, bool, const char *); static void push_bincl (struct stab_handle *, const char *, bfd_vma); static const char *pop_bincl (struct stab_handle *); -static bfd_boolean find_excl (struct stab_handle *, const char *, bfd_vma); -static bfd_boolean stab_record_variable +static bool find_excl (struct stab_handle *, const char *, bfd_vma); +static bool stab_record_variable (void *, struct stab_handle *, const char *, debug_type, enum debug_var_kind, bfd_vma); -static bfd_boolean stab_emit_pending_vars (void *, struct stab_handle *); +static bool stab_emit_pending_vars (void *, struct stab_handle *); static debug_type *stab_find_slot (struct stab_handle *, const int *); static debug_type stab_find_type (void *, struct stab_handle *, const int *); -static bfd_boolean stab_record_type +static bool stab_record_type (void *, struct stab_handle *, const int *, debug_type); static debug_type stab_xcoff_builtin_type (void *, struct stab_handle *, int); static debug_type stab_find_tagged_type (void *, struct stab_handle *, const char *, int, enum debug_type_kind); static debug_type *stab_demangle_argtypes - (void *, struct stab_handle *, const char *, bfd_boolean *, unsigned int); + (void *, struct stab_handle *, const char *, bool *, unsigned int); static debug_type *stab_demangle_v3_argtypes - (void *, struct stab_handle *, const char *, bfd_boolean *); + (void *, struct stab_handle *, const char *, bool *); static debug_type *stab_demangle_v3_arglist - (void *, struct stab_handle *, struct demangle_component *, bfd_boolean *); + (void *, struct stab_handle *, struct demangle_component *, bool *); static debug_type stab_demangle_v3_arg (void *, struct stab_handle *, struct demangle_component *, debug_type, - bfd_boolean *); + bool *); static int demangle_flags = DMGL_ANSI; @@ -233,13 +233,13 @@ savestring (const char *start, int len) /* Read a number from a string. */ static bfd_vma -parse_number (const char **pp, bfd_boolean *poverflow, const char *p_end) +parse_number (const char **pp, bool *poverflow, const char *p_end) { unsigned long ul; const char *orig; if (poverflow != NULL) - *poverflow = FALSE; + *poverflow = false; orig = *pp; if (orig >= p_end) @@ -266,21 +266,21 @@ parse_number (const char **pp, bfd_boolean *poverflow, const char *p_end) if (sizeof (bfd_vma) > sizeof (unsigned long)) { const char *p; - bfd_boolean neg; + bool neg; int base; bfd_vma over, lastdig; - bfd_boolean overflow; + bool overflow; bfd_vma v; /* Our own version of strtoul, for a bfd_vma. */ p = orig; - neg = FALSE; + neg = false; if (*p == '+') ++p; else if (*p == '-') { - neg = TRUE; + neg = true; ++p; } @@ -302,7 +302,7 @@ parse_number (const char **pp, bfd_boolean *poverflow, const char *p_end) over = ((bfd_vma) (bfd_signed_vma) -1) / (bfd_vma) base; lastdig = ((bfd_vma) (bfd_signed_vma) -1) % (bfd_vma) base; - overflow = FALSE; + overflow = false; v = 0; while (1) { @@ -323,7 +323,7 @@ parse_number (const char **pp, bfd_boolean *poverflow, const char *p_end) if (v > over || (v == over && (bfd_vma) d > lastdig)) { - overflow = TRUE; + overflow = true; break; } } @@ -339,7 +339,7 @@ parse_number (const char **pp, bfd_boolean *poverflow, const char *p_end) /* If we get here, the number is too large to represent in a bfd_vma. */ if (poverflow != NULL) - *poverflow = TRUE; + *poverflow = true; else warn_stab (orig, _("numeric overflow")); @@ -365,7 +365,7 @@ warn_stab (const char *p, const char *err) /* Create a handle to parse stabs symbols with. */ void * -start_stab (void *dhandle ATTRIBUTE_UNUSED, bfd *abfd, bfd_boolean sections, +start_stab (void *dhandle ATTRIBUTE_UNUSED, bfd *abfd, bool sections, asymbol **syms, long symcount) { struct stab_handle *ret; @@ -386,7 +386,7 @@ start_stab (void *dhandle ATTRIBUTE_UNUSED, bfd *abfd, bfd_boolean sections, /* When we have processed all the stabs information, we need to go through and fill in all the undefined tags. */ -bfd_boolean +bool finish_stab (void *dhandle, void *handle) { struct stab_handle *info = (struct stab_handle *) handle; @@ -396,8 +396,8 @@ finish_stab (void *dhandle, void *handle) { if (! stab_emit_pending_vars (dhandle, info) || ! debug_end_function (dhandle, info->function_end)) - return FALSE; - info->within_function = FALSE; + return false; + info->within_function = false; info->function_end = (bfd_vma) -1; } @@ -410,15 +410,15 @@ finish_stab (void *dhandle, void *handle) kind = DEBUG_KIND_STRUCT; st->slot = debug_make_undefined_tagged_type (dhandle, st->name, kind); if (st->slot == DEBUG_TYPE_NULL) - return FALSE; + return false; } - return TRUE; + return true; } /* Handle a single stabs symbol. */ -bfd_boolean +bool parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, const char *string) { @@ -433,11 +433,11 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, && (type != N_SO || *string == '\0' || value != info->so_value)) { if (! debug_set_filename (dhandle, info->so_string)) - return FALSE; + return false; info->main_filename = info->so_string; info->gcc_compiled = 0; - info->n_opt_found = FALSE; + info->n_opt_found = false; /* Generally, for stabs in the symbol table, the N_LBRAC and N_RBRAC symbols are relative to the N_SO symbol value. */ @@ -472,7 +472,7 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, if (! info->within_function) { fprintf (stderr, _("N_LBRAC not within function\n")); - return FALSE; + return false; } /* Start an inner lexical block. */ @@ -480,11 +480,11 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, (value + info->file_start_offset + info->function_start_offset))) - return FALSE; + return false; /* Emit any pending variable definitions. */ if (! stab_emit_pending_vars (dhandle, info)) - return FALSE; + return false; ++info->block_depth; break; @@ -498,20 +498,20 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, if we do, we probably need to emit them before closing the block. */ if (! stab_emit_pending_vars (dhandle, info)) - return FALSE; + return false; /* End an inner lexical block. */ if (! debug_end_block (dhandle, (value + info->file_start_offset + info->function_start_offset))) - return FALSE; + return false; --info->block_depth; if (info->block_depth < 0) { fprintf (stderr, _("Too many N_RBRACs\n")); - return FALSE; + return false; } break; @@ -528,15 +528,15 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, endval = info->function_end; if (! stab_emit_pending_vars (dhandle, info) || ! debug_end_function (dhandle, endval)) - return FALSE; - info->within_function = FALSE; + return false; + info->within_function = false; info->function_end = (bfd_vma) -1; } /* An empty string is emitted by gcc at the end of a compilation unit. */ if (*string == '\0') - return TRUE; + return true; /* Just accumulate strings until we see a non N_SO symbol. If the string starts with a directory separator or some other @@ -565,44 +565,44 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, case N_SOL: /* Start an include file. */ if (! debug_start_source (dhandle, string)) - return FALSE; + return false; break; case N_BINCL: /* Start an include file which may be replaced. */ push_bincl (info, string, value); if (! debug_start_source (dhandle, string)) - return FALSE; + return false; break; case N_EINCL: /* End an N_BINCL include. */ if (! debug_start_source (dhandle, pop_bincl (info))) - return FALSE; + return false; break; case N_EXCL: /* This is a duplicate of a header file named by N_BINCL which was eliminated by the linker. */ if (! find_excl (info, string, value)) - return FALSE; + return false; break; case N_SLINE: if (! debug_record_line (dhandle, desc, value + (info->within_function ? info->function_start_offset : 0))) - return FALSE; + return false; break; case N_BCOMM: if (! debug_start_common_block (dhandle, string)) - return FALSE; + return false; break; case N_ECOMM: if (! debug_end_common_block (dhandle, string)) - return FALSE; + return false; break; case N_FUN: @@ -616,8 +616,8 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, value += info->function_start_offset; if (! stab_emit_pending_vars (dhandle, info) || ! debug_end_function (dhandle, value)) - return FALSE; - info->within_function = FALSE; + return false; + info->within_function = false; info->function_end = (bfd_vma) -1; } break; @@ -657,18 +657,18 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, endval = info->function_end; if (! stab_emit_pending_vars (dhandle, info) || ! debug_end_function (dhandle, endval)) - return FALSE; + return false; info->function_end = (bfd_vma) -1; } /* For stabs in sections, line numbers and block addresses are offsets from the start of the function. */ if (info->sections) info->function_start_offset = value; - info->within_function = TRUE; + info->within_function = true; } if (! parse_stab_string (dhandle, info, type, desc, value, string, string_end)) - return FALSE; + return false; } break; @@ -678,7 +678,7 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, else if (string != NULL && strcmp (string, "gcc_compiled.") == 0) info->gcc_compiled = 1; else - info->n_opt_found = TRUE; + info->n_opt_found = true; break; case N_OBJ: @@ -688,12 +688,12 @@ parse_stab (void *dhandle, void *handle, int type, int desc, bfd_vma value, break; } - return TRUE; + return true; } /* Parse the stabs string. */ -static bfd_boolean +static bool parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, int desc ATTRIBUTE_UNUSED, bfd_vma value, const char *string, const char * string_end) @@ -702,13 +702,13 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, char *name; int type; debug_type dtype; - bfd_boolean synonym; - bfd_boolean self_crossref; + bool synonym; + bool self_crossref; debug_type *slot; p = strchr (string, ':'); if (p == NULL) - return TRUE; + return true; while (p[1] == ':') { @@ -717,7 +717,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, if (p == NULL) { bad_stab (string); - return FALSE; + return false; } } @@ -762,7 +762,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, else if (*p == 0) { bad_stab (string); - return FALSE; + return false; } else type = *p++; @@ -779,7 +779,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, if (*p != '=') { bad_stab (string); - return FALSE; + return false; } ++p; switch (*p++) @@ -787,7 +787,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, case 'r': /* Floating point constant. */ if (! debug_record_float_const (dhandle, name, atof (p))) - return FALSE; + return false; break; case 'i': /* Integer constant. */ @@ -798,7 +798,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, other languages probably should have at least unsigned as well as signed constants. */ if (! debug_record_int_const (dhandle, name, atoi (p))) - return FALSE; + return false; break; case 'e': /* SYMBOL:c=eTYPE,INTVALUE for a constant symbol whose value @@ -808,18 +808,18 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (*p != ',') { bad_stab (string); - return FALSE; + return false; } if (! debug_record_typed_const (dhandle, name, dtype, atoi (p))) - return FALSE; + return false; break; default: bad_stab (string); - return FALSE; + return false; } break; @@ -829,9 +829,9 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! debug_record_label (dhandle, name, dtype, value)) - return FALSE; + return false; break; case 'f': @@ -840,9 +840,9 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! debug_record_function (dhandle, name, dtype, type == 'F', value)) - return FALSE; + return false; /* Sun acc puts declared types of arguments here. We don't care about their actual types (FIXME -- we should remember the whole @@ -854,7 +854,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, if (parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end) == DEBUG_TYPE_NULL) - return FALSE; + return false; } break; @@ -868,7 +868,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (name != NULL) { char leading; @@ -892,7 +892,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, if (! stab_record_variable (dhandle, info, name, dtype, DEBUG_GLOBAL, value)) - return FALSE; + return false; } break; @@ -904,10 +904,10 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! stab_record_variable (dhandle, info, name, dtype, DEBUG_LOCAL, value)) - return FALSE; + return false; break; case 'p': @@ -928,15 +928,15 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, debug_type ftype; ftype = debug_make_function_type (dhandle, dtype, - (debug_type *) NULL, FALSE); + (debug_type *) NULL, false); dtype = debug_make_pointer_type (dhandle, ftype); } } if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! debug_record_parameter (dhandle, name, dtype, DEBUG_PARM_STACK, value)) - return FALSE; + return false; /* FIXME: At this point gdb considers rearranging the parameter address on a big endian machine if it is smaller than an int. @@ -954,7 +954,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, if (parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end) == DEBUG_TYPE_NULL) - return FALSE; + return false; } break; } @@ -964,10 +964,10 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! debug_record_parameter (dhandle, name, dtype, DEBUG_PARM_REG, value)) - return FALSE; + return false; break; case 'r': @@ -975,10 +975,10 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! stab_record_variable (dhandle, info, name, dtype, DEBUG_REGISTER, value)) - return FALSE; + return false; /* FIXME: At this point gdb checks to combine pairs of 'p' and 'r' stabs into a single 'P' stab. */ @@ -989,26 +989,26 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! stab_record_variable (dhandle, info, name, dtype, DEBUG_STATIC, value)) - return FALSE; + return false; break; case 't': /* A typedef. */ dtype = parse_stab_type (dhandle, info, name, &p, &slot, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (name == NULL) { /* A nameless type. Nothing to do. */ - return TRUE; + return true; } dtype = debug_name_type (dhandle, name, dtype); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (slot != NULL) *slot = dtype; @@ -1020,21 +1020,21 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, by 't' which means we are typedef'ing it as well. */ if (*p != 't') { - synonym = FALSE; + synonym = false; /* FIXME: gdb sets synonym to TRUE if the current language is C++. */ } else { - synonym = TRUE; + synonym = true; ++p; } dtype = parse_stab_type (dhandle, info, name, &p, &slot, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (name == NULL) - return TRUE; + return true; /* INFO->SELF_CROSSREF is set by parse_stab_type if this type is a cross reference to itself. These are generated by some @@ -1043,7 +1043,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = debug_tag_type (dhandle, name, dtype); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (slot != NULL) *slot = dtype; @@ -1070,7 +1070,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, { dtype = debug_name_type (dhandle, name, dtype); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (slot != NULL) *slot = dtype; @@ -1083,11 +1083,11 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; /* FIXME: gdb checks os9k_stabs here. */ if (! stab_record_variable (dhandle, info, name, dtype, DEBUG_LOCAL_STATIC, value)) - return FALSE; + return false; break; case 'v': @@ -1095,10 +1095,10 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! debug_record_parameter (dhandle, name, dtype, DEBUG_PARM_REFERENCE, value)) - return FALSE; + return false; break; case 'a': @@ -1106,10 +1106,10 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! debug_record_parameter (dhandle, name, dtype, DEBUG_PARM_REF_REG, value)) - return FALSE; + return false; break; case 'X': @@ -1120,10 +1120,10 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, dtype = parse_stab_type (dhandle, info, (const char *) NULL, &p, (debug_type **) NULL, string_end); if (dtype == DEBUG_TYPE_NULL) - return FALSE; + return false; if (! stab_record_variable (dhandle, info, name, dtype, DEBUG_LOCAL, value)) - return FALSE; + return false; break; case 'Y': @@ -1135,7 +1135,7 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, while (*p != ';') ++p; ++p; - return TRUE; + return true; } /* TODO SUNPro C++ support: Support default arguments after F,P parameters @@ -1148,13 +1148,13 @@ parse_stab_string (void *dhandle, struct stab_handle *info, int stabtype, default: bad_stab (string); - return FALSE; + return false; } /* FIXME: gdb converts structure values to structure pointers in a couple of cases, depending upon the target. */ - return TRUE; + return true; } /* Parse a stabs type. The typename argument is non-NULL if this is a @@ -1173,7 +1173,7 @@ parse_stab_type (void * dhandle, const char *orig; int typenums[2]; int size; - bfd_boolean stringp; + bool stringp; int descriptor; debug_type dtype; @@ -1185,9 +1185,9 @@ parse_stab_type (void * dhandle, return DEBUG_TYPE_NULL; size = -1; - stringp = FALSE; + stringp = false; - info->self_crossref = FALSE; + info->self_crossref = false; /* Read type number if present. The type number may be omitted. for instance in a two-dimensional array declared with type @@ -1260,7 +1260,7 @@ parse_stab_type (void * dhandle, break; case 'S': - stringp = TRUE; + stringp = true; break; case 0: @@ -1345,7 +1345,7 @@ parse_stab_type (void * dhandle, if (type_name != NULL && strncmp (type_name, *pp, p - *pp) == 0 && type_name[p - *pp] == '\0') - info->self_crossref = TRUE; + info->self_crossref = true; dtype = stab_find_tagged_type (dhandle, info, *pp, p - *pp, code); @@ -1429,7 +1429,7 @@ parse_stab_type (void * dhandle, (dhandle, parse_stab_type (dhandle, info, (const char *) NULL, pp, (debug_type **) NULL, p_end), - (debug_type *) NULL, FALSE)); + (debug_type *) NULL, false)); break; case 'k': @@ -1501,7 +1501,7 @@ parse_stab_type (void * dhandle, ++*pp; dtype = debug_make_method_type (dhandle, return_type, DEBUG_TYPE_NULL, - (debug_type *) NULL, FALSE); + (debug_type *) NULL, false); } else { @@ -1510,7 +1510,7 @@ parse_stab_type (void * dhandle, debug_type *args; unsigned int n; unsigned int alloc; - bfd_boolean varargs; + bool varargs; domain = parse_stab_type (dhandle, info, (const char *) NULL, pp, (debug_type **) NULL, p_end); @@ -1561,11 +1561,11 @@ parse_stab_type (void * dhandle, the void type. */ if (n == 0 || debug_get_type_kind (dhandle, args[n - 1]) != DEBUG_KIND_VOID) - varargs = TRUE; + varargs = true; else { --n; - varargs = FALSE; + varargs = false; } args[n] = DEBUG_TYPE_NULL; @@ -1653,7 +1653,7 @@ parse_stab_type (void * dhandle, single number N is equivalent to (0,N). Return the two numbers by storing them in the vector TYPENUMS. */ -static bfd_boolean +static bool parse_stab_type_number (const char **pp, int *typenums, const char *p_end) { const char *orig; @@ -1663,28 +1663,28 @@ parse_stab_type_number (const char **pp, int *typenums, const char *p_end) if (**pp != '(') { typenums[0] = 0; - typenums[1] = (int) parse_number (pp, (bfd_boolean *) NULL, p_end); - return TRUE; + typenums[1] = (int) parse_number (pp, (bool *) NULL, p_end); + return true; } ++*pp; - typenums[0] = (int) parse_number (pp, (bfd_boolean *) NULL, p_end); + typenums[0] = (int) parse_number (pp, (bool *) NULL, p_end); if (**pp != ',') { bad_stab (orig); - return FALSE; + return false; } ++*pp; - typenums[1] = (int) parse_number (pp, (bfd_boolean *) NULL, p_end); + typenums[1] = (int) parse_number (pp, (bool *) NULL, p_end); if (**pp != ')') { bad_stab (orig); - return FALSE; + return false; } ++*pp; - return TRUE; + return true; } /* Parse a range type. */ @@ -1699,11 +1699,11 @@ parse_stab_range_type (void * dhandle, { const char *orig; int rangenums[2]; - bfd_boolean self_subrange; + bool self_subrange; debug_type index_type; const char *s2, *s3; bfd_signed_vma n2, n3; - bfd_boolean ov2, ov3; + bool ov2, ov3; orig = *pp; if (orig >= p_end) @@ -1762,11 +1762,11 @@ parse_stab_range_type (void * dhandle, { if (startswith (s2, LLLOW) && startswith (s3, LLHIGH)) - return debug_make_int_type (dhandle, 8, FALSE); + return debug_make_int_type (dhandle, 8, false); if (! ov2 && n2 == 0 && startswith (s3, ULLHIGH)) - return debug_make_int_type (dhandle, 8, TRUE); + return debug_make_int_type (dhandle, 8, true); } warn_stab (orig, _("numeric overflow")); @@ -1799,50 +1799,50 @@ parse_stab_range_type (void * dhandle, if (type_name != NULL) { if (strcmp (type_name, "long long int") == 0) - return debug_make_int_type (dhandle, 8, FALSE); + return debug_make_int_type (dhandle, 8, false); else if (strcmp (type_name, "long long unsigned int") == 0) - return debug_make_int_type (dhandle, 8, TRUE); + return debug_make_int_type (dhandle, 8, true); } /* FIXME: The size here really depends upon the target. */ - return debug_make_int_type (dhandle, 4, TRUE); + return debug_make_int_type (dhandle, 4, true); } /* A range of 0 to 127 is char. */ if (self_subrange && n2 == 0 && n3 == 127) - return debug_make_int_type (dhandle, 1, FALSE); + return debug_make_int_type (dhandle, 1, false); /* FIXME: gdb checks for the language CHILL here. */ if (n2 == 0) { if (n3 < 0) - return debug_make_int_type (dhandle, - n3, TRUE); + return debug_make_int_type (dhandle, - n3, true); else if (n3 == 0xff) - return debug_make_int_type (dhandle, 1, TRUE); + return debug_make_int_type (dhandle, 1, true); else if (n3 == 0xffff) - return debug_make_int_type (dhandle, 2, TRUE); + return debug_make_int_type (dhandle, 2, true); else if (n3 == (bfd_signed_vma) 0xffffffff) - return debug_make_int_type (dhandle, 4, TRUE); + return debug_make_int_type (dhandle, 4, true); #ifdef BFD64 else if (n3 == (bfd_signed_vma) 0xffffffffffffffffLL) - return debug_make_int_type (dhandle, 8, TRUE); + return debug_make_int_type (dhandle, 8, true); #endif } else if (n3 == 0 && n2 < 0 && (self_subrange || n2 == -8)) - return debug_make_int_type (dhandle, - n2, TRUE); + return debug_make_int_type (dhandle, - n2, true); else if (n2 == - n3 - 1 || n2 == n3 + 1) { if (n3 == 0x7f) - return debug_make_int_type (dhandle, 1, FALSE); + return debug_make_int_type (dhandle, 1, false); else if (n3 == 0x7fff) - return debug_make_int_type (dhandle, 2, FALSE); + return debug_make_int_type (dhandle, 2, false); else if (n3 == 0x7fffffff) - return debug_make_int_type (dhandle, 4, FALSE); + return debug_make_int_type (dhandle, 4, false); #ifdef BFD64 else if (n3 == ((((bfd_vma) 0x7fffffff) << 32) | 0xffffffff)) - return debug_make_int_type (dhandle, 8, FALSE); + return debug_make_int_type (dhandle, 8, false); #endif } } @@ -1862,7 +1862,7 @@ parse_stab_range_type (void * dhandle, /* Does this actually ever happen? Is that why we are worrying about dealing with it rather than just calling error_type? */ warn_stab (orig, _("missing index type")); - index_type = debug_make_int_type (dhandle, 4, FALSE); + index_type = debug_make_int_type (dhandle, 4, false); } return debug_make_range_type (dhandle, index_type, n2, n3); @@ -1884,7 +1884,7 @@ static debug_type parse_stab_sun_builtin_type (void *dhandle, const char **pp, const char * p_end) { const char *orig; - bfd_boolean unsignedp; + bool unsignedp; bfd_vma bits; orig = *pp; @@ -1894,10 +1894,10 @@ parse_stab_sun_builtin_type (void *dhandle, const char **pp, const char * p_end) switch (**pp) { case 's': - unsignedp = FALSE; + unsignedp = false; break; case 'u': - unsignedp = TRUE; + unsignedp = true; break; default: bad_stab (orig); @@ -1918,7 +1918,7 @@ parse_stab_sun_builtin_type (void *dhandle, const char **pp, const char * p_end) by this type, except that unsigned short is 4 instead of 2. Since this information is redundant with the third number, we will ignore it. */ - (void) parse_number (pp, (bfd_boolean *) NULL, p_end); + (void) parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -1927,7 +1927,7 @@ parse_stab_sun_builtin_type (void *dhandle, const char **pp, const char * p_end) ++*pp; /* The second number is always 0, so ignore it too. */ - (void) parse_number (pp, (bfd_boolean *) NULL, p_end); + (void) parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -1936,7 +1936,7 @@ parse_stab_sun_builtin_type (void *dhandle, const char **pp, const char * p_end) ++*pp; /* The third number is the number of bits for this type. */ - bits = parse_number (pp, (bfd_boolean *) NULL, p_end); + bits = parse_number (pp, (bool *) NULL, p_end); /* The type *should* end with a semicolon. If it are embedded in a larger type the semicolon may be the only way to know where @@ -1968,7 +1968,7 @@ parse_stab_sun_floating_type (void *dhandle, const char **pp, const char *p_end) /* The first number has more details about the type, for example FN_COMPLEX. */ - details = parse_number (pp, (bfd_boolean *) NULL, p_end); + details = parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -1976,7 +1976,7 @@ parse_stab_sun_floating_type (void *dhandle, const char **pp, const char *p_end) } /* The second number is the number of bytes occupied by this type */ - bytes = parse_number (pp, (bfd_boolean *) NULL, p_end); + bytes = parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -2051,7 +2051,7 @@ parse_stab_enum_type (void *dhandle, const char **pp, const char * p_end) name = savestring (*pp, p - *pp); *pp = p + 1; - val = (bfd_signed_vma) parse_number (pp, (bfd_boolean *) NULL, p_end); + val = (bfd_signed_vma) parse_number (pp, (bool *) NULL, p_end); if (**pp != ',') { bad_stab (orig); @@ -2093,24 +2093,24 @@ parse_stab_enum_type (void *dhandle, const char **pp, const char * p_end) *PP will point to "4a:1,0,32;;". */ static debug_type -parse_stab_struct_type (void * dhandle, - struct stab_handle * info, - const char * tagname, - const char ** pp, - bfd_boolean structp, - const int * typenums, - const char * p_end) +parse_stab_struct_type (void *dhandle, + struct stab_handle *info, + const char *tagname, + const char **pp, + bool structp, + const int *typenums, + const char *p_end) { bfd_vma size; debug_baseclass *baseclasses; debug_field *fields = NULL; - bfd_boolean statics; + bool statics; debug_method *methods; debug_type vptrbase; - bfd_boolean ownvptr; + bool ownvptr; /* Get the size. */ - size = parse_number (pp, (bfd_boolean *) NULL, p_end); + size = parse_number (pp, (bool *) NULL, p_end); /* Get the other information. */ if (! parse_stab_baseclasses (dhandle, info, pp, &baseclasses, p_end) @@ -2158,7 +2158,7 @@ parse_stab_struct_type (void * dhandle, Return TRUE for success, FALSE for failure. */ -static bfd_boolean +static bool parse_stab_baseclasses (void * dhandle, struct stab_handle * info, const char ** pp, @@ -2173,21 +2173,21 @@ parse_stab_baseclasses (void * dhandle, orig = *pp; if (orig >= p_end) - return FALSE; + return false; if (**pp != '!') { /* No base classes. */ - return TRUE; + return true; } ++*pp; - c = (unsigned int) parse_number (pp, (bfd_boolean *) NULL, p_end); + c = (unsigned int) parse_number (pp, (bool *) NULL, p_end); if (**pp != ',') { bad_stab (orig); - return FALSE; + return false; } ++*pp; @@ -2195,7 +2195,7 @@ parse_stab_baseclasses (void * dhandle, for (i = 0; i < c; i++) { - bfd_boolean is_virtual; + bool is_virtual; enum debug_visibility visibility; bfd_vma bitpos; debug_type type; @@ -2203,17 +2203,17 @@ parse_stab_baseclasses (void * dhandle, switch (**pp) { case '0': - is_virtual = FALSE; + is_virtual = false; break; case '1': - is_virtual = TRUE; + is_virtual = true; break; case 0: bad_stab (orig); - return FALSE; + return false; default: warn_stab (orig, _("unknown virtual character for baseclass")); - is_virtual = FALSE; + is_virtual = false; break; } ++*pp; @@ -2231,7 +2231,7 @@ parse_stab_baseclasses (void * dhandle, break; case 0: bad_stab (orig); - return FALSE; + return false; default: warn_stab (orig, _("unknown visibility character for baseclass")); visibility = DEBUG_VISIBILITY_PUBLIC; @@ -2242,26 +2242,26 @@ parse_stab_baseclasses (void * dhandle, /* The remaining value is the bit offset of the portion of the object corresponding to this baseclass. Always zero in the absence of multiple inheritance. */ - bitpos = parse_number (pp, (bfd_boolean *) NULL, p_end); + bitpos = parse_number (pp, (bool *) NULL, p_end); if (**pp != ',') { bad_stab (orig); - return FALSE; + return false; } ++*pp; type = parse_stab_type (dhandle, info, (const char *) NULL, pp, (debug_type **) NULL, p_end); if (type == DEBUG_TYPE_NULL) - return FALSE; + return false; classes[i] = debug_make_baseclass (dhandle, type, bitpos, is_virtual, visibility); if (classes[i] == DEBUG_BASECLASS_NULL) - return FALSE; + return false; if (**pp != ';') - return FALSE; + return false; ++*pp; } @@ -2269,7 +2269,7 @@ parse_stab_baseclasses (void * dhandle, *retp = classes; - return TRUE; + return true; } /* Read struct or class data fields. They have the form: @@ -2292,13 +2292,13 @@ parse_stab_baseclasses (void * dhandle, Returns 1 for success, 0 for failure. */ -static bfd_boolean -parse_stab_struct_fields (void * dhandle, - struct stab_handle * info, - const char ** pp, - debug_field ** retp, - bfd_boolean * staticsp, - const char * p_end) +static bool +parse_stab_struct_fields (void *dhandle, + struct stab_handle *info, + const char **pp, + debug_field **retp, + bool *staticsp, + const char * p_end) { const char *orig; const char *p; @@ -2307,11 +2307,11 @@ parse_stab_struct_fields (void * dhandle, unsigned int alloc; *retp = NULL; - *staticsp = FALSE; + *staticsp = false; orig = *pp; if (orig >= p_end) - return FALSE; + return false; c = 0; alloc = 10; @@ -2343,7 +2343,7 @@ parse_stab_struct_fields (void * dhandle, if (! parse_stab_cpp_abbrev (dhandle, info, pp, fields + c, p_end)) { free (fields); - return FALSE; + return false; } ++c; continue; @@ -2359,7 +2359,7 @@ parse_stab_struct_fields (void * dhandle, { bad_stab (orig); free (fields); - return FALSE; + return false; } if (p[1] == ':') @@ -2367,7 +2367,7 @@ parse_stab_struct_fields (void * dhandle, if (! parse_stab_one_struct_field (dhandle, info, pp, p, fields + c, staticsp, p_end)) - return FALSE; + return false; ++c; } @@ -2376,12 +2376,12 @@ parse_stab_struct_fields (void * dhandle, *retp = fields; - return TRUE; + return true; } /* Special GNU C++ name. */ -static bfd_boolean +static bool parse_stab_cpp_abbrev (void * dhandle, struct stab_handle * info, const char ** pp, @@ -2400,12 +2400,12 @@ parse_stab_cpp_abbrev (void * dhandle, orig = *pp; if (orig >= p_end) - return FALSE; + return false; if (**pp != 'v') { bad_stab (*pp); - return FALSE; + return false; } ++*pp; @@ -2413,7 +2413,7 @@ parse_stab_cpp_abbrev (void * dhandle, if (cpp_abbrev == 0) { bad_stab (orig); - return FALSE; + return false; } ++*pp; @@ -2425,7 +2425,7 @@ parse_stab_cpp_abbrev (void * dhandle, context = parse_stab_type (dhandle, info, (const char *) NULL, pp, (debug_type **) NULL, p_end); if (context == DEBUG_TYPE_NULL) - return FALSE; + return false; switch (cpp_abbrev) { @@ -2452,7 +2452,7 @@ parse_stab_cpp_abbrev (void * dhandle, if (**pp != ':') { bad_stab (orig); - return FALSE; + return false; } ++*pp; @@ -2461,36 +2461,36 @@ parse_stab_cpp_abbrev (void * dhandle, if (**pp != ',') { bad_stab (orig); - return FALSE; + return false; } ++*pp; - bitpos = parse_number (pp, (bfd_boolean *) NULL, p_end); + bitpos = parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); - return FALSE; + return false; } ++*pp; *retp = debug_make_field (dhandle, name, type, bitpos, 0, DEBUG_VISIBILITY_PRIVATE); if (*retp == DEBUG_FIELD_NULL) - return FALSE; + return false; - return TRUE; + return true; } /* Parse a single field in a struct or union. */ -static bfd_boolean -parse_stab_one_struct_field (void * dhandle, - struct stab_handle * info, - const char ** pp, - const char * p, - debug_field * retp, - bfd_boolean * staticsp, - const char * p_end) +static bool +parse_stab_one_struct_field (void *dhandle, + struct stab_handle *info, + const char **pp, + const char *p, + debug_field *retp, + bool *staticsp, + const char *p_end) { const char *orig; char *name; @@ -2501,7 +2501,7 @@ parse_stab_one_struct_field (void * dhandle, orig = *pp; if (orig >= p_end) - return FALSE; + return false; /* FIXME: gdb checks ARM_DEMANGLING here. */ @@ -2527,7 +2527,7 @@ parse_stab_one_struct_field (void * dhandle, break; case 0: bad_stab (orig); - return FALSE; + return false; default: warn_stab (orig, _("unknown visibility character for field")); visibility = DEBUG_VISIBILITY_PUBLIC; @@ -2541,7 +2541,7 @@ parse_stab_one_struct_field (void * dhandle, if (type == DEBUG_TYPE_NULL) { free (name); - return FALSE; + return false; } if (**pp == ':') @@ -2555,7 +2555,7 @@ parse_stab_one_struct_field (void * dhandle, { bad_stab (orig); free (name); - return FALSE; + return false; } varname = savestring (*pp, p - *pp); @@ -2564,34 +2564,34 @@ parse_stab_one_struct_field (void * dhandle, *retp = debug_make_static_member (dhandle, name, type, varname, visibility); - *staticsp = TRUE; + *staticsp = true; - return TRUE; + return true; } if (**pp != ',') { bad_stab (orig); free (name); - return FALSE; + return false; } ++*pp; - bitpos = parse_number (pp, (bfd_boolean *) NULL, p_end); + bitpos = parse_number (pp, (bool *) NULL, p_end); if (**pp != ',') { bad_stab (orig); free (name); - return FALSE; + return false; } ++*pp; - bitsize = parse_number (pp, (bfd_boolean *) NULL, p_end); + bitsize = parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); free (name); - return FALSE; + return false; } ++*pp; @@ -2617,7 +2617,7 @@ parse_stab_one_struct_field (void * dhandle, *retp = debug_make_field (dhandle, name, type, bitpos, bitsize, visibility); - return TRUE; + return true; } /* Read member function stabs info for C++ classes. The form of each member @@ -2633,7 +2633,7 @@ parse_stab_one_struct_field (void * dhandle, $ is the CPLUS_MARKER (usually '$'), `*' holds the place for an operator name (such as `+=') and `.' marks the end of the operator name. */ -static bfd_boolean +static bool parse_stab_members (void * dhandle, struct stab_handle * info, const char * tagname, @@ -2654,7 +2654,7 @@ parse_stab_members (void * dhandle, orig = *pp; if (orig >= p_end) - return FALSE; + return false; alloc = 0; methods = NULL; @@ -2707,13 +2707,13 @@ parse_stab_members (void * dhandle, do { debug_type type; - bfd_boolean stub; + bool stub; enum debug_visibility visibility; - bfd_boolean constp, volatilep, staticp; + bool constp, volatilep, staticp; bfd_vma voffset; debug_type context; const char *physname; - bfd_boolean varargs; + bool varargs; if (look_ahead_type != DEBUG_TYPE_NULL) { @@ -2743,10 +2743,10 @@ parse_stab_members (void * dhandle, goto fail; } - stub = FALSE; + stub = false; if (debug_get_type_kind (dhandle, type) == DEBUG_KIND_METHOD && debug_get_parameter_types (dhandle, type, &varargs) == NULL) - stub = TRUE; + stub = true; argtypes = savestring (*pp, p - *pp); *pp = p + 1; @@ -2768,8 +2768,8 @@ parse_stab_members (void * dhandle, } ++*pp; - constp = FALSE; - volatilep = FALSE; + constp = false; + volatilep = false; switch (**pp) { case 'A': @@ -2778,18 +2778,18 @@ parse_stab_members (void * dhandle, break; case 'B': /* const member function. */ - constp = TRUE; + constp = true; ++*pp; break; case 'C': /* volatile member function. */ - volatilep = TRUE; + volatilep = true; ++*pp; break; case 'D': /* const volatile member function. */ - constp = TRUE; - volatilep = TRUE; + constp = true; + volatilep = true; ++*pp; break; case '*': @@ -2802,7 +2802,7 @@ parse_stab_members (void * dhandle, break; } - staticp = FALSE; + staticp = false; switch (**pp) { case '*': @@ -2810,7 +2810,7 @@ parse_stab_members (void * dhandle, bit is supposedly set to distinguish pointers-to-methods from virtual function indices. */ ++*pp; - voffset = parse_number (pp, (bfd_boolean *) NULL, p_end); + voffset = parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -2856,11 +2856,11 @@ parse_stab_members (void * dhandle, case '?': /* static member function. */ ++*pp; - staticp = TRUE; + staticp = true; voffset = 0; context = DEBUG_TYPE_NULL; if (strncmp (argtypes, name, strlen (name)) != 0) - stub = TRUE; + stub = true; break; default: @@ -2951,13 +2951,13 @@ parse_stab_members (void * dhandle, *retp = methods; - return TRUE; + return true; fail: free (name); free (variants); free (argtypes); - return FALSE; + return false; } /* Parse a string representing argument types for a method. Stabs @@ -2970,15 +2970,15 @@ static debug_type parse_stab_argtypes (void *dhandle, struct stab_handle *info, debug_type class_type, const char *fieldname, const char *tagname, debug_type return_type, - const char *argtypes, bfd_boolean constp, - bfd_boolean volatilep, const char **pphysname) + const char *argtypes, bool constp, + bool volatilep, const char **pphysname) { - bfd_boolean is_full_physname_constructor; - bfd_boolean is_constructor; - bfd_boolean is_destructor; - bfd_boolean is_v3; + bool is_full_physname_constructor; + bool is_constructor; + bool is_destructor; + bool is_v3; debug_type *args; - bfd_boolean varargs; + bool varargs; unsigned int physname_len = 0; /* Constructors are sometimes handled specially. */ @@ -3057,7 +3057,7 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info, args = (debug_type *) xmalloc (sizeof *args); *args = NULL; return debug_make_method_type (dhandle, return_type, class_type, args, - FALSE); + false); } args = stab_demangle_argtypes (dhandle, info, *pphysname, &varargs, physname_len); @@ -3076,32 +3076,32 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info, This function is called when we have parsed all the method declarations, so we can look for the vptr base class info. */ -static bfd_boolean -parse_stab_tilde_field (void * dhandle, - struct stab_handle * info, - const char ** pp, - const int * typenums, - debug_type * retvptrbase, - bfd_boolean * retownvptr, - const char * p_end) +static bool +parse_stab_tilde_field (void *dhandle, + struct stab_handle *info, + const char **pp, + const int *typenums, + debug_type *retvptrbase, + bool *retownvptr, + const char *p_end) { const char *orig; const char *hold; int vtypenums[2]; *retvptrbase = DEBUG_TYPE_NULL; - *retownvptr = FALSE; + *retownvptr = false; orig = *pp; if (orig >= p_end) - return FALSE; + return false; /* If we are positioned at a ';', then skip it. */ if (**pp == ';') ++*pp; if (**pp != '~') - return TRUE; + return true; ++*pp; if (**pp == '=' || **pp == '+' || **pp == '-') @@ -3112,7 +3112,7 @@ parse_stab_tilde_field (void * dhandle, } if (**pp != '%') - return TRUE; + return true; ++*pp; hold = *pp; @@ -3120,11 +3120,11 @@ parse_stab_tilde_field (void * dhandle, /* The next number is the type number of the base class (possibly our own class) which supplies the vtable for this class. */ if (! parse_stab_type_number (pp, vtypenums, p_end)) - return FALSE; + return false; if (vtypenums[0] == typenums[0] && vtypenums[1] == typenums[1]) - *retownvptr = TRUE; + *retownvptr = true; else { debug_type vtype; @@ -3139,7 +3139,7 @@ parse_stab_tilde_field (void * dhandle, if (*p != ';') { bad_stab (orig); - return FALSE; + return false; } *retvptrbase = vtype; @@ -3147,23 +3147,23 @@ parse_stab_tilde_field (void * dhandle, *pp = p + 1; } - return TRUE; + return true; } /* Read a definition of an array type. */ static debug_type -parse_stab_array_type (void * dhandle, - struct stab_handle * info, - const char ** pp, - bfd_boolean stringp, - const char * p_end) +parse_stab_array_type (void *dhandle, + struct stab_handle *info, + const char **pp, + bool stringp, + const char *p_end) { const char *orig; const char *p; int typenums[2]; debug_type index_type; - bfd_boolean adjustable; + bool adjustable; bfd_signed_vma lower, upper; debug_type element_type; @@ -3190,7 +3190,7 @@ parse_stab_array_type (void * dhandle, index_type = debug_find_named_type (dhandle, "int"); if (index_type == DEBUG_TYPE_NULL) { - index_type = debug_make_int_type (dhandle, 4, FALSE); + index_type = debug_make_int_type (dhandle, 4, false); if (index_type == DEBUG_TYPE_NULL) return DEBUG_TYPE_NULL; } @@ -3209,15 +3209,15 @@ parse_stab_array_type (void * dhandle, } ++*pp; - adjustable = FALSE; + adjustable = false; if (! ISDIGIT (**pp) && **pp != '-' && **pp != 0) { ++*pp; - adjustable = TRUE; + adjustable = true; } - lower = (bfd_signed_vma) parse_number (pp, (bfd_boolean *) NULL, p_end); + lower = (bfd_signed_vma) parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -3228,10 +3228,10 @@ parse_stab_array_type (void * dhandle, if (! ISDIGIT (**pp) && **pp != '-' && **pp != 0) { ++*pp; - adjustable = TRUE; + adjustable = true; } - upper = (bfd_signed_vma) parse_number (pp, (bfd_boolean *) NULL, p_end); + upper = (bfd_signed_vma) parse_number (pp, (bool *) NULL, p_end); if (**pp != ';') { bad_stab (orig); @@ -3323,7 +3323,7 @@ pop_bincl (struct stab_handle *info) /* Handle an N_EXCL: get the types from the corresponding N_BINCL. */ -static bfd_boolean +static bool find_excl (struct stab_handle *info, const char *name, bfd_vma hash) { struct bincl_file *l; @@ -3341,12 +3341,12 @@ find_excl (struct stab_handle *info, const char *name, bfd_vma hash) { warn_stab (name, _("Undefined N_EXCL")); info->file_types[info->files - 1] = NULL; - return TRUE; + return true; } info->file_types[info->files - 1] = l->file_types; - return TRUE; + return true; } /* Handle a variable definition. gcc emits variable definitions for a @@ -3354,7 +3354,7 @@ find_excl (struct stab_handle *info, const char *name, bfd_vma hash) it. The SunPRO compiler emits variable definitions after the N_LBRAC, so we can call debug_record_variable immediately. */ -static bfd_boolean +static bool stab_record_variable (void *dhandle, struct stab_handle *info, const char *name, debug_type type, enum debug_var_kind kind, bfd_vma val) @@ -3376,13 +3376,13 @@ stab_record_variable (void *dhandle, struct stab_handle *info, v->val = val; info->pending = v; - return TRUE; + return true; } /* Emit pending variable definitions. This is called after we see the N_LBRAC that starts the block. */ -static bfd_boolean +static bool stab_emit_pending_vars (void *dhandle, struct stab_handle *info) { struct stab_pending_var *v; @@ -3393,7 +3393,7 @@ stab_emit_pending_vars (void *dhandle, struct stab_handle *info) struct stab_pending_var *next; if (! debug_record_variable (dhandle, v->name, v->type, v->kind, v->val)) - return FALSE; + return false; next = v->next; free (v); @@ -3402,7 +3402,7 @@ stab_emit_pending_vars (void *dhandle, struct stab_handle *info) info->pending = NULL; - return TRUE; + return true; } /* Find the slot for a type in the database. */ @@ -3475,7 +3475,7 @@ stab_find_type (void *dhandle, struct stab_handle *info, const int *typenums) /* Record that a given type number refers to a given type. */ -static bfd_boolean +static bool stab_record_type (void *dhandle ATTRIBUTE_UNUSED, struct stab_handle *info, const int *typenums, debug_type type) { @@ -3483,13 +3483,13 @@ stab_record_type (void *dhandle ATTRIBUTE_UNUSED, struct stab_handle *info, slot = stab_find_slot (info, typenums); if (slot == NULL) - return FALSE; + return false; /* gdb appears to ignore type redefinitions, so we do as well. */ *slot = type; - return TRUE; + return true; } /* Return an XCOFF builtin type. */ @@ -3515,43 +3515,43 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, /* The size of this and all the other types are fixed, defined by the debugging format. */ name = "int"; - rettype = debug_make_int_type (dhandle, 4, FALSE); + rettype = debug_make_int_type (dhandle, 4, false); break; case 2: name = "char"; - rettype = debug_make_int_type (dhandle, 1, FALSE); + rettype = debug_make_int_type (dhandle, 1, false); break; case 3: name = "short"; - rettype = debug_make_int_type (dhandle, 2, FALSE); + rettype = debug_make_int_type (dhandle, 2, false); break; case 4: name = "long"; - rettype = debug_make_int_type (dhandle, 4, FALSE); + rettype = debug_make_int_type (dhandle, 4, false); break; case 5: name = "unsigned char"; - rettype = debug_make_int_type (dhandle, 1, TRUE); + rettype = debug_make_int_type (dhandle, 1, true); break; case 6: name = "signed char"; - rettype = debug_make_int_type (dhandle, 1, FALSE); + rettype = debug_make_int_type (dhandle, 1, false); break; case 7: name = "unsigned short"; - rettype = debug_make_int_type (dhandle, 2, TRUE); + rettype = debug_make_int_type (dhandle, 2, true); break; case 8: name = "unsigned int"; - rettype = debug_make_int_type (dhandle, 4, TRUE); + rettype = debug_make_int_type (dhandle, 4, true); break; case 9: name = "unsigned"; - rettype = debug_make_int_type (dhandle, 4, TRUE); + rettype = debug_make_int_type (dhandle, 4, true); break; case 10: name = "unsigned long"; - rettype = debug_make_int_type (dhandle, 4, TRUE); + rettype = debug_make_int_type (dhandle, 4, true); break; case 11: name = "void"; @@ -3576,7 +3576,7 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, break; case 15: name = "integer"; - rettype = debug_make_int_type (dhandle, 4, FALSE); + rettype = debug_make_int_type (dhandle, 4, false); break; case 16: name = "boolean"; @@ -3598,7 +3598,7 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, case 20: /* FIXME */ name = "character"; - rettype = debug_make_int_type (dhandle, 1, TRUE); + rettype = debug_make_int_type (dhandle, 1, true); break; case 21: name = "logical*1"; @@ -3628,28 +3628,28 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, break; case 27: name = "integer*1"; - rettype = debug_make_int_type (dhandle, 1, FALSE); + rettype = debug_make_int_type (dhandle, 1, false); break; case 28: name = "integer*2"; - rettype = debug_make_int_type (dhandle, 2, FALSE); + rettype = debug_make_int_type (dhandle, 2, false); break; case 29: name = "integer*4"; - rettype = debug_make_int_type (dhandle, 4, FALSE); + rettype = debug_make_int_type (dhandle, 4, false); break; case 30: /* FIXME */ name = "wchar"; - rettype = debug_make_int_type (dhandle, 2, FALSE); + rettype = debug_make_int_type (dhandle, 2, false); break; case 31: name = "long long"; - rettype = debug_make_int_type (dhandle, 8, FALSE); + rettype = debug_make_int_type (dhandle, 8, false); break; case 32: name = "unsigned long long"; - rettype = debug_make_int_type (dhandle, 8, TRUE); + rettype = debug_make_int_type (dhandle, 8, true); break; case 33: name = "logical*8"; @@ -3657,7 +3657,7 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, break; case 34: name = "integer*8"; - rettype = debug_make_int_type (dhandle, 8, FALSE); + rettype = debug_make_int_type (dhandle, 8, false); break; default: abort (); @@ -3755,7 +3755,7 @@ struct stab_demangle_info /* The array of arguments we are building. */ debug_type *args; /* Whether the method takes a variable number of arguments. */ - bfd_boolean varargs; + bool varargs; /* The array of types we have remembered. */ struct stab_demangle_typestring *typestrings; /* The number of typestrings. */ @@ -3766,29 +3766,29 @@ struct stab_demangle_info static void stab_bad_demangle (const char *); static unsigned int stab_demangle_count (const char **); -static bfd_boolean stab_demangle_get_count (const char **, unsigned int *); -static bfd_boolean stab_demangle_prefix +static bool stab_demangle_get_count (const char **, unsigned int *); +static bool stab_demangle_prefix (struct stab_demangle_info *, const char **, unsigned int); -static bfd_boolean stab_demangle_function_name +static bool stab_demangle_function_name (struct stab_demangle_info *, const char **, const char *); -static bfd_boolean stab_demangle_signature +static bool stab_demangle_signature (struct stab_demangle_info *, const char **); -static bfd_boolean stab_demangle_qualified +static bool stab_demangle_qualified (struct stab_demangle_info *, const char **, debug_type *); -static bfd_boolean stab_demangle_template +static bool stab_demangle_template (struct stab_demangle_info *, const char **, char **); -static bfd_boolean stab_demangle_class +static bool stab_demangle_class (struct stab_demangle_info *, const char **, const char **); -static bfd_boolean stab_demangle_args - (struct stab_demangle_info *, const char **, debug_type **, bfd_boolean *); -static bfd_boolean stab_demangle_arg +static bool stab_demangle_args + (struct stab_demangle_info *, const char **, debug_type **, bool *); +static bool stab_demangle_arg (struct stab_demangle_info *, const char **, debug_type **, unsigned int *, unsigned int *); -static bfd_boolean stab_demangle_type +static bool stab_demangle_type (struct stab_demangle_info *, const char **, debug_type *); -static bfd_boolean stab_demangle_fund_type +static bool stab_demangle_fund_type (struct stab_demangle_info *, const char **, debug_type *); -static bfd_boolean stab_demangle_remember_type +static bool stab_demangle_remember_type (struct stab_demangle_info *, const char *, int); /* Warn about a bad demangling. */ @@ -3819,11 +3819,11 @@ stab_demangle_count (const char **pp) /* Require a count in a string. The count may be multiple digits, in which case it must end in an underscore. */ -static bfd_boolean +static bool stab_demangle_get_count (const char **pp, unsigned int *pi) { if (! ISDIGIT (**pp)) - return FALSE; + return false; *pi = **pp - '0'; ++*pp; @@ -3848,7 +3848,7 @@ stab_demangle_get_count (const char **pp, unsigned int *pi) } } - return TRUE; + return true; } /* This function demangles a physical name, returning a NULL @@ -3856,7 +3856,7 @@ stab_demangle_get_count (const char **pp, unsigned int *pi) static debug_type * stab_demangle_argtypes (void *dhandle, struct stab_handle *info, - const char *physname, bfd_boolean *pvarargs, + const char *physname, bool *pvarargs, unsigned int physname_len) { struct stab_demangle_info minfo; @@ -3868,7 +3868,7 @@ stab_demangle_argtypes (void *dhandle, struct stab_handle *info, minfo.dhandle = dhandle; minfo.info = info; minfo.args = NULL; - minfo.varargs = FALSE; + minfo.varargs = false; minfo.typestring_alloc = 10; minfo.typestrings = ((struct stab_demangle_typestring *) xmalloc (minfo.typestring_alloc @@ -3903,7 +3903,7 @@ stab_demangle_argtypes (void *dhandle, struct stab_handle *info, /* Demangle the prefix of the mangled name. */ -static bfd_boolean +static bool stab_demangle_prefix (struct stab_demangle_info *minfo, const char **pp, unsigned int physname_len) { @@ -3926,7 +3926,7 @@ stab_demangle_prefix (struct stab_demangle_info *minfo, const char **pp, if (scan == NULL) { stab_bad_demangle (*pp); - return FALSE; + return false; } --scan; @@ -3944,7 +3944,7 @@ stab_demangle_prefix (struct stab_demangle_info *minfo, const char **pp, { /* This is a GNU style constructor name. */ *pp = scan + 2; - return TRUE; + return true; } else if (scan == *pp && ! ISDIGIT (scan[2]) @@ -3958,7 +3958,7 @@ stab_demangle_prefix (struct stab_demangle_info *minfo, const char **pp, if (scan == NULL || scan[2] == '\0') { stab_bad_demangle (*pp); - return FALSE; + return false; } return stab_demangle_function_name (minfo, pp, scan); @@ -3971,7 +3971,7 @@ stab_demangle_prefix (struct stab_demangle_info *minfo, const char **pp, else { stab_bad_demangle (*pp); - return FALSE; + return false; } /*NOTREACHED*/ } @@ -3980,7 +3980,7 @@ stab_demangle_prefix (struct stab_demangle_info *minfo, const char **pp, double underscore which separates the function name from the signature. */ -static bfd_boolean +static bool stab_demangle_function_name (struct stab_demangle_info *minfo, const char **pp, const char *scan) { @@ -4003,7 +4003,7 @@ stab_demangle_function_name (struct stab_demangle_info *minfo, /* This is a type conversion operator. */ tem = name + 5; if (! stab_demangle_type (minfo, &tem, (debug_type *) NULL)) - return FALSE; + return false; } else if (name[0] == '_' && name[1] == '_' @@ -4015,26 +4015,26 @@ stab_demangle_function_name (struct stab_demangle_info *minfo, /* This is a type conversion operator. */ tem = name + 4; if (! stab_demangle_type (minfo, &tem, (debug_type *) NULL)) - return FALSE; + return false; } - return TRUE; + return true; } /* Demangle the signature. This is where the argument types are found. */ -static bfd_boolean +static bool stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) { const char *orig; - bfd_boolean expect_func, func_done; + bool expect_func, func_done; const char *hold; orig = *pp; - expect_func = FALSE; - func_done = FALSE; + expect_func = false; + func_done = false; hold = NULL; while (**pp != '\0') @@ -4045,8 +4045,8 @@ stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) hold = *pp; if (! stab_demangle_qualified (minfo, pp, (debug_type *) NULL) || ! stab_demangle_remember_type (minfo, hold, *pp - hold)) - return FALSE; - expect_func = TRUE; + return false; + expect_func = true; hold = NULL; break; @@ -4070,8 +4070,8 @@ stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) hold = *pp; if (! stab_demangle_class (minfo, pp, (const char **) NULL) || ! stab_demangle_remember_type (minfo, hold, *pp - hold)) - return FALSE; - expect_func = TRUE; + return false; + expect_func = true; hold = NULL; break; @@ -4079,10 +4079,10 @@ stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) /* Function. I don't know if this actually happens with g++ output. */ hold = NULL; - func_done = TRUE; + func_done = true; ++*pp; if (! stab_demangle_args (minfo, pp, &minfo->args, &minfo->varargs)) - return FALSE; + return false; break; case 't': @@ -4091,9 +4091,9 @@ stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) hold = *pp; if (! stab_demangle_template (minfo, pp, (char **) NULL) || ! stab_demangle_remember_type (minfo, hold, *pp - hold)) - return FALSE; + return false; hold = NULL; - expect_func = TRUE; + expect_func = true; break; case '_': @@ -4103,22 +4103,22 @@ stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) has been mangled by some algorithm we don't know how to deal with. So just reject the entire demangling. */ stab_bad_demangle (orig); - return FALSE; + return false; default: /* Assume we have stumbled onto the first outermost function argument token, and start processing args. */ - func_done = TRUE; + func_done = true; if (! stab_demangle_args (minfo, pp, &minfo->args, &minfo->varargs)) - return FALSE; + return false; break; } if (expect_func) { - func_done = TRUE; + func_done = true; if (! stab_demangle_args (minfo, pp, &minfo->args, &minfo->varargs)) - return FALSE; + return false; } } @@ -4129,16 +4129,16 @@ stab_demangle_signature (struct stab_demangle_info *minfo, const char **pp) first case, and need to ensure that the '(void)' gets added to the current declp. */ if (! stab_demangle_args (minfo, pp, &minfo->args, &minfo->varargs)) - return FALSE; + return false; } - return TRUE; + return true; } /* Demangle a qualified name, such as "Q25Outer5Inner" which is the mangled form of "Outer::Inner". */ -static bfd_boolean +static bool stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, debug_type *ptype) { @@ -4159,7 +4159,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, if (! ISDIGIT (*p) || *p == '0') { stab_bad_demangle (orig); - return FALSE; + return false; } qualifiers = atoi (p); while (ISDIGIT (*p)) @@ -4167,7 +4167,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, if (*p != '_') { stab_bad_demangle (orig); - return FALSE; + return false; } *pp = p + 1; break; @@ -4184,7 +4184,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, case '0': default: stab_bad_demangle (orig); - return FALSE; + return false; } context = DEBUG_TYPE_NULL; @@ -4200,7 +4200,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, if (! stab_demangle_template (minfo, pp, ptype != NULL ? &name : NULL)) - return FALSE; + return false; if (ptype != NULL) { @@ -4209,7 +4209,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, DEBUG_KIND_CLASS); free (name); if (context == DEBUG_TYPE_NULL) - return FALSE; + return false; } } else @@ -4220,7 +4220,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, if (strlen (*pp) < len) { stab_bad_demangle (orig); - return FALSE; + return false; } if (ptype != NULL) @@ -4256,7 +4256,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, if (ft == NULL) { free (name); - return FALSE; + return false; } dn = debug_get_type_name (minfo->dhandle, ft); if (dn != NULL && strcmp (dn, name) == 0) @@ -4294,7 +4294,7 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, ? DEBUG_KIND_ILLEGAL : DEBUG_KIND_CLASS)); if (context == DEBUG_TYPE_NULL) - return FALSE; + return false; } } } @@ -4306,13 +4306,13 @@ stab_demangle_qualified (struct stab_demangle_info *minfo, const char **pp, if (ptype != NULL) *ptype = context; - return TRUE; + return true; } /* Demangle a template. If PNAME is not NULL, this sets *PNAME to a string representation of the template. */ -static bfd_boolean +static bool stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, char **pname) { @@ -4328,7 +4328,7 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, if (r == 0 || strlen (*pp) < r) { stab_bad_demangle (orig); - return FALSE; + return false; } *pp += r; @@ -4336,7 +4336,7 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, if (stab_demangle_get_count (pp, &r) == 0) { stab_bad_demangle (orig); - return FALSE; + return false; } for (i = 0; i < r; i++) @@ -4346,26 +4346,26 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, /* This is a type parameter. */ ++*pp; if (! stab_demangle_type (minfo, pp, (debug_type *) NULL)) - return FALSE; + return false; } else { const char *old_p; - bfd_boolean pointerp, realp, integralp, charp, boolp; - bfd_boolean done; + bool pointerp, realp, integralp, charp, boolp; + bool done; old_p = *pp; - pointerp = FALSE; - realp = FALSE; - integralp = FALSE; - charp = FALSE; - boolp = FALSE; - done = FALSE; + pointerp = false; + realp = false; + integralp = false; + charp = false; + boolp = false; + done = false; /* This is a value parameter. */ if (! stab_demangle_type (minfo, pp, (debug_type *) NULL)) - return FALSE; + return false; while (*old_p != '\0' && ! done) { @@ -4374,8 +4374,8 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, case 'P': case 'p': case 'R': - pointerp = TRUE; - done = TRUE; + pointerp = true; + done = true; break; case 'C': /* Const. */ case 'S': /* Signed. */ @@ -4387,8 +4387,8 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, ++old_p; break; case 'Q': /* Qualified name. */ - integralp = TRUE; - done = TRUE; + integralp = true; + done = true; break; case 'T': /* Remembered type. */ abort (); @@ -4399,27 +4399,27 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, case 'i': /* Int. */ case 's': /* Short. */ case 'w': /* Wchar_t. */ - integralp = TRUE; - done = TRUE; + integralp = true; + done = true; break; case 'b': /* Bool. */ - boolp = TRUE; - done = TRUE; + boolp = true; + done = true; break; case 'c': /* Char. */ - charp = TRUE; - done = TRUE; + charp = true; + done = true; break; case 'r': /* Long double. */ case 'd': /* Double. */ case 'f': /* Float. */ - realp = TRUE; - done = TRUE; + realp = true; + done = true; break; default: /* Assume it's a user defined integral type. */ - integralp = TRUE; - done = TRUE; + integralp = true; + done = true; break; } } @@ -4441,7 +4441,7 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, if (val == 0) { stab_bad_demangle (orig); - return FALSE; + return false; } } else if (boolp) @@ -4452,7 +4452,7 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, if (val != 0 && val != 1) { stab_bad_demangle (orig); - return FALSE; + return false; } } else if (realp) @@ -4482,7 +4482,7 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, if (len == 0) { stab_bad_demangle (orig); - return FALSE; + return false; } *pp += len; } @@ -4512,7 +4512,7 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, { stab_bad_demangle (orig); free (s3); - return FALSE; + return false; } /* Eliminating all spaces, except those between > characters, @@ -4528,12 +4528,12 @@ stab_demangle_template (struct stab_demangle_info *minfo, const char **pp, free (s3); } - return TRUE; + return true; } /* Demangle a class name. */ -static bfd_boolean +static bool stab_demangle_class (struct stab_demangle_info *minfo ATTRIBUTE_UNUSED, const char **pp, const char **pstart) { @@ -4546,7 +4546,7 @@ stab_demangle_class (struct stab_demangle_info *minfo ATTRIBUTE_UNUSED, if (strlen (*pp) < n) { stab_bad_demangle (orig); - return FALSE; + return false; } if (pstart != NULL) @@ -4554,15 +4554,15 @@ stab_demangle_class (struct stab_demangle_info *minfo ATTRIBUTE_UNUSED, *pp += n; - return TRUE; + return true; } /* Demangle function arguments. If the pargs argument is not NULL, it is set to a NULL terminated array holding the arguments. */ -static bfd_boolean +static bool stab_demangle_args (struct stab_demangle_info *minfo, const char **pp, - debug_type **pargs, bfd_boolean *pvarargs) + debug_type **pargs, bool *pvarargs) { const char *orig; unsigned int alloc, count; @@ -4573,7 +4573,7 @@ stab_demangle_args (struct stab_demangle_info *minfo, const char **pp, if (pargs != NULL) { *pargs = (debug_type *) xmalloc (alloc * sizeof **pargs); - *pvarargs = FALSE; + *pvarargs = false; } count = 0; @@ -4594,20 +4594,20 @@ stab_demangle_args (struct stab_demangle_info *minfo, const char **pp, if (! stab_demangle_get_count (pp, &r)) { stab_bad_demangle (orig); - return FALSE; + return false; } } if (! stab_demangle_get_count (pp, &t)) { stab_bad_demangle (orig); - return FALSE; + return false; } if (t >= minfo->typestring_count) { stab_bad_demangle (orig); - return FALSE; + return false; } while (r-- > 0) { @@ -4615,13 +4615,13 @@ stab_demangle_args (struct stab_demangle_info *minfo, const char **pp, tem = minfo->typestrings[t].typestring; if (! stab_demangle_arg (minfo, &tem, pargs, &count, &alloc)) - return FALSE; + return false; } } else { if (! stab_demangle_arg (minfo, pp, pargs, &count, &alloc)) - return FALSE; + return false; } } @@ -4631,16 +4631,16 @@ stab_demangle_args (struct stab_demangle_info *minfo, const char **pp, if (**pp == 'e') { if (pargs != NULL) - *pvarargs = TRUE; + *pvarargs = true; ++*pp; } - return TRUE; + return true; } /* Demangle a single argument. */ -static bfd_boolean +static bool stab_demangle_arg (struct stab_demangle_info *minfo, const char **pp, debug_type **pargs, unsigned int *pcount, unsigned int *palloc) @@ -4652,12 +4652,12 @@ stab_demangle_arg (struct stab_demangle_info *minfo, const char **pp, if (! stab_demangle_type (minfo, pp, pargs == NULL ? (debug_type *) NULL : &type) || ! stab_demangle_remember_type (minfo, start, *pp - start)) - return FALSE; + return false; if (pargs != NULL) { if (type == DEBUG_TYPE_NULL) - return FALSE; + return false; if (*pcount + 1 >= *palloc) { @@ -4669,13 +4669,13 @@ stab_demangle_arg (struct stab_demangle_info *minfo, const char **pp, ++*pcount; } - return TRUE; + return true; } /* Demangle a type. If the ptype argument is not NULL, *ptype is set to the newly allocated type. */ -static bfd_boolean +static bool stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, debug_type *ptype) { @@ -4690,7 +4690,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, /* A pointer type. */ ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; if (ptype != NULL) *ptype = debug_make_pointer_type (minfo->dhandle, *ptype); break; @@ -4699,7 +4699,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, /* A reference type. */ ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; if (ptype != NULL) *ptype = debug_make_reference_type (minfo->dhandle, *ptype); break; @@ -4716,7 +4716,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, if (! ISDIGIT (**pp)) { stab_bad_demangle (orig); - return FALSE; + return false; } high *= 10; high += **pp - '0'; @@ -4725,21 +4725,21 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, if (**pp != '_') { stab_bad_demangle (orig); - return FALSE; + return false; } ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; if (ptype != NULL) { debug_type int_type; int_type = debug_find_named_type (minfo->dhandle, "int"); if (int_type == NULL) - int_type = debug_make_int_type (minfo->dhandle, 4, FALSE); + int_type = debug_make_int_type (minfo->dhandle, 4, false); *ptype = debug_make_array_type (minfo->dhandle, *ptype, int_type, - 0, high, FALSE); + 0, high, false); } } break; @@ -4754,16 +4754,16 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, if (! stab_demangle_get_count (pp, &i)) { stab_bad_demangle (orig); - return FALSE; + return false; } if (i >= minfo->typestring_count) { stab_bad_demangle (orig); - return FALSE; + return false; } p = minfo->typestrings[i].typestring; if (! stab_demangle_type (minfo, &p, ptype)) - return FALSE; + return false; } break; @@ -4771,7 +4771,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, /* A function. */ { debug_type *args; - bfd_boolean varargs; + bool varargs; ++*pp; if (! stab_demangle_args (minfo, pp, @@ -4779,20 +4779,20 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, ? (debug_type **) NULL : &args), (ptype == NULL - ? (bfd_boolean *) NULL + ? (bool *) NULL : &varargs))) - return FALSE; + return false; if (**pp != '_') { /* cplus_demangle will accept a function without a return type, but I don't know when that will happen, or what to do if it does. */ stab_bad_demangle (orig); - return FALSE; + return false; } ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; if (ptype != NULL) *ptype = debug_make_function_type (minfo->dhandle, *ptype, args, varargs); @@ -4803,16 +4803,16 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, case 'M': case 'O': { - bfd_boolean memberp; + bool memberp; debug_type class_type = DEBUG_TYPE_NULL; debug_type *args; - bfd_boolean varargs; + bool varargs; unsigned int n; const char *name; memberp = **pp == 'M'; args = NULL; - varargs = FALSE; + varargs = false; ++*pp; if (ISDIGIT (**pp)) @@ -4821,7 +4821,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, if (strlen (*pp) < n) { stab_bad_demangle (orig); - return FALSE; + return false; } name = *pp; *pp += n; @@ -4833,7 +4833,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, name, (int) n, DEBUG_KIND_CLASS); if (class_type == DEBUG_TYPE_NULL) - return FALSE; + return false; } } else if (**pp == 'Q') @@ -4842,12 +4842,12 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, (ptype == NULL ? (debug_type *) NULL : &class_type))) - return FALSE; + return false; } else { stab_bad_demangle (orig); - return FALSE; + return false; } if (memberp) @@ -4863,7 +4863,7 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, if (**pp != 'F') { stab_bad_demangle (orig); - return FALSE; + return false; } ++*pp; if (! stab_demangle_args (minfo, pp, @@ -4871,20 +4871,20 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, ? (debug_type **) NULL : &args), (ptype == NULL - ? (bfd_boolean *) NULL + ? (bool *) NULL : &varargs))) - return FALSE; + return false; } if (**pp != '_') { stab_bad_demangle (orig); - return FALSE; + return false; } ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; if (ptype != NULL) { @@ -4905,13 +4905,13 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, case 'G': ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; break; case 'C': ++*pp; if (! stab_demangle_type (minfo, pp, ptype)) - return FALSE; + return false; if (ptype != NULL) *ptype = debug_make_const_type (minfo->dhandle, *ptype); break; @@ -4919,64 +4919,64 @@ stab_demangle_type (struct stab_demangle_info *minfo, const char **pp, case 'Q': { if (! stab_demangle_qualified (minfo, pp, ptype)) - return FALSE; + return false; } break; default: if (! stab_demangle_fund_type (minfo, pp, ptype)) - return FALSE; + return false; break; } - return TRUE; + return true; } /* Demangle a fundamental type. If the ptype argument is not NULL, *ptype is set to the newly allocated type. */ -static bfd_boolean +static bool stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, debug_type *ptype) { const char *orig; - bfd_boolean constp, volatilep, unsignedp, signedp; - bfd_boolean done; + bool constp, volatilep, unsignedp, signedp; + bool done; orig = *pp; - constp = FALSE; - volatilep = FALSE; - unsignedp = FALSE; - signedp = FALSE; + constp = false; + volatilep = false; + unsignedp = false; + signedp = false; - done = FALSE; + done = false; while (! done) { switch (**pp) { case 'C': - constp = TRUE; + constp = true; ++*pp; break; case 'U': - unsignedp = TRUE; + unsignedp = true; ++*pp; break; case 'S': - signedp = TRUE; + signedp = true; ++*pp; break; case 'V': - volatilep = TRUE; + volatilep = true; ++*pp; break; default: - done = TRUE; + done = true; break; } } @@ -5081,7 +5081,7 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, { *ptype = debug_find_named_type (minfo->dhandle, "__wchar_t"); if (*ptype == DEBUG_TYPE_NULL) - *ptype = debug_make_int_type (minfo->dhandle, 2, TRUE); + *ptype = debug_make_int_type (minfo->dhandle, 2, true); } ++*pp; break; @@ -5121,7 +5121,7 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, if (! ISDIGIT (**pp)) { stab_bad_demangle (orig); - return FALSE; + return false; } /* Fall through. */ case '0': case '1': case '2': case '3': case '4': @@ -5130,7 +5130,7 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, const char *hold; if (! stab_demangle_class (minfo, pp, &hold)) - return FALSE; + return false; if (ptype != NULL) { char *name; @@ -5146,7 +5146,7 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, hold, *pp - hold, DEBUG_KIND_ILLEGAL); if (*ptype == DEBUG_TYPE_NULL) - return FALSE; + return false; } } } @@ -5158,7 +5158,7 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, if (! stab_demangle_template (minfo, pp, ptype != NULL ? &name : NULL)) - return FALSE; + return false; if (ptype != NULL) { *ptype = stab_find_tagged_type (minfo->dhandle, minfo->info, @@ -5166,14 +5166,14 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, DEBUG_KIND_CLASS); free (name); if (*ptype == DEBUG_TYPE_NULL) - return FALSE; + return false; } } break; default: stab_bad_demangle (orig); - return FALSE; + return false; } if (ptype != NULL) @@ -5184,12 +5184,12 @@ stab_demangle_fund_type (struct stab_demangle_info *minfo, const char **pp, *ptype = debug_make_volatile_type (minfo->dhandle, *ptype); } - return TRUE; + return true; } /* Remember a type string in a demangled string. */ -static bfd_boolean +static bool stab_demangle_remember_type (struct stab_demangle_info *minfo, const char *p, int len) { @@ -5206,7 +5206,7 @@ stab_demangle_remember_type (struct stab_demangle_info *minfo, minfo->typestrings[minfo->typestring_count].len = (unsigned int) len; ++minfo->typestring_count; - return TRUE; + return true; } /* Demangle names encoded using the g++ V3 ABI. The newer versions of @@ -5221,7 +5221,7 @@ stab_demangle_remember_type (struct stab_demangle_info *minfo, static debug_type * stab_demangle_v3_argtypes (void *dhandle, struct stab_handle *info, - const char *physname, bfd_boolean *pvarargs) + const char *physname, bool *pvarargs) { struct demangle_component *dc; void *mem; @@ -5260,7 +5260,7 @@ stab_demangle_v3_argtypes (void *dhandle, struct stab_handle *info, static debug_type * stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info, struct demangle_component *arglist, - bfd_boolean *pvarargs) + bool *pvarargs) { struct demangle_component *dc; unsigned int alloc, count; @@ -5268,7 +5268,7 @@ stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info, alloc = 10; pargs = (debug_type *) xmalloc (alloc * sizeof *pargs); - *pvarargs = FALSE; + *pvarargs = false; count = 0; @@ -5277,7 +5277,7 @@ stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info, dc = dc->u.s_binary.right) { debug_type arg; - bfd_boolean varargs; + bool varargs; if (dc->type != DEMANGLE_COMPONENT_ARGLIST) { @@ -5297,7 +5297,7 @@ stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info, { if (varargs) { - *pvarargs = TRUE; + *pvarargs = true; continue; } free (pargs); @@ -5325,12 +5325,12 @@ stab_demangle_v3_arglist (void *dhandle, struct stab_handle *info, static debug_type stab_demangle_v3_arg (void *dhandle, struct stab_handle *info, struct demangle_component *dc, debug_type context, - bfd_boolean *pvarargs) + bool *pvarargs) { debug_type dt; if (pvarargs != NULL) - *pvarargs = FALSE; + *pvarargs = false; switch (dc->type) { @@ -5448,7 +5448,7 @@ stab_demangle_v3_arg (void *dhandle, struct stab_handle *info, case DEMANGLE_COMPONENT_FUNCTION_TYPE: { debug_type *pargs; - bfd_boolean varargs; + bool varargs; if (dc->u.s_binary.left == NULL) { @@ -5492,11 +5492,11 @@ stab_demangle_v3_arg (void *dhandle, struct stab_handle *info, /* The mangling is based on the type, but does not itself indicate what the sizes are. So we have to guess. */ if (strcmp (p, "signed char") == 0) - ret = debug_make_int_type (dhandle, 1, FALSE); + ret = debug_make_int_type (dhandle, 1, false); else if (strcmp (p, "bool") == 0) ret = debug_make_bool_type (dhandle, 1); else if (strcmp (p, "char") == 0) - ret = debug_make_int_type (dhandle, 1, FALSE); + ret = debug_make_int_type (dhandle, 1, false); else if (strcmp (p, "double") == 0) ret = debug_make_float_type (dhandle, 8); else if (strcmp (p, "long double") == 0) @@ -5506,37 +5506,37 @@ stab_demangle_v3_arg (void *dhandle, struct stab_handle *info, else if (strcmp (p, "__float128") == 0) ret = debug_make_float_type (dhandle, 16); else if (strcmp (p, "unsigned char") == 0) - ret = debug_make_int_type (dhandle, 1, TRUE); + ret = debug_make_int_type (dhandle, 1, true); else if (strcmp (p, "int") == 0) - ret = debug_make_int_type (dhandle, 4, FALSE); + ret = debug_make_int_type (dhandle, 4, false); else if (strcmp (p, "unsigned int") == 0) - ret = debug_make_int_type (dhandle, 4, TRUE); + ret = debug_make_int_type (dhandle, 4, true); else if (strcmp (p, "long") == 0) - ret = debug_make_int_type (dhandle, 4, FALSE); + ret = debug_make_int_type (dhandle, 4, false); else if (strcmp (p, "unsigned long") == 0) - ret = debug_make_int_type (dhandle, 4, TRUE); + ret = debug_make_int_type (dhandle, 4, true); else if (strcmp (p, "__int128") == 0) - ret = debug_make_int_type (dhandle, 16, FALSE); + ret = debug_make_int_type (dhandle, 16, false); else if (strcmp (p, "unsigned __int128") == 0) - ret = debug_make_int_type (dhandle, 16, TRUE); + ret = debug_make_int_type (dhandle, 16, true); else if (strcmp (p, "short") == 0) - ret = debug_make_int_type (dhandle, 2, FALSE); + ret = debug_make_int_type (dhandle, 2, false); else if (strcmp (p, "unsigned short") == 0) - ret = debug_make_int_type (dhandle, 2, TRUE); + ret = debug_make_int_type (dhandle, 2, true); else if (strcmp (p, "void") == 0) ret = debug_make_void_type (dhandle); else if (strcmp (p, "wchar_t") == 0) - ret = debug_make_int_type (dhandle, 4, TRUE); + ret = debug_make_int_type (dhandle, 4, true); else if (strcmp (p, "long long") == 0) - ret = debug_make_int_type (dhandle, 8, FALSE); + ret = debug_make_int_type (dhandle, 8, false); else if (strcmp (p, "unsigned long long") == 0) - ret = debug_make_int_type (dhandle, 8, TRUE); + ret = debug_make_int_type (dhandle, 8, true); else if (strcmp (p, "...") == 0) { if (pvarargs == NULL) fprintf (stderr, _("Unexpected demangled varargs\n")); else - *pvarargs = TRUE; + *pvarargs = true; ret = NULL; } else |