diff options
Diffstat (limited to 'contrib/gdb/gdb/gdbtypes.c')
-rw-r--r-- | contrib/gdb/gdb/gdbtypes.c | 2546 |
1 files changed, 1538 insertions, 1008 deletions
diff --git a/contrib/gdb/gdb/gdbtypes.c b/contrib/gdb/gdb/gdbtypes.c index 0393462..a13847e 100644 --- a/contrib/gdb/gdb/gdbtypes.c +++ b/contrib/gdb/gdb/gdbtypes.c @@ -1,22 +1,24 @@ /* Support routines for manipulating internal types for GDB. - Copyright (C) 1992, 93, 94, 95, 96, 1998 Free Software Foundation, Inc. + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Free Software Foundation, Inc. Contributed by Cygnus Support, using pieces from other GDB modules. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "gdb_string.h" @@ -32,12 +34,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "demangle.h" #include "complaints.h" #include "gdbcmd.h" +#include "wrapper.h" +#include "cp-abi.h" +#include "gdb_assert.h" /* These variables point to the objects representing the predefined C data types. */ struct type *builtin_type_void; struct type *builtin_type_char; +struct type *builtin_type_true_char; struct type *builtin_type_short; struct type *builtin_type_int; struct type *builtin_type_long; @@ -62,30 +68,65 @@ struct type *builtin_type_int32; struct type *builtin_type_uint32; struct type *builtin_type_int64; struct type *builtin_type_uint64; +struct type *builtin_type_int128; +struct type *builtin_type_uint128; struct type *builtin_type_bool; +struct type *builtin_type_v4sf; +struct type *builtin_type_v4si; +struct type *builtin_type_v16qi; +struct type *builtin_type_v8qi; +struct type *builtin_type_v8hi; +struct type *builtin_type_v4hi; +struct type *builtin_type_v2si; +struct type *builtin_type_vec128; +struct type *builtin_type_ieee_single_big; +struct type *builtin_type_ieee_single_little; +struct type *builtin_type_ieee_double_big; +struct type *builtin_type_ieee_double_little; +struct type *builtin_type_ieee_double_littlebyte_bigword; +struct type *builtin_type_i387_ext; +struct type *builtin_type_m68881_ext; +struct type *builtin_type_i960_ext; +struct type *builtin_type_m88110_ext; +struct type *builtin_type_m88110_harris_ext; +struct type *builtin_type_arm_ext_big; +struct type *builtin_type_arm_ext_littlebyte_bigword; +struct type *builtin_type_ia64_spill_big; +struct type *builtin_type_ia64_spill_little; +struct type *builtin_type_ia64_quad_big; +struct type *builtin_type_ia64_quad_little; +struct type *builtin_type_void_data_ptr; +struct type *builtin_type_void_func_ptr; +struct type *builtin_type_CORE_ADDR; +struct type *builtin_type_bfd_vma; int opaque_type_resolution = 1; +int overload_debug = 0; +struct extra + { + char str[128]; + int len; + }; /* maximum extension is 128! FIXME */ -struct extra { char str[128]; int len; }; /* maximum extention is 128! FIXME */ - -static void add_name PARAMS ((struct extra *, char *)); -static void add_mangled_type PARAMS ((struct extra *, struct type *)); +static void add_name (struct extra *, char *); +static void add_mangled_type (struct extra *, struct type *); #if 0 -static void cfront_mangle_name PARAMS ((struct type *, int, int)); +static void cfront_mangle_name (struct type *, int, int); #endif -static void print_bit_vector PARAMS ((B_TYPE *, int)); -static void print_arg_types PARAMS ((struct type **, int)); -static void dump_fn_fieldlists PARAMS ((struct type *, int)); -static void print_cplus_stuff PARAMS ((struct type *, int)); +static void print_bit_vector (B_TYPE *, int); +static void print_arg_types (struct type **, int); +static void dump_fn_fieldlists (struct type *, int); +static void print_cplus_stuff (struct type *, int); +static void virtual_base_list_aux (struct type *dclass); + /* Alloc a new type structure and fill it with some defaults. If OBJFILE is non-NULL, then allocate the space for the type structure in that objfile's type_obstack. */ struct type * -alloc_type (objfile) - struct objfile *objfile; +alloc_type (struct objfile *objfile) { register struct type *type; @@ -93,12 +134,12 @@ alloc_type (objfile) if (objfile == NULL) { - type = (struct type *) xmalloc (sizeof (struct type)); + type = (struct type *) xmalloc (sizeof (struct type)); } else { - type = (struct type *) obstack_alloc (&objfile -> type_obstack, - sizeof (struct type)); + type = (struct type *) obstack_alloc (&objfile->type_obstack, + sizeof (struct type)); OBJSTAT (objfile, n_types++); } memset ((char *) type, 0, sizeof (struct type)); @@ -108,7 +149,8 @@ alloc_type (objfile) TYPE_CODE (type) = TYPE_CODE_UNDEF; TYPE_OBJFILE (type) = objfile; TYPE_VPTR_FIELDNO (type) = -1; - TYPE_CV_TYPE (type) = type; /* chain back to itself */ + TYPE_CV_TYPE (type) = type; /* chain back to itself */ + TYPE_AS_TYPE (type) = type; /* ditto */ return (type); } @@ -119,24 +161,22 @@ alloc_type (objfile) We allocate new memory if needed. */ struct type * -make_pointer_type (type, typeptr) - struct type *type; - struct type **typeptr; +make_pointer_type (struct type *type, struct type **typeptr) { - register struct type *ntype; /* New type */ + register struct type *ntype; /* New type */ struct objfile *objfile; ntype = TYPE_POINTER_TYPE (type); - if (ntype) + if (ntype) { - if (typeptr == 0) - return ntype; /* Don't care about alloc, and have new type. */ + if (typeptr == 0) + return ntype; /* Don't care about alloc, and have new type. */ else if (*typeptr == 0) - { + { *typeptr = ntype; /* Tracking alloc, and we have new type. */ return ntype; - } + } } if (typeptr == 0 || *typeptr == 0) /* We'll need to allocate one. */ @@ -145,7 +185,8 @@ make_pointer_type (type, typeptr) if (typeptr) *typeptr = ntype; } - else /* We have storage, but need to reset it. */ + else + /* We have storage, but need to reset it. */ { ntype = *typeptr; objfile = TYPE_OBJFILE (ntype); @@ -161,9 +202,11 @@ make_pointer_type (type, typeptr) TYPE_LENGTH (ntype) = TARGET_PTR_BIT / TARGET_CHAR_BIT; TYPE_CODE (ntype) = TYPE_CODE_PTR; - /* pointers are unsigned */ + /* Mark pointers as unsigned. The target converts between pointers + and addresses (CORE_ADDRs) using POINTER_TO_ADDRESS() and + ADDRESS_TO_POINTER(). */ TYPE_FLAGS (ntype) |= TYPE_FLAG_UNSIGNED; - + if (!TYPE_POINTER_TYPE (type)) /* Remember it, if don't have one. */ TYPE_POINTER_TYPE (type) = ntype; @@ -174,10 +217,9 @@ make_pointer_type (type, typeptr) May need to construct such a type if this is the first use. */ struct type * -lookup_pointer_type (type) - struct type *type; +lookup_pointer_type (struct type *type) { - return make_pointer_type (type, (struct type **)0); + return make_pointer_type (type, (struct type **) 0); } /* Lookup a C++ `reference' to a type TYPE. TYPEPTR, if nonzero, points @@ -186,24 +228,22 @@ lookup_pointer_type (type) We allocate new memory if needed. */ struct type * -make_reference_type (type, typeptr) - struct type *type; - struct type **typeptr; +make_reference_type (struct type *type, struct type **typeptr) { - register struct type *ntype; /* New type */ + register struct type *ntype; /* New type */ struct objfile *objfile; ntype = TYPE_REFERENCE_TYPE (type); - if (ntype) + if (ntype) { - if (typeptr == 0) - return ntype; /* Don't care about alloc, and have new type. */ + if (typeptr == 0) + return ntype; /* Don't care about alloc, and have new type. */ else if (*typeptr == 0) - { + { *typeptr = ntype; /* Tracking alloc, and we have new type. */ return ntype; - } + } } if (typeptr == 0 || *typeptr == 0) /* We'll need to allocate one. */ @@ -212,7 +252,8 @@ make_reference_type (type, typeptr) if (typeptr) *typeptr = ntype; } - else /* We have storage, but need to reset it. */ + else + /* We have storage, but need to reset it. */ { ntype = *typeptr; objfile = TYPE_OBJFILE (ntype); @@ -228,7 +269,7 @@ make_reference_type (type, typeptr) TYPE_LENGTH (ntype) = TARGET_PTR_BIT / TARGET_CHAR_BIT; TYPE_CODE (ntype) = TYPE_CODE_REF; - + if (!TYPE_REFERENCE_TYPE (type)) /* Remember it, if don't have one. */ TYPE_REFERENCE_TYPE (type) = ntype; @@ -238,10 +279,9 @@ make_reference_type (type, typeptr) /* Same as above, but caller doesn't care about memory allocation details. */ struct type * -lookup_reference_type (type) - struct type *type; +lookup_reference_type (struct type *type) { - return make_reference_type (type, (struct type **)0); + return make_reference_type (type, (struct type **) 0); } /* Lookup a function type that returns type TYPE. TYPEPTR, if nonzero, points @@ -250,11 +290,9 @@ lookup_reference_type (type) We allocate new memory if needed. */ struct type * -make_function_type (type, typeptr) - struct type *type; - struct type **typeptr; +make_function_type (struct type *type, struct type **typeptr) { - register struct type *ntype; /* New type */ + register struct type *ntype; /* New type */ struct objfile *objfile; if (typeptr == 0 || *typeptr == 0) /* We'll need to allocate one. */ @@ -263,7 +301,8 @@ make_function_type (type, typeptr) if (typeptr) *typeptr = ntype; } - else /* We have storage, but need to reset it. */ + else + /* We have storage, but need to reset it. */ { ntype = *typeptr; objfile = TYPE_OBJFILE (ntype); @@ -275,7 +314,7 @@ make_function_type (type, typeptr) TYPE_LENGTH (ntype) = 1; TYPE_CODE (ntype) = TYPE_CODE_FUNC; - + return ntype; } @@ -284,10 +323,76 @@ make_function_type (type, typeptr) May need to construct such a type if this is the first use. */ struct type * -lookup_function_type (type) - struct type *type; +lookup_function_type (struct type *type) +{ + return make_function_type (type, (struct type **) 0); +} + +/* Identify address space identifier by name -- + return the integer flag defined in gdbtypes.h. */ +extern int +address_space_name_to_int (char *space_identifier) +{ + /* Check for known address space delimiters. */ + if (!strcmp (space_identifier, "code")) + return TYPE_FLAG_CODE_SPACE; + else if (!strcmp (space_identifier, "data")) + return TYPE_FLAG_DATA_SPACE; + else + error ("Unknown address space specifier: \"%s\"", space_identifier); +} + +/* Identify address space identifier by integer flag as defined in + gdbtypes.h -- return the string version of the adress space name. */ + +extern char * +address_space_int_to_name (int space_flag) +{ + if (space_flag & TYPE_FLAG_CODE_SPACE) + return "code"; + else if (space_flag & TYPE_FLAG_DATA_SPACE) + return "data"; + else + return NULL; +} + +/* Make an address-space-delimited variant of a type -- a type that + is identical to the one supplied except that it has an address + space attribute attached to it (such as "code" or "data"). + + This is for Harvard architectures. */ + +struct type * +make_type_with_address_space (struct type *type, int space_flag) { - return make_function_type (type, (struct type **)0); + struct type *ntype; + + ntype = type; + do { + if ((ntype->flags & space_flag) != 0) + return ntype; + ntype = TYPE_AS_TYPE (ntype); + } while (ntype != type); + + /* Create a new, duplicate type. */ + ntype = alloc_type (TYPE_OBJFILE (type)); + /* Copy original type. */ + memcpy ((char *) ntype, (char *) type, sizeof (struct type)); + + /* Pointers or references to the original type are not relevant to + the new type; but if the original type is a pointer, the new type + points to the same thing (so TYPE_TARGET_TYPE remains unchanged). */ + TYPE_POINTER_TYPE (ntype) = (struct type *) 0; + TYPE_REFERENCE_TYPE (ntype) = (struct type *) 0; + TYPE_CV_TYPE (ntype) = ntype; + + /* Chain the new address-space-specific type to the old type. */ + ntype->as_type = type->as_type; + type->as_type = ntype; + + /* Now set the address-space flag, and return the new type. */ + ntype->flags |= space_flag; + return ntype; } @@ -302,14 +407,10 @@ lookup_function_type (type) We allocate new memory if needed. */ struct type * -make_cv_type (cnst, voltl, type, typeptr) - int cnst; - int voltl; - struct type *type; - struct type **typeptr; -{ - register struct type *ntype; /* New type */ - register struct type *tmp_type = type; /* tmp type */ +make_cv_type (int cnst, int voltl, struct type *type, struct type **typeptr) +{ + register struct type *ntype; /* New type */ + register struct type *tmp_type = type; /* tmp type */ struct objfile *objfile; ntype = TYPE_CV_TYPE (type); @@ -317,16 +418,16 @@ make_cv_type (cnst, voltl, type, typeptr) while (ntype != type) { if ((TYPE_CONST (ntype) == cnst) && - (TYPE_VOLATILE (ntype) == voltl)) - { - if (typeptr == 0) - return ntype; - else if (*typeptr == 0) - { - *typeptr = ntype; /* Tracking alloc, and we have new type. */ - return ntype; - } - } + (TYPE_VOLATILE (ntype) == voltl)) + { + if (typeptr == 0) + return ntype; + else if (*typeptr == 0) + { + *typeptr = ntype; /* Tracking alloc, and we have new type. */ + return ntype; + } + } tmp_type = ntype; ntype = TYPE_CV_TYPE (ntype); } @@ -337,7 +438,8 @@ make_cv_type (cnst, voltl, type, typeptr) if (typeptr) *typeptr = ntype; } - else /* We have storage, but need to reset it. */ + else + /* We have storage, but need to reset it. */ { ntype = *typeptr; objfile = TYPE_OBJFILE (ntype); @@ -345,23 +447,24 @@ make_cv_type (cnst, voltl, type, typeptr) TYPE_OBJFILE (ntype) = objfile; } - /* Copy original type */ + /* Copy original type */ memcpy ((char *) ntype, (char *) type, sizeof (struct type)); /* But zero out fields that shouldn't be copied */ - TYPE_POINTER_TYPE (ntype) = (struct type *) 0; /* Need new pointer kind */ - TYPE_REFERENCE_TYPE (ntype) = (struct type *) 0; /* Need new referene kind */ + TYPE_POINTER_TYPE (ntype) = (struct type *) 0; /* Need new pointer kind */ + TYPE_REFERENCE_TYPE (ntype) = (struct type *) 0; /* Need new referene kind */ + TYPE_AS_TYPE (ntype) = ntype; /* Need new address-space kind. */ /* Note: TYPE_TARGET_TYPE can be left as is */ /* Set flags appropriately */ if (cnst) - TYPE_FLAGS (ntype) |= TYPE_FLAG_CONST; + TYPE_FLAGS (ntype) |= TYPE_FLAG_CONST; else - TYPE_FLAGS (ntype) &= ~TYPE_FLAG_CONST; + TYPE_FLAGS (ntype) &= ~TYPE_FLAG_CONST; if (voltl) - TYPE_FLAGS (ntype) |= TYPE_FLAG_VOLATILE; + TYPE_FLAGS (ntype) |= TYPE_FLAG_VOLATILE; else - TYPE_FLAGS (ntype) &= ~TYPE_FLAG_VOLATILE; + TYPE_FLAGS (ntype) &= ~TYPE_FLAG_VOLATILE; /* Fix the chain of cv variants */ TYPE_CV_TYPE (ntype) = type; @@ -370,8 +473,77 @@ make_cv_type (cnst, voltl, type, typeptr) return ntype; } +/* When reading in a class type, we may have created references to + cv-qualified versions of the type (in method arguments, for + instance). Update everything on the cv ring from the primary + type TYPE. + + The only reason we do not need to do the same thing for address + spaces is that type readers do not create address space qualified + types. */ +void +finish_cv_type (struct type *type) +{ + struct type *ntype, *cv_type, *ptr_type, *ref_type; + int cv_flags; + + gdb_assert (!TYPE_CONST (type) && !TYPE_VOLATILE (type)); + + ntype = type; + while ((ntype = TYPE_CV_TYPE (ntype)) != type) + { + /* Save cv_flags. */ + cv_flags = TYPE_FLAGS (ntype) & (TYPE_FLAG_VOLATILE | TYPE_FLAG_CONST); + /* If any reference or pointer types were created, save them too. */ + ptr_type = TYPE_POINTER_TYPE (ntype); + ref_type = TYPE_REFERENCE_TYPE (ntype); + /* Don't disturb the CV chain. */ + cv_type = TYPE_CV_TYPE (ntype); + + /* Verify that we haven't added any address-space qualified types, + for the future. */ + gdb_assert (ntype == TYPE_AS_TYPE (ntype)); + + /* Copy original type */ + memcpy ((char *) ntype, (char *) type, sizeof (struct type)); + + /* Restore everything. */ + TYPE_POINTER_TYPE (ntype) = ptr_type; + TYPE_REFERENCE_TYPE (ntype) = ref_type; + TYPE_CV_TYPE (ntype) = cv_type; + TYPE_FLAGS (ntype) = TYPE_FLAGS (ntype) | cv_flags; + + TYPE_AS_TYPE (ntype) = ntype; + } +} + +/* Replace the contents of ntype with the type *type. + + This function should not be necessary, but is due to quirks in the stabs + reader. This should go away. It does not handle the replacement type + being cv-qualified; it could be easily fixed to, but it should go away, + remember? */ +void +replace_type (struct type *ntype, struct type *type) +{ + struct type *cv_chain, *as_chain, *ptr, *ref; + + cv_chain = TYPE_CV_TYPE (ntype); + as_chain = TYPE_AS_TYPE (ntype); + ptr = TYPE_POINTER_TYPE (ntype); + ref = TYPE_REFERENCE_TYPE (ntype); + + *ntype = *type; + + TYPE_POINTER_TYPE (ntype) = ptr; + TYPE_REFERENCE_TYPE (ntype) = ref; + TYPE_CV_TYPE (ntype) = cv_chain; + TYPE_AS_TYPE (ntype) = as_chain; + + finish_cv_type (ntype); +} /* Implement direct support for MEMBER_TYPE in GNU C++. May need to construct such a type if this is the first use. @@ -379,9 +551,7 @@ make_cv_type (cnst, voltl, type, typeptr) of the aggregate that the member belongs to. */ struct type * -lookup_member_type (type, domain) - struct type *type; - struct type *domain; +lookup_member_type (struct type *type, struct type *domain) { register struct type *mtype; @@ -397,18 +567,15 @@ lookup_member_type (type, domain) This always returns a fresh type. */ struct type * -allocate_stub_method (type) - struct type *type; +allocate_stub_method (struct type *type) { struct type *mtype; - mtype = alloc_type (TYPE_OBJFILE (type)); + mtype = init_type (TYPE_CODE_METHOD, 1, TYPE_FLAG_STUB, NULL, + TYPE_OBJFILE (type)); TYPE_TARGET_TYPE (mtype) = type; /* _DOMAIN_TYPE (mtype) = unknown yet */ /* _ARG_TYPES (mtype) = unknown yet */ - TYPE_FLAGS (mtype) = TYPE_FLAG_STUB; - TYPE_CODE (mtype) = TYPE_CODE_METHOD; - TYPE_LENGTH (mtype) = 1; return (mtype); } @@ -422,11 +589,8 @@ allocate_stub_method (type) sure it is TYPE_CODE_UNDEF before we bash it into a range type? */ struct type * -create_range_type (result_type, index_type, low_bound, high_bound) - struct type *result_type; - struct type *index_type; - int low_bound; - int high_bound; +create_range_type (struct type *result_type, struct type *index_type, + int low_bound, int high_bound) { if (result_type == NULL) { @@ -434,7 +598,7 @@ create_range_type (result_type, index_type, low_bound, high_bound) } TYPE_CODE (result_type) = TYPE_CODE_RANGE; TYPE_TARGET_TYPE (result_type) = index_type; - if (TYPE_FLAGS (index_type) & TYPE_FLAG_STUB) + if (TYPE_STUB (index_type)) TYPE_FLAGS (result_type) |= TYPE_FLAG_TARGET_STUB; else TYPE_LENGTH (result_type) = TYPE_LENGTH (check_typedef (index_type)); @@ -444,10 +608,10 @@ create_range_type (result_type, index_type, low_bound, high_bound) memset (TYPE_FIELDS (result_type), 0, 2 * sizeof (struct field)); TYPE_FIELD_BITPOS (result_type, 0) = low_bound; TYPE_FIELD_BITPOS (result_type, 1) = high_bound; - TYPE_FIELD_TYPE (result_type, 0) = builtin_type_int; /* FIXME */ - TYPE_FIELD_TYPE (result_type, 1) = builtin_type_int; /* FIXME */ + TYPE_FIELD_TYPE (result_type, 0) = builtin_type_int; /* FIXME */ + TYPE_FIELD_TYPE (result_type, 1) = builtin_type_int; /* FIXME */ - if(low_bound >= 0) + if (low_bound >= 0) TYPE_FLAGS (result_type) |= TYPE_FLAG_UNSIGNED; return (result_type); @@ -458,9 +622,7 @@ create_range_type (result_type, index_type, low_bound, high_bound) will fit in LONGEST), or -1 otherwise. */ int -get_discrete_bounds (type, lowp, highp) - struct type *type; - LONGEST *lowp, *highp; +get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp) { CHECK_TYPEDEF (type); switch (TYPE_CODE (type)) @@ -486,7 +648,7 @@ get_discrete_bounds (type, lowp, highp) } /* Set unsigned indicator if warranted. */ - if(*lowp >= 0) + if (*lowp >= 0) { TYPE_FLAGS (type) |= TYPE_FLAG_UNSIGNED; } @@ -502,11 +664,11 @@ get_discrete_bounds (type, lowp, highp) *highp = 1; return 0; case TYPE_CODE_INT: - if (TYPE_LENGTH (type) > sizeof (LONGEST)) /* Too big */ + if (TYPE_LENGTH (type) > sizeof (LONGEST)) /* Too big */ return -1; if (!TYPE_UNSIGNED (type)) { - *lowp = - (1 << (TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1)); + *lowp = -(1 << (TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1)); *highp = -*lowp - 1; return 0; } @@ -514,8 +676,8 @@ get_discrete_bounds (type, lowp, highp) case TYPE_CODE_CHAR: *lowp = 0; /* This round-about calculation is to avoid shifting by - TYPE_LENGTH (type) * TARGET_CHAR_BIT, which will not work - if TYPE_LENGTH (type) == sizeof (LONGEST). */ + TYPE_LENGTH (type) * TARGET_CHAR_BIT, which will not work + if TYPE_LENGTH (type) == sizeof (LONGEST). */ *highp = 1 << (TYPE_LENGTH (type) * TARGET_CHAR_BIT - 1); *highp = (*highp - 1) | *highp; return 0; @@ -534,10 +696,8 @@ get_discrete_bounds (type, lowp, highp) sure it is TYPE_CODE_UNDEF before we bash it into an array type? */ struct type * -create_array_type (result_type, element_type, range_type) - struct type *result_type; - struct type *element_type; - struct type *range_type; +create_array_type (struct type *result_type, struct type *element_type, + struct type *range_type) { LONGEST low_bound, high_bound; @@ -578,9 +738,7 @@ create_array_type (result_type, element_type, range_type) sure it is TYPE_CODE_UNDEF before we bash it into a string type? */ struct type * -create_string_type (result_type, range_type) - struct type *result_type; - struct type *range_type; +create_string_type (struct type *result_type, struct type *range_type) { result_type = create_array_type (result_type, *current_language->string_char_type, @@ -590,9 +748,7 @@ create_string_type (result_type, range_type) } struct type * -create_set_type (result_type, domain_type) - struct type *result_type; - struct type *domain_type; +create_set_type (struct type *result_type, struct type *domain_type) { LONGEST low_bound, high_bound, bit_length; if (result_type == NULL) @@ -605,7 +761,7 @@ create_set_type (result_type, domain_type) TYPE_ALLOC (result_type, 1 * sizeof (struct field)); memset (TYPE_FIELDS (result_type), 0, sizeof (struct field)); - if (! (TYPE_FLAGS (domain_type) & TYPE_FLAG_STUB)) + if (!TYPE_STUB (domain_type)) { if (get_discrete_bounds (domain_type, &low_bound, &high_bound) < 0) low_bound = high_bound = 0; @@ -615,12 +771,94 @@ create_set_type (result_type, domain_type) } TYPE_FIELD_TYPE (result_type, 0) = domain_type; - if(low_bound >= 0) + if (low_bound >= 0) TYPE_FLAGS (result_type) |= TYPE_FLAG_UNSIGNED; return (result_type); } + +/* Construct and return a type of the form: + struct NAME { ELT_TYPE ELT_NAME[N]; } + We use these types for SIMD registers. For example, the type of + the SSE registers on the late x86-family processors is: + struct __builtin_v4sf { float f[4]; } + built by the function call: + init_simd_type ("__builtin_v4sf", builtin_type_float, "f", 4) + The type returned is a permanent type, allocated using malloc; it + doesn't live in any objfile's obstack. */ +static struct type * +init_simd_type (char *name, + struct type *elt_type, + char *elt_name, + int n) +{ + struct type *t; + struct field *f; + + /* Build the field structure. */ + f = xmalloc (sizeof (*f)); + memset (f, 0, sizeof (*f)); + f->loc.bitpos = 0; + f->type = create_array_type (0, elt_type, + create_range_type (0, builtin_type_int, + 0, n-1)); + f->name = elt_name; + + /* Build a struct type with that field. */ + t = init_type (TYPE_CODE_STRUCT, n * TYPE_LENGTH (elt_type), 0, 0, 0); + t->nfields = 1; + t->fields = f; + TYPE_TAG_NAME (t) = name; + + return t; +} + +static struct type * +build_builtin_type_vec128 (void) +{ + /* Construct a type for the 128 bit registers. The type we're + building is this: */ +#if 0 + union __gdb_builtin_type_vec128 + { + struct __builtin_v16qi v16qi; + struct __builtin_v8hi v8hi; + struct __builtin_v4si v4si; + struct __builtin_v4sf v4sf; + uint128_t uint128; + }; +#endif + + struct type *t; + struct field *f; + + f = (struct field *) xcalloc (5, sizeof (*f)); + + FIELD_TYPE (f[0]) = builtin_type_int128; + FIELD_NAME (f[0]) = "uint128"; + + FIELD_TYPE (f[1]) = builtin_type_v4sf; + FIELD_NAME (f[1]) = "v4sf"; + + FIELD_TYPE (f[2]) = builtin_type_v4si; + FIELD_NAME (f[2]) = "v4si"; + + FIELD_TYPE (f[3]) = builtin_type_v8hi; + FIELD_NAME (f[3]) = "v8hi"; + + FIELD_TYPE (f[4]) = builtin_type_v16qi; + FIELD_NAME (f[4]) = "v16qi"; + + /* Build a union type with those fields. */ + t = init_type (TYPE_CODE_UNION, 16, 0, 0, 0); + TYPE_NFIELDS (t) = 5; + TYPE_FIELDS (t) = f; + TYPE_TAG_NAME (t) = "__gdb_builtin_type_vec128"; + + return t; +} + /* Smash TYPE to be a type of members of DOMAIN with type TO_TYPE. A MEMBER is a wierd thing -- it amounts to a typed offset into a struct, e.g. "an int at offset 8". A MEMBER TYPE doesn't @@ -632,10 +870,8 @@ create_set_type (result_type, domain_type) allocated. */ void -smash_to_member_type (type, domain, to_type) - struct type *type; - struct type *domain; - struct type *to_type; +smash_to_member_type (struct type *type, struct type *domain, + struct type *to_type) { struct objfile *objfile; @@ -657,11 +893,8 @@ smash_to_member_type (type, domain, to_type) allocated. */ void -smash_to_method_type (type, domain, to_type, args) - struct type *type; - struct type *domain; - struct type *to_type; - struct type **args; +smash_to_method_type (struct type *type, struct type *domain, + struct type *to_type, struct type **args) { struct objfile *objfile; @@ -680,8 +913,7 @@ smash_to_method_type (type, domain, to_type, args) "union ", or "enum ". If the type has a NULL name, return NULL. */ char * -type_name_no_tag (type) - register const struct type *type; +type_name_no_tag (register const struct type *type) { if (TYPE_TAG_NAME (type) != NULL) return TYPE_TAG_NAME (type); @@ -693,22 +925,21 @@ type_name_no_tag (type) } /* Lookup a primitive type named NAME. - Return zero if NAME is not a primitive type.*/ + Return zero if NAME is not a primitive type. */ struct type * -lookup_primitive_typename (name) - char *name; +lookup_primitive_typename (char *name) { - struct type ** const *p; + struct type **const *p; - for (p = current_language -> la_builtin_type_vector; *p != NULL; p++) - { - if (STREQ ((**p) -> name, name)) - { - return (**p); - } - } - return (NULL); + for (p = current_language->la_builtin_type_vector; *p != NULL; p++) + { + if (STREQ ((**p)->name, name)) + { + return (**p); + } + } + return (NULL); } /* Lookup a typedef or primitive type named NAME, @@ -716,10 +947,7 @@ lookup_primitive_typename (name) If NOERR is nonzero, return zero if NAME is not suitably defined. */ struct type * -lookup_typename (name, block, noerr) - char *name; - struct block *block; - int noerr; +lookup_typename (char *name, struct block *block, int noerr) { register struct symbol *sym; register struct type *tmp; @@ -745,8 +973,7 @@ lookup_typename (name, block, noerr) } struct type * -lookup_unsigned_typename (name) - char *name; +lookup_unsigned_typename (char *name) { char *uns = alloca (strlen (name) + 10); @@ -756,8 +983,7 @@ lookup_unsigned_typename (name) } struct type * -lookup_signed_typename (name) - char *name; +lookup_signed_typename (char *name) { struct type *t; char *uns = alloca (strlen (name) + 8); @@ -775,9 +1001,7 @@ lookup_signed_typename (name) visible in lexical block BLOCK. */ struct type * -lookup_struct (name, block) - char *name; - struct block *block; +lookup_struct (char *name, struct block *block) { register struct symbol *sym; @@ -799,12 +1023,10 @@ lookup_struct (name, block) visible in lexical block BLOCK. */ struct type * -lookup_union (name, block) - char *name; - struct block *block; +lookup_union (char *name, struct block *block) { register struct symbol *sym; - struct type * t; + struct type *t; sym = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); @@ -812,7 +1034,7 @@ lookup_union (name, block) if (sym == NULL) error ("No union type named %s.", name); - t = SYMBOL_TYPE(sym); + t = SYMBOL_TYPE (sym); if (TYPE_CODE (t) == TYPE_CODE_UNION) return (t); @@ -820,8 +1042,8 @@ lookup_union (name, block) /* C++ unions may come out with TYPE_CODE_CLASS, but we look at * a further "declared_type" field to discover it is really a union. */ - if (HAVE_CPLUS_STRUCT (t)) - if (TYPE_DECLARED_TYPE(t) == DECLARED_TYPE_UNION) + if (HAVE_CPLUS_STRUCT (t)) + if (TYPE_DECLARED_TYPE (t) == DECLARED_TYPE_UNION) return (t); /* If we get here, it's not a union */ @@ -833,13 +1055,11 @@ lookup_union (name, block) visible in lexical block BLOCK. */ struct type * -lookup_enum (name, block) - char *name; - struct block *block; +lookup_enum (char *name, struct block *block) { register struct symbol *sym; - sym = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, + sym = lookup_symbol (name, block, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); if (sym == NULL) { @@ -856,19 +1076,16 @@ lookup_enum (name, block) visible in lexical block BLOCK. */ struct type * -lookup_template_type (name, type, block) - char *name; - struct type *type; - struct block *block; +lookup_template_type (char *name, struct type *type, struct block *block) { struct symbol *sym; - char *nam = (char*) alloca(strlen(name) + strlen(type->name) + 4); + char *nam = (char *) alloca (strlen (name) + strlen (type->name) + 4); strcpy (nam, name); strcat (nam, "<"); strcat (nam, type->name); - strcat (nam, " >"); /* FIXME, extra space still introduced in gcc? */ + strcat (nam, " >"); /* FIXME, extra space still introduced in gcc? */ - sym = lookup_symbol (nam, block, VAR_NAMESPACE, 0, (struct symtab **)NULL); + sym = lookup_symbol (nam, block, VAR_NAMESPACE, 0, (struct symtab **) NULL); if (sym == NULL) { @@ -892,10 +1109,7 @@ lookup_template_type (name, type, block) If NAME is the name of a baseclass type, return that type. */ struct type * -lookup_struct_elt_type (type, name, noerr) - struct type *type; - char *name; - int noerr; +lookup_struct_elt_type (struct type *type, char *name, int noerr) { int i; @@ -936,7 +1150,7 @@ lookup_struct_elt_type (type, name, noerr) { char *t_field_name = TYPE_FIELD_NAME (type, i); - if (t_field_name && STREQ (t_field_name, name)) + if (t_field_name && (strcmp_iw (t_field_name, name) == 0)) { return TYPE_FIELD_TYPE (type, i); } @@ -958,7 +1172,7 @@ lookup_struct_elt_type (type, name, noerr) { return NULL; } - + target_terminal_ours (); gdb_flush (gdb_stdout); fprintf_unfiltered (gdb_stderr, "Type "); @@ -966,7 +1180,7 @@ lookup_struct_elt_type (type, name, noerr) fprintf_unfiltered (gdb_stderr, " has no component named "); fputs_filtered (name, gdb_stderr); error ("."); - return (struct type *)-1; /* For lint */ + return (struct type *) -1; /* For lint */ } /* If possible, make the vptr_fieldno and vptr_basetype fields of TYPE @@ -977,8 +1191,7 @@ lookup_struct_elt_type (type, name, noerr) will remain NULL. */ void -fill_in_vptr_fieldno (type) - struct type *type; +fill_in_vptr_fieldno (struct type *type) { CHECK_TYPEDEF (type); @@ -987,7 +1200,7 @@ fill_in_vptr_fieldno (type) int i; /* We must start at zero in case the first (and only) baseclass is - virtual (and hence we cannot share the table pointer). */ + virtual (and hence we cannot share the table pointer). */ for (i = 0; i < TYPE_N_BASECLASSES (type); i++) { fill_in_vptr_fieldno (TYPE_BASECLASS (type, i)); @@ -1007,10 +1220,7 @@ fill_in_vptr_fieldno (type) Return 1 if the destructor was found, otherwise, return 0. */ int -get_destructor_fn_field (t, method_indexp, field_indexp) - struct type *t; - int *method_indexp; - int *field_indexp; +get_destructor_fn_field (struct type *t, int *method_indexp, int *field_indexp) { int i; @@ -1021,7 +1231,7 @@ get_destructor_fn_field (t, method_indexp, field_indexp) for (j = 0; j < TYPE_FN_FIELDLIST_LENGTH (t, i); j++) { - if (DESTRUCTOR_PREFIX_P (TYPE_FN_FIELD_PHYSNAME (f, j))) + if (is_destructor_name (TYPE_FN_FIELD_PHYSNAME (f, j)) != 0) { *method_indexp = i; *field_indexp = j; @@ -1046,18 +1256,19 @@ get_destructor_fn_field (t, method_indexp, field_indexp) often enough to merit such treatment. */ struct complaint stub_noname_complaint = - {"stub type has NULL name", 0, 0}; +{"stub type has NULL name", 0, 0}; struct type * -check_typedef (type) - register struct type *type; +check_typedef (struct type *type) { struct type *orig_type = type; + int is_const, is_volatile; + while (TYPE_CODE (type) == TYPE_CODE_TYPEDEF) { if (!TYPE_TARGET_TYPE (type)) { - char* name; + char *name; struct symbol *sym; /* It is dangerous to call lookup_symbol if we are currently @@ -1075,25 +1286,28 @@ check_typedef (type) complain (&stub_noname_complaint); return type; } - sym = lookup_symbol (name, 0, STRUCT_NAMESPACE, 0, + sym = lookup_symbol (name, 0, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); if (sym) TYPE_TARGET_TYPE (type) = SYMBOL_TYPE (sym); else - TYPE_TARGET_TYPE (type) = alloc_type (NULL); /* TYPE_CODE_UNDEF */ + TYPE_TARGET_TYPE (type) = alloc_type (NULL); /* TYPE_CODE_UNDEF */ } type = TYPE_TARGET_TYPE (type); } + is_const = TYPE_CONST (type); + is_volatile = TYPE_VOLATILE (type); + /* If this is a struct/class/union with no fields, then check whether a full definition exists somewhere else. This is for systems where a type definition with no fields is issued for such types, instead of - identifying them as stub types in the first place */ - + identifying them as stub types in the first place */ + if (TYPE_IS_OPAQUE (type) && opaque_type_resolution && !currently_reading_symtab) { - char * name = type_name_no_tag (type); - struct type * newtype; + char *name = type_name_no_tag (type); + struct type *newtype; if (name == NULL) { complain (&stub_noname_complaint); @@ -1101,18 +1315,16 @@ check_typedef (type) } newtype = lookup_transparent_type (name); if (newtype) - { - memcpy ((char *) type, (char *) newtype, sizeof (struct type)); - } + make_cv_type (is_const, is_volatile, newtype, &type); } /* Otherwise, rely on the stub flag being set for opaque/stubbed types */ - else if ((TYPE_FLAGS(type) & TYPE_FLAG_STUB) && ! currently_reading_symtab) + else if (TYPE_STUB (type) && !currently_reading_symtab) { - char* name = type_name_no_tag (type); + char *name = type_name_no_tag (type); /* FIXME: shouldn't we separately check the TYPE_NAME and the - TYPE_TAG_NAME, and look in STRUCT_NAMESPACE and/or VAR_NAMESPACE - as appropriate? (this code was written before TYPE_NAME and - TYPE_TAG_NAME were separate). */ + TYPE_TAG_NAME, and look in STRUCT_NAMESPACE and/or VAR_NAMESPACE + as appropriate? (this code was written before TYPE_NAME and + TYPE_TAG_NAME were separate). */ struct symbol *sym; if (name == NULL) { @@ -1121,18 +1333,17 @@ check_typedef (type) } sym = lookup_symbol (name, 0, STRUCT_NAMESPACE, 0, (struct symtab **) NULL); if (sym) - { - memcpy ((char *)type, (char *)SYMBOL_TYPE(sym), sizeof (struct type)); - } + make_cv_type (is_const, is_volatile, SYMBOL_TYPE (sym), &type); } - if (TYPE_FLAGS (type) & TYPE_FLAG_TARGET_STUB) + if (TYPE_TARGET_STUB (type)) { struct type *range_type; struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type)); - if (TYPE_FLAGS (target_type) & (TYPE_FLAG_STUB | TYPE_FLAG_TARGET_STUB)) - { } + if (TYPE_STUB (target_type) || TYPE_TARGET_STUB (target_type)) + { + } else if (TYPE_CODE (type) == TYPE_CODE_ARRAY && TYPE_NFIELDS (type) == 1 && (TYPE_CODE (range_type = TYPE_FIELD_TYPE (type, 0)) @@ -1159,201 +1370,225 @@ check_typedef (type) } /* New code added to support parsing of Cfront stabs strings */ -#include <ctype.h> #define INIT_EXTRA { pextras->len=0; pextras->str[0]='\0'; } #define ADD_EXTRA(c) { pextras->str[pextras->len++]=c; } -static void -add_name(pextras,n) - struct extra * pextras; - char * n; +static void +add_name (struct extra *pextras, char *n) { int nlen; - if ((nlen = (n ? strlen(n) : 0))==0) + if ((nlen = (n ? strlen (n) : 0)) == 0) return; - sprintf(pextras->str+pextras->len,"%d%s",nlen,n); - pextras->len=strlen(pextras->str); + sprintf (pextras->str + pextras->len, "%d%s", nlen, n); + pextras->len = strlen (pextras->str); } -static void -add_mangled_type(pextras,t) - struct extra * pextras; - struct type * t; +static void +add_mangled_type (struct extra *pextras, struct type *t) { enum type_code tcode; int tlen, tflags; - char * tname; + char *tname; - tcode = TYPE_CODE(t); - tlen = TYPE_LENGTH(t); - tflags = TYPE_FLAGS(t); - tname = TYPE_NAME(t); + tcode = TYPE_CODE (t); + tlen = TYPE_LENGTH (t); + tflags = TYPE_FLAGS (t); + tname = TYPE_NAME (t); /* args of "..." seem to get mangled as "e" */ - switch (tcode) - { - case TYPE_CODE_INT: - if (tflags==1) - ADD_EXTRA('U'); - switch (tlen) - { - case 1: - ADD_EXTRA('c'); - break; - case 2: - ADD_EXTRA('s'); - break; - case 4: - { - char* pname; - if ((pname=strrchr(tname,'l'),pname) && !strcmp(pname,"long")) - ADD_EXTRA('l') - else - ADD_EXTRA('i') - } - break; - default: - { - - static struct complaint msg = {"Bad int type code length x%x\n",0,0}; - - complain (&msg, tlen); - - } - } - break; - case TYPE_CODE_FLT: - switch (tlen) - { - case 4: - ADD_EXTRA('f'); - break; - case 8: - ADD_EXTRA('d'); - break; - case 16: - ADD_EXTRA('r'); - break; - default: - { - static struct complaint msg = {"Bad float type code length x%x\n",0,0}; - complain (&msg, tlen); - } - } - break; - case TYPE_CODE_REF: - ADD_EXTRA('R'); - /* followed by what it's a ref to */ - break; - case TYPE_CODE_PTR: - ADD_EXTRA('P'); - /* followed by what it's a ptr to */ - break; - case TYPE_CODE_TYPEDEF: - { - static struct complaint msg = {"Typedefs in overloaded functions not yet supported\n",0,0}; - complain (&msg); - } + switch (tcode) + { + case TYPE_CODE_INT: + if (tflags == 1) + ADD_EXTRA ('U'); + switch (tlen) + { + case 1: + ADD_EXTRA ('c'); + break; + case 2: + ADD_EXTRA ('s'); + break; + case 4: + { + char *pname; + if ((pname = strrchr (tname, 'l'), pname) && !strcmp (pname, "long")) + { + ADD_EXTRA ('l'); + } + else + { + ADD_EXTRA ('i'); + } + } + break; + default: + { + + static struct complaint msg = + {"Bad int type code length x%x\n", 0, 0}; + + complain (&msg, tlen); + + } + } + break; + case TYPE_CODE_FLT: + switch (tlen) + { + case 4: + ADD_EXTRA ('f'); + break; + case 8: + ADD_EXTRA ('d'); + break; + case 16: + ADD_EXTRA ('r'); + break; + default: + { + static struct complaint msg = + {"Bad float type code length x%x\n", 0, 0}; + complain (&msg, tlen); + } + } + break; + case TYPE_CODE_REF: + ADD_EXTRA ('R'); + /* followed by what it's a ref to */ + break; + case TYPE_CODE_PTR: + ADD_EXTRA ('P'); + /* followed by what it's a ptr to */ + break; + case TYPE_CODE_TYPEDEF: + { + static struct complaint msg = + {"Typedefs in overloaded functions not yet supported\n", 0, 0}; + complain (&msg); + } /* followed by type bytes & name */ break; case TYPE_CODE_FUNC: - ADD_EXTRA('F'); + ADD_EXTRA ('F'); /* followed by func's arg '_' & ret types */ break; case TYPE_CODE_VOID: - ADD_EXTRA('v'); + ADD_EXTRA ('v'); break; case TYPE_CODE_METHOD: - ADD_EXTRA('M'); + ADD_EXTRA ('M'); /* followed by name of class and func's arg '_' & ret types */ - add_name(pextras,tname); - ADD_EXTRA('F'); /* then mangle function */ + add_name (pextras, tname); + ADD_EXTRA ('F'); /* then mangle function */ break; - case TYPE_CODE_STRUCT: /* C struct */ - case TYPE_CODE_UNION: /* C union */ - case TYPE_CODE_ENUM: /* Enumeration type */ + case TYPE_CODE_STRUCT: /* C struct */ + case TYPE_CODE_UNION: /* C union */ + case TYPE_CODE_ENUM: /* Enumeration type */ /* followed by name of type */ - add_name(pextras,tname); + add_name (pextras, tname); break; - /* errors possible types/not supported */ - case TYPE_CODE_CHAR: - case TYPE_CODE_ARRAY: /* Array type */ - case TYPE_CODE_MEMBER: /* Member type */ + /* errors possible types/not supported */ + case TYPE_CODE_CHAR: + case TYPE_CODE_ARRAY: /* Array type */ + case TYPE_CODE_MEMBER: /* Member type */ case TYPE_CODE_BOOL: - case TYPE_CODE_COMPLEX: /* Complex float */ + case TYPE_CODE_COMPLEX: /* Complex float */ case TYPE_CODE_UNDEF: - case TYPE_CODE_SET: /* Pascal sets */ - case TYPE_CODE_RANGE: + case TYPE_CODE_SET: /* Pascal sets */ + case TYPE_CODE_RANGE: case TYPE_CODE_STRING: case TYPE_CODE_BITSTRING: case TYPE_CODE_ERROR: - default: + default: { - static struct complaint msg = {"Unknown type code x%x\n",0,0}; - complain (&msg, tcode); + static struct complaint msg = + {"Unknown type code x%x\n", 0, 0}; + complain (&msg, tcode); } } if (t->target_type) - add_mangled_type(pextras,t->target_type); + add_mangled_type (pextras, t->target_type); } #if 0 void -cfront_mangle_name(type, i, j) - struct type *type; - int i; - int j; -{ - struct fn_field *f; - char *mangled_name = gdb_mangle_name (type, i, j); - - f = TYPE_FN_FIELDLIST1 (type, i); /* moved from below */ - - /* kludge to support cfront methods - gdb expects to find "F" for - ARM_mangled names, so when we mangle, we have to add it here */ - if (ARM_DEMANGLING) - { - int k; - char * arm_mangled_name; - struct fn_field *method = &f[j]; - char *field_name = TYPE_FN_FIELDLIST_NAME (type, i); - char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); - char *newname = type_name_no_tag (type); - - struct type *ftype = TYPE_FN_FIELD_TYPE (f, j); - int nargs = TYPE_NFIELDS(ftype); /* number of args */ - struct extra extras, * pextras = &extras; - INIT_EXTRA +cfront_mangle_name (struct type *type, int i, int j) +{ + struct fn_field *f; + char *mangled_name = gdb_mangle_name (type, i, j); + + f = TYPE_FN_FIELDLIST1 (type, i); /* moved from below */ + + /* kludge to support cfront methods - gdb expects to find "F" for + ARM_mangled names, so when we mangle, we have to add it here */ + if (ARM_DEMANGLING) + { + int k; + char *arm_mangled_name; + struct fn_field *method = &f[j]; + char *field_name = TYPE_FN_FIELDLIST_NAME (type, i); + char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); + char *newname = type_name_no_tag (type); + + struct type *ftype = TYPE_FN_FIELD_TYPE (f, j); + int nargs = TYPE_NFIELDS (ftype); /* number of args */ + struct extra extras, *pextras = &extras; + INIT_EXTRA if (TYPE_FN_FIELD_STATIC_P (f, j)) /* j for sublist within this list */ - ADD_EXTRA('S') - ADD_EXTRA('F') + ADD_EXTRA ('S') + ADD_EXTRA ('F') /* add args here! */ - if (nargs <= 1) /* no args besides this */ - ADD_EXTRA('v') - else { - for (k=1; k<nargs; k++) - { - struct type * t; - t = TYPE_FIELD_TYPE(ftype,k); - add_mangled_type(pextras,t); - } - } - ADD_EXTRA('\0') - printf("add_mangled_type: %s\n",extras.str); /* FIXME */ - arm_mangled_name = malloc(strlen(mangled_name)+extras.len); - sprintf(arm_mangled_name,"%s%s",mangled_name,extras.str); - free(mangled_name); - mangled_name = arm_mangled_name; - } + if (nargs <= 1) /* no args besides this */ + ADD_EXTRA ('v') + else + { + for (k = 1; k < nargs; k++) + { + struct type *t; + t = TYPE_FIELD_TYPE (ftype, k); + add_mangled_type (pextras, t); + } + } + ADD_EXTRA ('\0') + printf ("add_mangled_type: %s\n", extras.str); /* FIXME */ + xasprintf (&arm_mangled_name, "%s%s", mangled_name, extras.str); + xfree (mangled_name); + mangled_name = arm_mangled_name; + } } -#endif /* 0 */ +#endif /* 0 */ #undef ADD_EXTRA /* End of new code added to support parsing of Cfront stabs strings */ +/* Parse a type expression in the string [P..P+LENGTH). If an error occurs, + silently return builtin_type_void. */ + +struct type * +safe_parse_type (char *p, int length) +{ + struct ui_file *saved_gdb_stderr; + struct type *type; + + /* Suppress error messages. */ + saved_gdb_stderr = gdb_stderr; + gdb_stderr = ui_file_new (); + + /* Call parse_and_eval_type() without fear of longjmp()s. */ + if (!gdb_parse_and_eval_type (p, length, &type)) + type = builtin_type_void; + + /* Stop suppressing error messages. */ + ui_file_delete (gdb_stderr); + gdb_stderr = saved_gdb_stderr; + + return type; +} + /* Ugly hack to convert method stubs into method types. He ain't kiddin'. This demangles the name of the method into a string @@ -1365,10 +1600,7 @@ cfront_mangle_name(type, i, j) the space required for them. */ void -check_stub_method (type, method_id, signature_id) - struct type *type; - int method_id; - int signature_id; +check_stub_method (struct type *type, int method_id, int signature_id) { struct fn_field *f; char *mangled_name = gdb_mangle_name (type, method_id, signature_id); @@ -1382,6 +1614,8 @@ check_stub_method (type, method_id, signature_id) /* Make sure we got back a function string that we can use. */ if (demangled_name) p = strchr (demangled_name, '('); + else + p = NULL; if (demangled_name == NULL || p == NULL) error ("Internal: Cannot demangle mangled name `%s'.", mangled_name); @@ -1391,11 +1625,11 @@ check_stub_method (type, method_id, signature_id) argtypetext = p; while (*p) { - if (*p == '(') + if (*p == '(' || *p == '<') { depth += 1; } - else if (*p == ')') + else if (*p == ')' || *p == '>') { depth -= 1; } @@ -1417,7 +1651,7 @@ check_stub_method (type, method_id, signature_id) argtypes[0] = lookup_pointer_type (type); argcount = 1; - if (*p != ')') /* () means no args, skip while */ + if (*p != ')') /* () means no args, skip while */ { depth = 0; while (*p) @@ -1428,17 +1662,17 @@ check_stub_method (type, method_id, signature_id) if (strncmp (argtypetext, "...", p - argtypetext) != 0) { argtypes[argcount] = - parse_and_eval_type (argtypetext, p - argtypetext); + safe_parse_type (argtypetext, p - argtypetext); argcount += 1; } argtypetext = p + 1; } - if (*p == '(') + if (*p == '(' || *p == '<') { depth += 1; } - else if (*p == ')') + else if (*p == ')' || *p == '>') { depth -= 1; } @@ -1447,18 +1681,18 @@ check_stub_method (type, method_id, signature_id) } } - if (p[-2] != '.') /* Not '...' */ + if (p[-2] != '.') /* Not '...' */ { argtypes[argcount] = builtin_type_void; /* List terminator */ } else { - argtypes[argcount] = NULL; /* Ellist terminator */ + argtypes[argcount] = NULL; /* Ellist terminator */ } - free (demangled_name); + xfree (demangled_name); - f = TYPE_FN_FIELDLIST1 (type, method_id); + f = TYPE_FN_FIELDLIST1 (type, method_id); TYPE_FN_FIELD_PHYSNAME (f, signature_id) = mangled_name; @@ -1473,14 +1707,13 @@ check_stub_method (type, method_id, signature_id) const struct cplus_struct_type cplus_struct_default; void -allocate_cplus_struct_type (type) - struct type *type; +allocate_cplus_struct_type (struct type *type) { if (!HAVE_CPLUS_STRUCT (type)) { TYPE_CPLUS_SPECIFIC (type) = (struct cplus_struct_type *) TYPE_ALLOC (type, sizeof (struct cplus_struct_type)); - *(TYPE_CPLUS_SPECIFIC(type)) = cplus_struct_default; + *(TYPE_CPLUS_SPECIFIC (type)) = cplus_struct_default; } } @@ -1492,12 +1725,8 @@ allocate_cplus_struct_type (type) in particular, where init_type is called with a NULL value for NAME). */ struct type * -init_type (code, length, flags, name, objfile) - enum type_code code; - int length; - int flags; - char *name; - struct objfile *objfile; +init_type (enum type_code code, int length, int flags, char *name, + struct objfile *objfile) { register struct type *type; @@ -1508,7 +1737,7 @@ init_type (code, length, flags, name, objfile) if ((name != NULL) && (objfile != NULL)) { TYPE_NAME (type) = - obsavestring (name, strlen (name), &objfile -> type_obstack); + obsavestring (name, strlen (name), &objfile->type_obstack); } else { @@ -1546,9 +1775,7 @@ init_type (code, length, flags, name, objfile) struct type * -lookup_fundamental_type (objfile, typeid) - struct objfile *objfile; - int typeid; +lookup_fundamental_type (struct objfile *objfile, int typeid) { register struct type **typep; register int nbytes; @@ -1560,20 +1787,20 @@ lookup_fundamental_type (objfile, typeid) /* If this is the first time we need a fundamental type for this objfile then we need to initialize the vector of type pointers. */ - - if (objfile -> fundamental_types == NULL) + + if (objfile->fundamental_types == NULL) { nbytes = FT_NUM_MEMBERS * sizeof (struct type *); - objfile -> fundamental_types = (struct type **) - obstack_alloc (&objfile -> type_obstack, nbytes); - memset ((char *) objfile -> fundamental_types, 0, nbytes); + objfile->fundamental_types = (struct type **) + obstack_alloc (&objfile->type_obstack, nbytes); + memset ((char *) objfile->fundamental_types, 0, nbytes); OBJSTAT (objfile, n_types += FT_NUM_MEMBERS); } /* Look for this particular type in the fundamental type vector. If one is not found, create and install one appropriate for the current language. */ - typep = objfile -> fundamental_types + typeid; + typep = objfile->fundamental_types + typeid; if (*typep == NULL) { *typep = create_fundamental_type (objfile, typeid); @@ -1583,8 +1810,7 @@ lookup_fundamental_type (objfile, typeid) } int -can_dereference (t) - struct type *t; +can_dereference (struct type *t) { /* FIXME: Should we return true for references as well as pointers? */ CHECK_TYPEDEF (t); @@ -1594,6 +1820,19 @@ can_dereference (t) && TYPE_CODE (TYPE_TARGET_TYPE (t)) != TYPE_CODE_VOID); } +int +is_integral_type (struct type *t) +{ + CHECK_TYPEDEF (t); + return + ((t != NULL) + && ((TYPE_CODE (t) == TYPE_CODE_INT) + || (TYPE_CODE (t) == TYPE_CODE_ENUM) + || (TYPE_CODE (t) == TYPE_CODE_CHAR) + || (TYPE_CODE (t) == TYPE_CODE_RANGE) + || (TYPE_CODE (t) == TYPE_CODE_BOOL))); +} + /* Chill varying string and arrays are represented as follows: struct { int __var_length; ELEMENT_TYPE[MAX_SIZE] __var_data}; @@ -1601,8 +1840,7 @@ can_dereference (t) Return true if TYPE is such a Chill varying type. */ int -chill_varying_type (type) - struct type *type; +chill_varying_type (struct type *type) { if (TYPE_CODE (type) != TYPE_CODE_STRUCT || TYPE_NFIELDS (type) != 2 @@ -1618,17 +1856,18 @@ chill_varying_type (type) the ancestor relationship even if they're identical */ int -is_ancestor (base, dclass) - struct type * base; - struct type * dclass; +is_ancestor (struct type *base, struct type *dclass) { int i; - + CHECK_TYPEDEF (base); CHECK_TYPEDEF (dclass); if (base == dclass) return 1; + if (TYPE_NAME (base) && TYPE_NAME (dclass) && + !strcmp (TYPE_NAME (base), TYPE_NAME (dclass))) + return 1; for (i = 0; i < TYPE_N_BASECLASSES (dclass); i++) if (is_ancestor (base, TYPE_BASECLASS (dclass, i))) @@ -1644,51 +1883,49 @@ is_ancestor (base, dclass) runtime models. Return 1 => Yes, 0 => No. */ int -has_vtable (dclass) - struct type * dclass; +has_vtable (struct type *dclass) { /* In the HP ANSI C++ runtime model, a class has a vtable only if it has virtual functions or virtual bases. */ register int i; - if (TYPE_CODE(dclass) != TYPE_CODE_CLASS) + if (TYPE_CODE (dclass) != TYPE_CODE_CLASS) return 0; - + /* First check for the presence of virtual bases */ - if (TYPE_FIELD_VIRTUAL_BITS(dclass)) - for (i=0; i < TYPE_N_BASECLASSES(dclass); i++) - if (B_TST(TYPE_FIELD_VIRTUAL_BITS(dclass), i)) - return 1; - + if (TYPE_FIELD_VIRTUAL_BITS (dclass)) + for (i = 0; i < TYPE_N_BASECLASSES (dclass); i++) + if (B_TST (TYPE_FIELD_VIRTUAL_BITS (dclass), i)) + return 1; + /* Next check for virtual functions */ - if (TYPE_FN_FIELDLISTS(dclass)) - for (i=0; i < TYPE_NFN_FIELDS(dclass); i++) - if (TYPE_FN_FIELD_VIRTUAL_P(TYPE_FN_FIELDLIST1(dclass, i), 0)) - return 1; - - /* Recurse on non-virtual bases to see if any of them needs a vtable */ - if (TYPE_FIELD_VIRTUAL_BITS(dclass)) - for (i=0; i < TYPE_N_BASECLASSES(dclass); i++) - if ((!B_TST (TYPE_FIELD_VIRTUAL_BITS(dclass), i)) && - (has_vtable (TYPE_FIELD_TYPE(dclass, i)))) + if (TYPE_FN_FIELDLISTS (dclass)) + for (i = 0; i < TYPE_NFN_FIELDS (dclass); i++) + if (TYPE_FN_FIELD_VIRTUAL_P (TYPE_FN_FIELDLIST1 (dclass, i), 0)) + return 1; + + /* Recurse on non-virtual bases to see if any of them needs a vtable */ + if (TYPE_FIELD_VIRTUAL_BITS (dclass)) + for (i = 0; i < TYPE_N_BASECLASSES (dclass); i++) + if ((!B_TST (TYPE_FIELD_VIRTUAL_BITS (dclass), i)) && + (has_vtable (TYPE_FIELD_TYPE (dclass, i)))) return 1; - - /* Well, maybe we don't need a virtual table */ + + /* Well, maybe we don't need a virtual table */ return 0; } /* Return a pointer to the "primary base class" of DCLASS. - + A NULL return indicates that DCLASS has no primary base, or that it couldn't be found (insufficient information). - + This routine is aimed at the HP/Taligent ANSI C++ runtime model, and may not work with other runtime models. */ struct type * -primary_base_class (dclass) - struct type * dclass; +primary_base_class (struct type *dclass) { /* In HP ANSI C++'s runtime model, a "primary base class" of a class is the first directly inherited, non-virtual base class that @@ -1696,70 +1933,69 @@ primary_base_class (dclass) register int i; - if (TYPE_CODE(dclass) != TYPE_CODE_CLASS) + if (TYPE_CODE (dclass) != TYPE_CODE_CLASS) return NULL; - for (i=0; i < TYPE_N_BASECLASSES(dclass); i++) - if (!TYPE_FIELD_VIRTUAL(dclass, i) && - has_vtable(TYPE_FIELD_TYPE(dclass, i))) - return TYPE_FIELD_TYPE(dclass, i); + for (i = 0; i < TYPE_N_BASECLASSES (dclass); i++) + if (!TYPE_FIELD_VIRTUAL (dclass, i) && + has_vtable (TYPE_FIELD_TYPE (dclass, i))) + return TYPE_FIELD_TYPE (dclass, i); return NULL; } /* Global manipulated by virtual_base_list[_aux]() */ -static struct vbase * current_vbase_list = NULL; +static struct vbase *current_vbase_list = NULL; /* Return a pointer to a null-terminated list of struct vbase items. The vbasetype pointer of each item in the list points to the type information for a virtual base of the argument DCLASS. - + Helper function for virtual_base_list(). Note: the list goes backward, right-to-left. virtual_base_list() copies the items out in reverse order. */ -struct vbase * -virtual_base_list_aux (dclass) - struct type * dclass; +static void +virtual_base_list_aux (struct type *dclass) { - struct vbase * tmp_vbase; + struct vbase *tmp_vbase; register int i; - if (TYPE_CODE(dclass) != TYPE_CODE_CLASS) - return NULL; + if (TYPE_CODE (dclass) != TYPE_CODE_CLASS) + return; for (i = 0; i < TYPE_N_BASECLASSES (dclass); i++) { /* Recurse on this ancestor, first */ - virtual_base_list_aux(TYPE_FIELD_TYPE(dclass, i)); + virtual_base_list_aux (TYPE_FIELD_TYPE (dclass, i)); /* If this current base is itself virtual, add it to the list */ - if (BASETYPE_VIA_VIRTUAL(dclass, i)) - { - struct type * basetype = TYPE_FIELD_TYPE (dclass, i); - - /* Check if base already recorded */ - tmp_vbase = current_vbase_list; - while (tmp_vbase) - { - if (tmp_vbase->vbasetype == basetype) - break; /* found it */ - tmp_vbase = tmp_vbase->next; - } - - if (!tmp_vbase) /* normal exit from loop */ - { - /* Allocate new item for this virtual base */ - tmp_vbase = (struct vbase *) xmalloc (sizeof (struct vbase)); - - /* Stick it on at the end of the list */ - tmp_vbase->vbasetype = basetype; - tmp_vbase->next = current_vbase_list; - current_vbase_list = tmp_vbase; - } - } /* if virtual */ - } /* for loop over bases */ + if (BASETYPE_VIA_VIRTUAL (dclass, i)) + { + struct type *basetype = TYPE_FIELD_TYPE (dclass, i); + + /* Check if base already recorded */ + tmp_vbase = current_vbase_list; + while (tmp_vbase) + { + if (tmp_vbase->vbasetype == basetype) + break; /* found it */ + tmp_vbase = tmp_vbase->next; + } + + if (!tmp_vbase) /* normal exit from loop */ + { + /* Allocate new item for this virtual base */ + tmp_vbase = (struct vbase *) xmalloc (sizeof (struct vbase)); + + /* Stick it on at the end of the list */ + tmp_vbase->vbasetype = basetype; + tmp_vbase->next = current_vbase_list; + current_vbase_list = tmp_vbase; + } + } /* if virtual */ + } /* for loop over bases */ } @@ -1767,38 +2003,37 @@ virtual_base_list_aux (dclass) bases are laid out in the object's memory area in order of their occurrence in a depth-first, left-to-right search through the ancestors. - + Argument DCLASS is the type whose virtual bases are required. Return value is the address of a null-terminated array of pointers to struct type items. - + This routine is aimed at the HP/Taligent ANSI C++ runtime model, and may not work with other runtime models. - + This routine merely hands off the argument to virtual_base_list_aux() and then copies the result into an array to save space. */ struct type ** -virtual_base_list (dclass) - struct type * dclass; +virtual_base_list (struct type *dclass) { - register struct vbase * tmp_vbase; - register struct vbase * tmp_vbase_2; + register struct vbase *tmp_vbase; + register struct vbase *tmp_vbase_2; register int i; int count; - struct type ** vbase_array; + struct type **vbase_array; current_vbase_list = NULL; - virtual_base_list_aux(dclass); + virtual_base_list_aux (dclass); - for (i=0, tmp_vbase = current_vbase_list; tmp_vbase != NULL; i++, tmp_vbase = tmp_vbase->next) + for (i = 0, tmp_vbase = current_vbase_list; tmp_vbase != NULL; i++, tmp_vbase = tmp_vbase->next) /* no body */ ; count = i; - vbase_array = (struct type **) xmalloc((count + 1) * sizeof (struct type *)); + vbase_array = (struct type **) xmalloc ((count + 1) * sizeof (struct type *)); - for (i=count -1, tmp_vbase = current_vbase_list; i >= 0; i--, tmp_vbase = tmp_vbase->next) + for (i = count - 1, tmp_vbase = current_vbase_list; i >= 0; i--, tmp_vbase = tmp_vbase->next) vbase_array[i] = tmp_vbase->vbasetype; /* Get rid of constructed chain */ @@ -1806,10 +2041,10 @@ virtual_base_list (dclass) while (tmp_vbase) { tmp_vbase = tmp_vbase->next; - free(tmp_vbase_2); + xfree (tmp_vbase_2); tmp_vbase_2 = tmp_vbase; } - + vbase_array[count] = NULL; return vbase_array; } @@ -1817,16 +2052,15 @@ virtual_base_list (dclass) /* Return the length of the virtual base list of the type DCLASS. */ int -virtual_base_list_length (dclass) - struct type * dclass; +virtual_base_list_length (struct type *dclass) { register int i; - register struct vbase * tmp_vbase; - + register struct vbase *tmp_vbase; + current_vbase_list = NULL; - virtual_base_list_aux(dclass); + virtual_base_list_aux (dclass); - for (i=0, tmp_vbase = current_vbase_list; tmp_vbase != NULL; i++, tmp_vbase = tmp_vbase->next) + for (i = 0, tmp_vbase = current_vbase_list; tmp_vbase != NULL; i++, tmp_vbase = tmp_vbase->next) /* no body */ ; return i; } @@ -1836,12 +2070,11 @@ virtual_base_list_length (dclass) primary base, recursively). */ int -virtual_base_list_length_skip_primaries (dclass) - struct type * dclass; +virtual_base_list_length_skip_primaries (struct type *dclass) { register int i; - register struct vbase * tmp_vbase; - struct type * primary; + register struct vbase *tmp_vbase; + struct type *primary; primary = TYPE_RUNTIME_PTR (dclass) ? TYPE_PRIMARY_BASE (dclass) : NULL; @@ -1849,12 +2082,12 @@ virtual_base_list_length_skip_primaries (dclass) return virtual_base_list_length (dclass); current_vbase_list = NULL; - virtual_base_list_aux(dclass); + virtual_base_list_aux (dclass); - for (i=0, tmp_vbase = current_vbase_list; tmp_vbase != NULL; tmp_vbase = tmp_vbase->next) + for (i = 0, tmp_vbase = current_vbase_list; tmp_vbase != NULL; tmp_vbase = tmp_vbase->next) { if (virtual_base_index (tmp_vbase->vbasetype, primary) >= 0) - continue; + continue; i++; } return i; @@ -1866,24 +2099,22 @@ virtual_base_list_length_skip_primaries (dclass) indicates "not found" or a problem. */ int -virtual_base_index(base, dclass) - struct type * base; - struct type * dclass; +virtual_base_index (struct type *base, struct type *dclass) { - register struct type * vbase; + register struct type *vbase; register int i; - if ((TYPE_CODE(dclass) != TYPE_CODE_CLASS) || - (TYPE_CODE(base) != TYPE_CODE_CLASS)) + if ((TYPE_CODE (dclass) != TYPE_CODE_CLASS) || + (TYPE_CODE (base) != TYPE_CODE_CLASS)) return -1; i = 0; - vbase = TYPE_VIRTUAL_BASE_LIST(dclass)[0]; + vbase = virtual_base_list (dclass)[0]; while (vbase) { if (vbase == base) - break; - vbase = TYPE_VIRTUAL_BASE_LIST(dclass)[++i]; + break; + vbase = virtual_base_list (dclass)[++i]; } return vbase ? i : -1; @@ -1898,30 +2129,28 @@ virtual_base_index(base, dclass) found" or a problem. */ int -virtual_base_index_skip_primaries(base, dclass) - struct type * base; - struct type * dclass; +virtual_base_index_skip_primaries (struct type *base, struct type *dclass) { - register struct type * vbase; + register struct type *vbase; register int i, j; - struct type * primary; + struct type *primary; - if ((TYPE_CODE(dclass) != TYPE_CODE_CLASS) || - (TYPE_CODE(base) != TYPE_CODE_CLASS)) + if ((TYPE_CODE (dclass) != TYPE_CODE_CLASS) || + (TYPE_CODE (base) != TYPE_CODE_CLASS)) return -1; - primary = TYPE_RUNTIME_PTR(dclass) ? TYPE_PRIMARY_BASE(dclass) : NULL; + primary = TYPE_RUNTIME_PTR (dclass) ? TYPE_PRIMARY_BASE (dclass) : NULL; j = -1; i = 0; - vbase = TYPE_VIRTUAL_BASE_LIST(dclass)[0]; + vbase = virtual_base_list (dclass)[0]; while (vbase) { - if (!primary || (virtual_base_index_skip_primaries(vbase, primary) < 0)) - j++; + if (!primary || (virtual_base_index_skip_primaries (vbase, primary) < 0)) + j++; if (vbase == base) - break; - vbase = TYPE_VIRTUAL_BASE_LIST(dclass)[++i]; + break; + vbase = virtual_base_list (dclass)[++i]; } return vbase ? j : -1; @@ -1932,12 +2161,11 @@ virtual_base_index_skip_primaries(base, dclass) * Position returned is 0-based. */ int -class_index_in_primary_list (dclass) - struct type * dclass; +class_index_in_primary_list (struct type *dclass) { - struct type * pbc; /* primary base class */ + struct type *pbc; /* primary base class */ - /* Simply recurse on primary base */ + /* Simply recurse on primary base */ pbc = TYPE_PRIMARY_BASE (dclass); if (pbc) return 1 + class_index_in_primary_list (pbc); @@ -1955,29 +2183,28 @@ class_index_in_primary_list (dclass) */ int -count_virtual_fns (dclass) - struct type * dclass; +count_virtual_fns (struct type *dclass) { - int base; /* index for base classes */ - int fn, oi; /* function and overloaded instance indices */ - - int vfuncs; /* count to return */ + int fn, oi; /* function and overloaded instance indices */ + int vfuncs; /* count to return */ - /* recurse on bases that can share virtual table */ - struct type * pbc = primary_base_class (dclass); + /* recurse on bases that can share virtual table */ + struct type *pbc = primary_base_class (dclass); if (pbc) vfuncs = count_virtual_fns (pbc); - + else + vfuncs = 0; + for (fn = 0; fn < TYPE_NFN_FIELDS (dclass); fn++) for (oi = 0; oi < TYPE_FN_FIELDLIST_LENGTH (dclass, fn); oi++) if (TYPE_FN_FIELD_VIRTUAL_P (TYPE_FN_FIELDLIST1 (dclass, fn), oi)) - vfuncs++; + vfuncs++; return vfuncs; } - + /* Functions for overload resolution begin here */ /* Compare two badness vectors A and B and return the result. @@ -1987,42 +2214,41 @@ count_virtual_fns (dclass) * 3 => A is worse than B */ int -compare_badness (a, b) - struct badness_vector * a; - struct badness_vector * b; +compare_badness (struct badness_vector *a, struct badness_vector *b) { int i; int tmp; - short found_pos = 0; /* any positives in c? */ - short found_neg = 0; /* any negatives in c? */ - - /* differing lengths => incomparable */ + short found_pos = 0; /* any positives in c? */ + short found_neg = 0; /* any negatives in c? */ + + /* differing lengths => incomparable */ if (a->length != b->length) return 1; - /* Subtract b from a */ - for (i=0; i < a->length; i++) + /* Subtract b from a */ + for (i = 0; i < a->length; i++) { tmp = a->rank[i] - b->rank[i]; if (tmp > 0) - found_pos = 1; + found_pos = 1; else if (tmp < 0) - found_neg = 1; + found_neg = 1; } if (found_pos) { if (found_neg) - return 1; /* incomparable */ + return 1; /* incomparable */ else - return 3; /* A > B */ + return 3; /* A > B */ } - else /* no positives */ + else + /* no positives */ { if (found_neg) - return 2; /* A < B */ + return 2; /* A < B */ else - return 0; /* A == B */ + return 0; /* A == B */ } } @@ -2031,23 +2257,19 @@ compare_badness (a, b) * Return a pointer to a badness vector. This has NARGS + 1 entries. */ struct badness_vector * -rank_function (parms, nparms, args, nargs) - struct type ** parms; - int nparms; - struct type ** args; - int nargs; +rank_function (struct type **parms, int nparms, struct type **args, int nargs) { int i; - struct badness_vector * bv; + struct badness_vector *bv; int min_len = nparms < nargs ? nparms : nargs; bv = xmalloc (sizeof (struct badness_vector)); - bv->length = nargs + 1; /* add 1 for the length-match rank */ + bv->length = nargs + 1; /* add 1 for the length-match rank */ bv->rank = xmalloc ((nargs + 1) * sizeof (int)); /* First compare the lengths of the supplied lists. * If there is a mismatch, set it to a high value. */ - + /* pai/1997-06-03 FIXME: when we have debug info about default * arguments and ellipsis parameter lists, we should consider those * and rank the length-match more finely. */ @@ -2055,11 +2277,11 @@ rank_function (parms, nparms, args, nargs) LENGTH_MATCH (bv) = (nargs != nparms) ? LENGTH_MISMATCH_BADNESS : 0; /* Now rank all the parameters of the candidate function */ - for (i=1; i <= min_len; i++) + for (i = 1; i <= min_len; i++) bv->rank[i] = rank_one_type (parms[i-1], args[i-1]); - /* If more arguments than parameters, add dummy entries */ - for (i = min_len +1; i <= nargs; i++) + /* If more arguments than parameters, add dummy entries */ + for (i = min_len + 1; i <= nargs; i++) bv->rank[i] = TOO_FEW_PARAMS_BADNESS; return bv; @@ -2076,9 +2298,7 @@ rank_function (parms, nparms, args, nargs) * Generally the "bad" conversions are all uniformly assigned a 100 */ int -rank_one_type (parm, arg) - struct type * parm; - struct type * arg; +rank_one_type (struct type *parm, struct type *arg) { /* Identical type pointers */ /* However, this still doesn't catch all cases of same type for arg @@ -2093,311 +2313,323 @@ rank_one_type (parm, arg) if (TYPE_CODE (arg) == TYPE_CODE_TYPEDEF) arg = check_typedef (arg); + /* + Well, damnit, if the names are exactly the same, + i'll say they are exactly the same. This happens when we generate + method stubs. The types won't point to the same address, but they + really are the same. + */ + + if (TYPE_NAME (parm) && TYPE_NAME (arg) && + !strcmp (TYPE_NAME (parm), TYPE_NAME (arg))) + return 0; + /* Check if identical after resolving typedefs */ if (parm == arg) return 0; -#if 0 - /* Debugging only */ - printf("------ Arg is %s [%d], parm is %s [%d]\n", - TYPE_NAME (arg), TYPE_CODE (arg), TYPE_NAME (parm), TYPE_CODE (parm)); -#endif + /* See through references, since we can almost make non-references + references. */ + if (TYPE_CODE (arg) == TYPE_CODE_REF) + return (rank_one_type (parm, TYPE_TARGET_TYPE (arg)) + + REFERENCE_CONVERSION_BADNESS); + if (TYPE_CODE (parm) == TYPE_CODE_REF) + return (rank_one_type (TYPE_TARGET_TYPE (parm), arg) + + REFERENCE_CONVERSION_BADNESS); + if (overload_debug) + /* Debugging only. */ + fprintf_filtered (gdb_stderr,"------ Arg is %s [%d], parm is %s [%d]\n", + TYPE_NAME (arg), TYPE_CODE (arg), TYPE_NAME (parm), TYPE_CODE (parm)); /* x -> y means arg of type x being supplied for parameter of type y */ switch (TYPE_CODE (parm)) { - case TYPE_CODE_PTR: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_PTR: - if (TYPE_CODE (TYPE_TARGET_TYPE (parm)) == TYPE_CODE_VOID) - return VOID_PTR_CONVERSION_BADNESS; - else - return rank_one_type (TYPE_TARGET_TYPE (parm), TYPE_TARGET_TYPE (arg)); - case TYPE_CODE_ARRAY: - return rank_one_type (TYPE_TARGET_TYPE (parm), TYPE_TARGET_TYPE (arg)); - case TYPE_CODE_FUNC: - return rank_one_type (TYPE_TARGET_TYPE (parm), arg); - case TYPE_CODE_INT: - case TYPE_CODE_ENUM: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - return POINTER_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - case TYPE_CODE_ARRAY: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_PTR: - case TYPE_CODE_ARRAY: - return rank_one_type (TYPE_TARGET_TYPE (parm), TYPE_TARGET_TYPE (arg)); - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - case TYPE_CODE_FUNC: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_PTR: /* funcptr -> func */ - return rank_one_type (parm, TYPE_TARGET_TYPE (arg)); - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - case TYPE_CODE_INT: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_INT: - if (TYPE_LENGTH (arg) == TYPE_LENGTH (parm)) - { - /* Deal with signed, unsigned, and plain chars and - signed and unsigned ints */ - if (TYPE_NOSIGN (parm)) - { - /* This case only for character types */ - if (TYPE_NOSIGN (arg)) /* plain char -> plain char */ - return 0; - else - return INTEGER_COERCION_BADNESS; /* signed/unsigned char -> plain char */ - } - else if (TYPE_UNSIGNED (parm)) - { - if (TYPE_UNSIGNED (arg)) - { - if (!strcmp (TYPE_NAME (parm), TYPE_NAME (arg))) - return 0; /* unsigned int -> unsigned int, or unsigned long -> unsigned long */ - else if (!strcmp (TYPE_NAME (arg), "int") && !strcmp (TYPE_NAME (parm), "long")) - return INTEGER_PROMOTION_BADNESS; /* unsigned int -> unsigned long */ - else - return INTEGER_COERCION_BADNESS; /* unsigned long -> unsigned int */ - } - else - { - if (!strcmp (TYPE_NAME (arg), "long") && !strcmp (TYPE_NAME (parm), "int")) - return INTEGER_COERCION_BADNESS; /* signed long -> unsigned int */ - else - return INTEGER_CONVERSION_BADNESS; /* signed int/long -> unsigned int/long */ - } - } - else if (!TYPE_NOSIGN (arg) && !TYPE_UNSIGNED (arg)) - { - if (!strcmp (TYPE_NAME (parm), TYPE_NAME (arg))) - return 0; - else if (!strcmp (TYPE_NAME (arg), "int") && !strcmp (TYPE_NAME (parm), "long")) - return INTEGER_PROMOTION_BADNESS; - else - return INTEGER_COERCION_BADNESS; - } - else - return INTEGER_COERCION_BADNESS; - } - else if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) - return INTEGER_PROMOTION_BADNESS; - else - return INTEGER_COERCION_BADNESS; - case TYPE_CODE_ENUM: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - return INTEGER_PROMOTION_BADNESS; - case TYPE_CODE_FLT: - return INT_FLOAT_CONVERSION_BADNESS; - case TYPE_CODE_PTR: - return NS_POINTER_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_ENUM: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_INT: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - case TYPE_CODE_ENUM: - return INTEGER_COERCION_BADNESS; - case TYPE_CODE_FLT: - return INT_FLOAT_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_CHAR: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - case TYPE_CODE_ENUM: - return INTEGER_COERCION_BADNESS; - case TYPE_CODE_FLT: - return INT_FLOAT_CONVERSION_BADNESS; - case TYPE_CODE_INT: - if (TYPE_LENGTH (arg) > TYPE_LENGTH (parm)) - return INTEGER_COERCION_BADNESS; - else if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) - return INTEGER_PROMOTION_BADNESS; - /* >>> !! else fall through !! <<< */ - case TYPE_CODE_CHAR: - /* Deal with signed, unsigned, and plain chars for C++ - and with int cases falling through from previous case */ - if (TYPE_NOSIGN (parm)) - { - if (TYPE_NOSIGN (arg)) - return 0; - else - return INTEGER_COERCION_BADNESS; - } - else if (TYPE_UNSIGNED (parm)) - { - if (TYPE_UNSIGNED (arg)) - return 0; - else - return INTEGER_PROMOTION_BADNESS; - } - else if (!TYPE_NOSIGN (arg) && !TYPE_UNSIGNED (arg)) - return 0; - else - return INTEGER_COERCION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_RANGE: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_INT: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_BOOL: - case TYPE_CODE_ENUM: - return INTEGER_COERCION_BADNESS; - case TYPE_CODE_FLT: - return INT_FLOAT_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_BOOL: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_INT: - case TYPE_CODE_CHAR: - case TYPE_CODE_RANGE: - case TYPE_CODE_ENUM: - case TYPE_CODE_FLT: - case TYPE_CODE_PTR: - return BOOLEAN_CONVERSION_BADNESS; - case TYPE_CODE_BOOL: - return 0; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_FLT: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_FLT: - if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) - return FLOAT_PROMOTION_BADNESS; - else if (TYPE_LENGTH (arg) == TYPE_LENGTH (parm)) - return 0; - else - return FLOAT_CONVERSION_BADNESS; - case TYPE_CODE_INT: - case TYPE_CODE_BOOL: - case TYPE_CODE_ENUM: - case TYPE_CODE_RANGE: - case TYPE_CODE_CHAR: - return INT_FLOAT_CONVERSION_BADNESS; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_COMPLEX: - switch (TYPE_CODE (arg)) - { /* Strictly not needed for C++, but... */ - case TYPE_CODE_FLT: - return FLOAT_PROMOTION_BADNESS; - case TYPE_CODE_COMPLEX: - return 0; - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_STRUCT: + case TYPE_CODE_PTR: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_PTR: + if (TYPE_CODE (TYPE_TARGET_TYPE (parm)) == TYPE_CODE_VOID) + return VOID_PTR_CONVERSION_BADNESS; + else + return rank_one_type (TYPE_TARGET_TYPE (parm), TYPE_TARGET_TYPE (arg)); + case TYPE_CODE_ARRAY: + return rank_one_type (TYPE_TARGET_TYPE (parm), TYPE_TARGET_TYPE (arg)); + case TYPE_CODE_FUNC: + return rank_one_type (TYPE_TARGET_TYPE (parm), arg); + case TYPE_CODE_INT: + case TYPE_CODE_ENUM: + case TYPE_CODE_CHAR: + case TYPE_CODE_RANGE: + case TYPE_CODE_BOOL: + return POINTER_CONVERSION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + case TYPE_CODE_ARRAY: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_PTR: + case TYPE_CODE_ARRAY: + return rank_one_type (TYPE_TARGET_TYPE (parm), TYPE_TARGET_TYPE (arg)); + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + case TYPE_CODE_FUNC: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_PTR: /* funcptr -> func */ + return rank_one_type (parm, TYPE_TARGET_TYPE (arg)); + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + case TYPE_CODE_INT: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_INT: + if (TYPE_LENGTH (arg) == TYPE_LENGTH (parm)) + { + /* Deal with signed, unsigned, and plain chars and + signed and unsigned ints */ + if (TYPE_NOSIGN (parm)) + { + /* This case only for character types */ + if (TYPE_NOSIGN (arg)) /* plain char -> plain char */ + return 0; + else + return INTEGER_COERCION_BADNESS; /* signed/unsigned char -> plain char */ + } + else if (TYPE_UNSIGNED (parm)) + { + if (TYPE_UNSIGNED (arg)) + { + if (!strcmp_iw (TYPE_NAME (parm), TYPE_NAME (arg))) + return 0; /* unsigned int -> unsigned int, or unsigned long -> unsigned long */ + else if (!strcmp_iw (TYPE_NAME (arg), "int") && !strcmp_iw (TYPE_NAME (parm), "long")) + return INTEGER_PROMOTION_BADNESS; /* unsigned int -> unsigned long */ + else + return INTEGER_COERCION_BADNESS; /* unsigned long -> unsigned int */ + } + else + { + if (!strcmp_iw (TYPE_NAME (arg), "long") && !strcmp_iw (TYPE_NAME (parm), "int")) + return INTEGER_COERCION_BADNESS; /* signed long -> unsigned int */ + else + return INTEGER_CONVERSION_BADNESS; /* signed int/long -> unsigned int/long */ + } + } + else if (!TYPE_NOSIGN (arg) && !TYPE_UNSIGNED (arg)) + { + if (!strcmp_iw (TYPE_NAME (parm), TYPE_NAME (arg))) + return 0; + else if (!strcmp_iw (TYPE_NAME (arg), "int") && !strcmp_iw (TYPE_NAME (parm), "long")) + return INTEGER_PROMOTION_BADNESS; + else + return INTEGER_COERCION_BADNESS; + } + else + return INTEGER_COERCION_BADNESS; + } + else if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) + return INTEGER_PROMOTION_BADNESS; + else + return INTEGER_COERCION_BADNESS; + case TYPE_CODE_ENUM: + case TYPE_CODE_CHAR: + case TYPE_CODE_RANGE: + case TYPE_CODE_BOOL: + return INTEGER_PROMOTION_BADNESS; + case TYPE_CODE_FLT: + return INT_FLOAT_CONVERSION_BADNESS; + case TYPE_CODE_PTR: + return NS_POINTER_CONVERSION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_ENUM: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_INT: + case TYPE_CODE_CHAR: + case TYPE_CODE_RANGE: + case TYPE_CODE_BOOL: + case TYPE_CODE_ENUM: + return INTEGER_COERCION_BADNESS; + case TYPE_CODE_FLT: + return INT_FLOAT_CONVERSION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_CHAR: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_RANGE: + case TYPE_CODE_BOOL: + case TYPE_CODE_ENUM: + return INTEGER_COERCION_BADNESS; + case TYPE_CODE_FLT: + return INT_FLOAT_CONVERSION_BADNESS; + case TYPE_CODE_INT: + if (TYPE_LENGTH (arg) > TYPE_LENGTH (parm)) + return INTEGER_COERCION_BADNESS; + else if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) + return INTEGER_PROMOTION_BADNESS; + /* >>> !! else fall through !! <<< */ + case TYPE_CODE_CHAR: + /* Deal with signed, unsigned, and plain chars for C++ + and with int cases falling through from previous case */ + if (TYPE_NOSIGN (parm)) + { + if (TYPE_NOSIGN (arg)) + return 0; + else + return INTEGER_COERCION_BADNESS; + } + else if (TYPE_UNSIGNED (parm)) + { + if (TYPE_UNSIGNED (arg)) + return 0; + else + return INTEGER_PROMOTION_BADNESS; + } + else if (!TYPE_NOSIGN (arg) && !TYPE_UNSIGNED (arg)) + return 0; + else + return INTEGER_COERCION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_RANGE: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_INT: + case TYPE_CODE_CHAR: + case TYPE_CODE_RANGE: + case TYPE_CODE_BOOL: + case TYPE_CODE_ENUM: + return INTEGER_COERCION_BADNESS; + case TYPE_CODE_FLT: + return INT_FLOAT_CONVERSION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_BOOL: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_INT: + case TYPE_CODE_CHAR: + case TYPE_CODE_RANGE: + case TYPE_CODE_ENUM: + case TYPE_CODE_FLT: + case TYPE_CODE_PTR: + return BOOLEAN_CONVERSION_BADNESS; + case TYPE_CODE_BOOL: + return 0; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_FLT: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_FLT: + if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) + return FLOAT_PROMOTION_BADNESS; + else if (TYPE_LENGTH (arg) == TYPE_LENGTH (parm)) + return 0; + else + return FLOAT_CONVERSION_BADNESS; + case TYPE_CODE_INT: + case TYPE_CODE_BOOL: + case TYPE_CODE_ENUM: + case TYPE_CODE_RANGE: + case TYPE_CODE_CHAR: + return INT_FLOAT_CONVERSION_BADNESS; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_COMPLEX: + switch (TYPE_CODE (arg)) + { /* Strictly not needed for C++, but... */ + case TYPE_CODE_FLT: + return FLOAT_PROMOTION_BADNESS; + case TYPE_CODE_COMPLEX: + return 0; + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_STRUCT: /* currently same as TYPE_CODE_CLASS */ - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_STRUCT: - /* Check for derivation */ - if (is_ancestor (parm, arg)) - return BASE_CONVERSION_BADNESS; - /* else fall through */ - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_UNION: - switch (TYPE_CODE (arg)) - { - case TYPE_CODE_UNION: - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_MEMBER: - switch (TYPE_CODE (arg)) - { - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_METHOD: - switch (TYPE_CODE (arg)) - { - - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_REF: - switch (TYPE_CODE (arg)) - { - - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - - break; - case TYPE_CODE_SET: - switch (TYPE_CODE (arg)) - { - /* Not in C++ */ - case TYPE_CODE_SET: - return rank_one_type (TYPE_FIELD_TYPE (parm, 0), TYPE_FIELD_TYPE (arg, 0)); - default: - return INCOMPATIBLE_TYPE_BADNESS; - } - break; - case TYPE_CODE_VOID: - default: - return INCOMPATIBLE_TYPE_BADNESS; - } /* switch (TYPE_CODE (arg)) */ -} - - -/* End of functions for overload resolution */ - - - -#if MAINTENANCE_CMDS + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_STRUCT: + /* Check for derivation */ + if (is_ancestor (parm, arg)) + return BASE_CONVERSION_BADNESS; + /* else fall through */ + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_UNION: + switch (TYPE_CODE (arg)) + { + case TYPE_CODE_UNION: + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_MEMBER: + switch (TYPE_CODE (arg)) + { + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_METHOD: + switch (TYPE_CODE (arg)) + { + + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_REF: + switch (TYPE_CODE (arg)) + { + + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + + break; + case TYPE_CODE_SET: + switch (TYPE_CODE (arg)) + { + /* Not in C++ */ + case TYPE_CODE_SET: + return rank_one_type (TYPE_FIELD_TYPE (parm, 0), TYPE_FIELD_TYPE (arg, 0)); + default: + return INCOMPATIBLE_TYPE_BADNESS; + } + break; + case TYPE_CODE_VOID: + default: + return INCOMPATIBLE_TYPE_BADNESS; + } /* switch (TYPE_CODE (arg)) */ +} + + +/* End of functions for overload resolution */ static void -print_bit_vector (bits, nbits) - B_TYPE *bits; - int nbits; +print_bit_vector (B_TYPE *bits, int nbits) { int bitno; @@ -2425,16 +2657,14 @@ print_bit_vector (bits, nbits) include it since we may get into a infinitely recursive situation. */ static void -print_arg_types (args, spaces) - struct type **args; - int spaces; +print_arg_types (struct type **args, int spaces) { if (args != NULL) { while (*args != NULL) { recursive_dump_type (*args, spaces + 2); - if ((*args++) -> code == TYPE_CODE_VOID) + if ((*args++)->code == TYPE_CODE_VOID) { break; } @@ -2443,16 +2673,14 @@ print_arg_types (args, spaces) } static void -dump_fn_fieldlists (type, spaces) - struct type *type; - int spaces; +dump_fn_fieldlists (struct type *type, int spaces) { int method_idx; int overload_idx; struct fn_field *f; printfi_filtered (spaces, "fn_fieldlists "); - gdb_print_address (TYPE_FN_FIELDLISTS (type), gdb_stdout); + gdb_print_host_address (TYPE_FN_FIELDLISTS (type), gdb_stdout); printf_filtered ("\n"); for (method_idx = 0; method_idx < TYPE_NFN_FIELDS (type); method_idx++) { @@ -2460,8 +2688,8 @@ dump_fn_fieldlists (type, spaces) printfi_filtered (spaces + 2, "[%d] name '%s' (", method_idx, TYPE_FN_FIELDLIST_NAME (type, method_idx)); - gdb_print_address (TYPE_FN_FIELDLIST_NAME (type, method_idx), - gdb_stdout); + gdb_print_host_address (TYPE_FN_FIELDLIST_NAME (type, method_idx), + gdb_stdout); printf_filtered (") length %d\n", TYPE_FN_FIELDLIST_LENGTH (type, method_idx)); for (overload_idx = 0; @@ -2471,24 +2699,24 @@ dump_fn_fieldlists (type, spaces) printfi_filtered (spaces + 4, "[%d] physname '%s' (", overload_idx, TYPE_FN_FIELD_PHYSNAME (f, overload_idx)); - gdb_print_address (TYPE_FN_FIELD_PHYSNAME (f, overload_idx), - gdb_stdout); + gdb_print_host_address (TYPE_FN_FIELD_PHYSNAME (f, overload_idx), + gdb_stdout); printf_filtered (")\n"); printfi_filtered (spaces + 8, "type "); - gdb_print_address (TYPE_FN_FIELD_TYPE (f, overload_idx), gdb_stdout); + gdb_print_host_address (TYPE_FN_FIELD_TYPE (f, overload_idx), gdb_stdout); printf_filtered ("\n"); recursive_dump_type (TYPE_FN_FIELD_TYPE (f, overload_idx), spaces + 8 + 2); printfi_filtered (spaces + 8, "args "); - gdb_print_address (TYPE_FN_FIELD_ARGS (f, overload_idx), gdb_stdout); + gdb_print_host_address (TYPE_FN_FIELD_ARGS (f, overload_idx), gdb_stdout); printf_filtered ("\n"); print_arg_types (TYPE_FN_FIELD_ARGS (f, overload_idx), spaces); printfi_filtered (spaces + 8, "fcontext "); - gdb_print_address (TYPE_FN_FIELD_FCONTEXT (f, overload_idx), - gdb_stdout); + gdb_print_host_address (TYPE_FN_FIELD_FCONTEXT (f, overload_idx), + gdb_stdout); printf_filtered ("\n"); printfi_filtered (spaces + 8, "is_const %d\n", @@ -2508,9 +2736,7 @@ dump_fn_fieldlists (type, spaces) } static void -print_cplus_stuff (type, spaces) - struct type *type; - int spaces; +print_cplus_stuff (struct type *type, int spaces) { printfi_filtered (spaces, "n_baseclasses %d\n", TYPE_N_BASECLASSES (type)); @@ -2522,7 +2748,7 @@ print_cplus_stuff (type, spaces) { printfi_filtered (spaces, "virtual_field_bits (%d bits at *", TYPE_N_BASECLASSES (type)); - gdb_print_address (TYPE_FIELD_VIRTUAL_BITS (type), gdb_stdout); + gdb_print_host_address (TYPE_FIELD_VIRTUAL_BITS (type), gdb_stdout); printf_filtered (")"); print_bit_vector (TYPE_FIELD_VIRTUAL_BITS (type), @@ -2535,7 +2761,7 @@ print_cplus_stuff (type, spaces) { printfi_filtered (spaces, "private_field_bits (%d bits at *", TYPE_NFIELDS (type)); - gdb_print_address (TYPE_FIELD_PRIVATE_BITS (type), gdb_stdout); + gdb_print_host_address (TYPE_FIELD_PRIVATE_BITS (type), gdb_stdout); printf_filtered (")"); print_bit_vector (TYPE_FIELD_PRIVATE_BITS (type), TYPE_NFIELDS (type)); @@ -2545,7 +2771,7 @@ print_cplus_stuff (type, spaces) { printfi_filtered (spaces, "protected_field_bits (%d bits at *", TYPE_NFIELDS (type)); - gdb_print_address (TYPE_FIELD_PROTECTED_BITS (type), gdb_stdout); + gdb_print_host_address (TYPE_FIELD_PROTECTED_BITS (type), gdb_stdout); printf_filtered (")"); print_bit_vector (TYPE_FIELD_PROTECTED_BITS (type), TYPE_NFIELDS (type)); @@ -2558,12 +2784,39 @@ print_cplus_stuff (type, spaces) } } +static void +print_bound_type (int bt) +{ + switch (bt) + { + case BOUND_CANNOT_BE_DETERMINED: + printf_filtered ("(BOUND_CANNOT_BE_DETERMINED)"); + break; + case BOUND_BY_REF_ON_STACK: + printf_filtered ("(BOUND_BY_REF_ON_STACK)"); + break; + case BOUND_BY_VALUE_ON_STACK: + printf_filtered ("(BOUND_BY_VALUE_ON_STACK)"); + break; + case BOUND_BY_REF_IN_REG: + printf_filtered ("(BOUND_BY_REF_IN_REG)"); + break; + case BOUND_BY_VALUE_IN_REG: + printf_filtered ("(BOUND_BY_VALUE_IN_REG)"); + break; + case BOUND_SIMPLE: + printf_filtered ("(BOUND_SIMPLE)"); + break; + default: + printf_filtered ("(unknown bound type)"); + break; + } +} + static struct obstack dont_print_type_obstack; void -recursive_dump_type (type, spaces) - struct type *type; - int spaces; +recursive_dump_type (struct type *type, int spaces) { int idx; @@ -2574,17 +2827,17 @@ recursive_dump_type (type, spaces) || (TYPE_CPLUS_SPECIFIC (type) && TYPE_NFN_FIELDS (type) > 0)) { struct type **first_dont_print - = (struct type **)obstack_base (&dont_print_type_obstack); + = (struct type **) obstack_base (&dont_print_type_obstack); - int i = (struct type **)obstack_next_free (&dont_print_type_obstack) - - first_dont_print; + int i = (struct type **) obstack_next_free (&dont_print_type_obstack) + - first_dont_print; while (--i >= 0) { if (type == first_dont_print[i]) { printfi_filtered (spaces, "type node "); - gdb_print_address (type, gdb_stdout); + gdb_print_host_address (type, gdb_stdout); printf_filtered (" <same as already seen type>\n"); return; } @@ -2594,116 +2847,179 @@ recursive_dump_type (type, spaces) } printfi_filtered (spaces, "type node "); - gdb_print_address (type, gdb_stdout); + gdb_print_host_address (type, gdb_stdout); printf_filtered ("\n"); printfi_filtered (spaces, "name '%s' (", TYPE_NAME (type) ? TYPE_NAME (type) : "<NULL>"); - gdb_print_address (TYPE_NAME (type), gdb_stdout); + gdb_print_host_address (TYPE_NAME (type), gdb_stdout); + printf_filtered (")\n"); + printfi_filtered (spaces, "tagname '%s' (", + TYPE_TAG_NAME (type) ? TYPE_TAG_NAME (type) : "<NULL>"); + gdb_print_host_address (TYPE_TAG_NAME (type), gdb_stdout); printf_filtered (")\n"); - if (TYPE_TAG_NAME (type) != NULL) - { - printfi_filtered (spaces, "tagname '%s' (", - TYPE_TAG_NAME (type)); - gdb_print_address (TYPE_TAG_NAME (type), gdb_stdout); - printf_filtered (")\n"); - } printfi_filtered (spaces, "code 0x%x ", TYPE_CODE (type)); switch (TYPE_CODE (type)) { - case TYPE_CODE_UNDEF: - printf_filtered ("(TYPE_CODE_UNDEF)"); - break; - case TYPE_CODE_PTR: - printf_filtered ("(TYPE_CODE_PTR)"); - break; - case TYPE_CODE_ARRAY: - printf_filtered ("(TYPE_CODE_ARRAY)"); - break; - case TYPE_CODE_STRUCT: - printf_filtered ("(TYPE_CODE_STRUCT)"); - break; - case TYPE_CODE_UNION: - printf_filtered ("(TYPE_CODE_UNION)"); - break; - case TYPE_CODE_ENUM: - printf_filtered ("(TYPE_CODE_ENUM)"); - break; - case TYPE_CODE_FUNC: - printf_filtered ("(TYPE_CODE_FUNC)"); - break; - case TYPE_CODE_INT: - printf_filtered ("(TYPE_CODE_INT)"); - break; - case TYPE_CODE_FLT: - printf_filtered ("(TYPE_CODE_FLT)"); - break; - case TYPE_CODE_VOID: - printf_filtered ("(TYPE_CODE_VOID)"); - break; - case TYPE_CODE_SET: - printf_filtered ("(TYPE_CODE_SET)"); - break; - case TYPE_CODE_RANGE: - printf_filtered ("(TYPE_CODE_RANGE)"); - break; - case TYPE_CODE_STRING: - printf_filtered ("(TYPE_CODE_STRING)"); - break; - case TYPE_CODE_ERROR: - printf_filtered ("(TYPE_CODE_ERROR)"); - break; - case TYPE_CODE_MEMBER: - printf_filtered ("(TYPE_CODE_MEMBER)"); - break; - case TYPE_CODE_METHOD: - printf_filtered ("(TYPE_CODE_METHOD)"); - break; - case TYPE_CODE_REF: - printf_filtered ("(TYPE_CODE_REF)"); - break; - case TYPE_CODE_CHAR: - printf_filtered ("(TYPE_CODE_CHAR)"); - break; - case TYPE_CODE_BOOL: - printf_filtered ("(TYPE_CODE_BOOL)"); - break; - case TYPE_CODE_TYPEDEF: - printf_filtered ("(TYPE_CODE_TYPEDEF)"); - break; - default: - printf_filtered ("(UNKNOWN TYPE CODE)"); - break; + case TYPE_CODE_UNDEF: + printf_filtered ("(TYPE_CODE_UNDEF)"); + break; + case TYPE_CODE_PTR: + printf_filtered ("(TYPE_CODE_PTR)"); + break; + case TYPE_CODE_ARRAY: + printf_filtered ("(TYPE_CODE_ARRAY)"); + break; + case TYPE_CODE_STRUCT: + printf_filtered ("(TYPE_CODE_STRUCT)"); + break; + case TYPE_CODE_UNION: + printf_filtered ("(TYPE_CODE_UNION)"); + break; + case TYPE_CODE_ENUM: + printf_filtered ("(TYPE_CODE_ENUM)"); + break; + case TYPE_CODE_FUNC: + printf_filtered ("(TYPE_CODE_FUNC)"); + break; + case TYPE_CODE_INT: + printf_filtered ("(TYPE_CODE_INT)"); + break; + case TYPE_CODE_FLT: + printf_filtered ("(TYPE_CODE_FLT)"); + break; + case TYPE_CODE_VOID: + printf_filtered ("(TYPE_CODE_VOID)"); + break; + case TYPE_CODE_SET: + printf_filtered ("(TYPE_CODE_SET)"); + break; + case TYPE_CODE_RANGE: + printf_filtered ("(TYPE_CODE_RANGE)"); + break; + case TYPE_CODE_STRING: + printf_filtered ("(TYPE_CODE_STRING)"); + break; + case TYPE_CODE_BITSTRING: + printf_filtered ("(TYPE_CODE_BITSTRING)"); + break; + case TYPE_CODE_ERROR: + printf_filtered ("(TYPE_CODE_ERROR)"); + break; + case TYPE_CODE_MEMBER: + printf_filtered ("(TYPE_CODE_MEMBER)"); + break; + case TYPE_CODE_METHOD: + printf_filtered ("(TYPE_CODE_METHOD)"); + break; + case TYPE_CODE_REF: + printf_filtered ("(TYPE_CODE_REF)"); + break; + case TYPE_CODE_CHAR: + printf_filtered ("(TYPE_CODE_CHAR)"); + break; + case TYPE_CODE_BOOL: + printf_filtered ("(TYPE_CODE_BOOL)"); + break; + case TYPE_CODE_COMPLEX: + printf_filtered ("(TYPE_CODE_COMPLEX)"); + break; + case TYPE_CODE_TYPEDEF: + printf_filtered ("(TYPE_CODE_TYPEDEF)"); + break; + case TYPE_CODE_TEMPLATE: + printf_filtered ("(TYPE_CODE_TEMPLATE)"); + break; + case TYPE_CODE_TEMPLATE_ARG: + printf_filtered ("(TYPE_CODE_TEMPLATE_ARG)"); + break; + default: + printf_filtered ("(UNKNOWN TYPE CODE)"); + break; } puts_filtered ("\n"); printfi_filtered (spaces, "length %d\n", TYPE_LENGTH (type)); + printfi_filtered (spaces, "upper_bound_type 0x%x ", + TYPE_ARRAY_UPPER_BOUND_TYPE (type)); + print_bound_type (TYPE_ARRAY_UPPER_BOUND_TYPE (type)); + puts_filtered ("\n"); + printfi_filtered (spaces, "lower_bound_type 0x%x ", + TYPE_ARRAY_LOWER_BOUND_TYPE (type)); + print_bound_type (TYPE_ARRAY_LOWER_BOUND_TYPE (type)); + puts_filtered ("\n"); printfi_filtered (spaces, "objfile "); - gdb_print_address (TYPE_OBJFILE (type), gdb_stdout); + gdb_print_host_address (TYPE_OBJFILE (type), gdb_stdout); printf_filtered ("\n"); printfi_filtered (spaces, "target_type "); - gdb_print_address (TYPE_TARGET_TYPE (type), gdb_stdout); + gdb_print_host_address (TYPE_TARGET_TYPE (type), gdb_stdout); printf_filtered ("\n"); if (TYPE_TARGET_TYPE (type) != NULL) { recursive_dump_type (TYPE_TARGET_TYPE (type), spaces + 2); } printfi_filtered (spaces, "pointer_type "); - gdb_print_address (TYPE_POINTER_TYPE (type), gdb_stdout); + gdb_print_host_address (TYPE_POINTER_TYPE (type), gdb_stdout); printf_filtered ("\n"); printfi_filtered (spaces, "reference_type "); - gdb_print_address (TYPE_REFERENCE_TYPE (type), gdb_stdout); + gdb_print_host_address (TYPE_REFERENCE_TYPE (type), gdb_stdout); + printf_filtered ("\n"); + printfi_filtered (spaces, "cv_type "); + gdb_print_host_address (TYPE_CV_TYPE (type), gdb_stdout); + printf_filtered ("\n"); + printfi_filtered (spaces, "as_type "); + gdb_print_host_address (TYPE_AS_TYPE (type), gdb_stdout); printf_filtered ("\n"); printfi_filtered (spaces, "flags 0x%x", TYPE_FLAGS (type)); - if (TYPE_FLAGS (type) & TYPE_FLAG_UNSIGNED) + if (TYPE_UNSIGNED (type)) { puts_filtered (" TYPE_FLAG_UNSIGNED"); } - if (TYPE_FLAGS (type) & TYPE_FLAG_STUB) + if (TYPE_NOSIGN (type)) + { + puts_filtered (" TYPE_FLAG_NOSIGN"); + } + if (TYPE_STUB (type)) { puts_filtered (" TYPE_FLAG_STUB"); } + if (TYPE_TARGET_STUB (type)) + { + puts_filtered (" TYPE_FLAG_TARGET_STUB"); + } + if (TYPE_STATIC (type)) + { + puts_filtered (" TYPE_FLAG_STATIC"); + } + if (TYPE_CONST (type)) + { + puts_filtered (" TYPE_FLAG_CONST"); + } + if (TYPE_VOLATILE (type)) + { + puts_filtered (" TYPE_FLAG_VOLATILE"); + } + if (TYPE_PROTOTYPED (type)) + { + puts_filtered (" TYPE_FLAG_PROTOTYPED"); + } + if (TYPE_INCOMPLETE (type)) + { + puts_filtered (" TYPE_FLAG_INCOMPLETE"); + } + if (TYPE_CODE_SPACE (type)) + { + puts_filtered (" TYPE_FLAG_CODE_SPACE"); + } + if (TYPE_DATA_SPACE (type)) + { + puts_filtered (" TYPE_FLAG_DATA_SPACE"); + } + if (TYPE_VARARGS (type)) + { + puts_filtered (" TYPE_FLAG_VARARGS"); + } puts_filtered ("\n"); printfi_filtered (spaces, "nfields %d ", TYPE_NFIELDS (type)); - gdb_print_address (TYPE_FIELDS (type), gdb_stdout); + gdb_print_host_address (TYPE_FIELDS (type), gdb_stdout); puts_filtered ("\n"); for (idx = 0; idx < TYPE_NFIELDS (type); idx++) { @@ -2711,12 +3027,12 @@ recursive_dump_type (type, spaces) "[%d] bitpos %d bitsize %d type ", idx, TYPE_FIELD_BITPOS (type, idx), TYPE_FIELD_BITSIZE (type, idx)); - gdb_print_address (TYPE_FIELD_TYPE (type, idx), gdb_stdout); + gdb_print_host_address (TYPE_FIELD_TYPE (type, idx), gdb_stdout); printf_filtered (" name '%s' (", TYPE_FIELD_NAME (type, idx) != NULL ? TYPE_FIELD_NAME (type, idx) : "<NULL>"); - gdb_print_address (TYPE_FIELD_NAME (type, idx), gdb_stdout); + gdb_print_host_address (TYPE_FIELD_NAME (type, idx), gdb_stdout); printf_filtered (")\n"); if (TYPE_FIELD_TYPE (type, idx) != NULL) { @@ -2724,7 +3040,7 @@ recursive_dump_type (type, spaces) } } printfi_filtered (spaces, "vptr_basetype "); - gdb_print_address (TYPE_VPTR_BASETYPE (type), gdb_stdout); + gdb_print_host_address (TYPE_VPTR_BASETYPE (type), gdb_stdout); puts_filtered ("\n"); if (TYPE_VPTR_BASETYPE (type) != NULL) { @@ -2733,45 +3049,52 @@ recursive_dump_type (type, spaces) printfi_filtered (spaces, "vptr_fieldno %d\n", TYPE_VPTR_FIELDNO (type)); switch (TYPE_CODE (type)) { - case TYPE_CODE_METHOD: - case TYPE_CODE_FUNC: - printfi_filtered (spaces, "arg_types "); - gdb_print_address (TYPE_ARG_TYPES (type), gdb_stdout); - puts_filtered ("\n"); - print_arg_types (TYPE_ARG_TYPES (type), spaces); - break; + case TYPE_CODE_METHOD: + case TYPE_CODE_FUNC: + printfi_filtered (spaces, "arg_types "); + gdb_print_host_address (TYPE_ARG_TYPES (type), gdb_stdout); + puts_filtered ("\n"); + print_arg_types (TYPE_ARG_TYPES (type), spaces); + break; - case TYPE_CODE_STRUCT: - printfi_filtered (spaces, "cplus_stuff "); - gdb_print_address (TYPE_CPLUS_SPECIFIC (type), gdb_stdout); - puts_filtered ("\n"); - print_cplus_stuff (type, spaces); - break; + case TYPE_CODE_STRUCT: + printfi_filtered (spaces, "cplus_stuff "); + gdb_print_host_address (TYPE_CPLUS_SPECIFIC (type), gdb_stdout); + puts_filtered ("\n"); + print_cplus_stuff (type, spaces); + break; - default: - /* We have to pick one of the union types to be able print and test - the value. Pick cplus_struct_type, even though we know it isn't - any particular one. */ - printfi_filtered (spaces, "type_specific "); - gdb_print_address (TYPE_CPLUS_SPECIFIC (type), gdb_stdout); - if (TYPE_CPLUS_SPECIFIC (type) != NULL) - { - printf_filtered (" (unknown data form)"); - } - printf_filtered ("\n"); - break; + case TYPE_CODE_FLT: + printfi_filtered (spaces, "floatformat "); + if (TYPE_FLOATFORMAT (type) == NULL + || TYPE_FLOATFORMAT (type)->name == NULL) + puts_filtered ("(null)"); + else + puts_filtered (TYPE_FLOATFORMAT (type)->name); + puts_filtered ("\n"); + break; + + default: + /* We have to pick one of the union types to be able print and test + the value. Pick cplus_struct_type, even though we know it isn't + any particular one. */ + printfi_filtered (spaces, "type_specific "); + gdb_print_host_address (TYPE_CPLUS_SPECIFIC (type), gdb_stdout); + if (TYPE_CPLUS_SPECIFIC (type) != NULL) + { + printf_filtered (" (unknown data form)"); + } + printf_filtered ("\n"); + break; } if (spaces == 0) obstack_free (&dont_print_type_obstack, NULL); } -#endif /* MAINTENANCE_CMDS */ - - -static void build_gdbtypes PARAMS ((void)); +static void build_gdbtypes (void); static void -build_gdbtypes () +build_gdbtypes (void) { builtin_type_void = init_type (TYPE_CODE_VOID, 1, @@ -2779,10 +3102,13 @@ build_gdbtypes () "void", (struct objfile *) NULL); builtin_type_char = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT, - 0, + (TYPE_FLAG_NOSIGN + | (TARGET_CHAR_SIGNED ? 0 : TYPE_FLAG_UNSIGNED)), "char", (struct objfile *) NULL); - TYPE_FLAGS (builtin_type_char) |= TYPE_FLAG_NOSIGN; - + builtin_type_true_char = + init_type (TYPE_CODE_CHAR, TARGET_CHAR_BIT / TARGET_CHAR_BIT, + 0, + "true character", (struct objfile *) NULL); builtin_type_signed_char = init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT, 0, @@ -2819,7 +3145,7 @@ build_gdbtypes () init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, 0, "long long", (struct objfile *) NULL); - builtin_type_unsigned_long_long = + builtin_type_unsigned_long_long = init_type (TYPE_CODE_INT, TARGET_LONG_LONG_BIT / TARGET_CHAR_BIT, TYPE_FLAG_UNSIGNED, "unsigned long long", (struct objfile *) NULL); @@ -2827,14 +3153,31 @@ build_gdbtypes () init_type (TYPE_CODE_FLT, TARGET_FLOAT_BIT / TARGET_CHAR_BIT, 0, "float", (struct objfile *) NULL); +/* vinschen@redhat.com 2002-02-08: + The below lines are disabled since they are doing the wrong + thing for non-multiarch targets. They are setting the correct + type of floats for the target but while on multiarch targets + this is done everytime the architecture changes, it's done on + non-multiarch targets only on startup, leaving the wrong values + in even if the architecture changes (eg. from big-endian to + little-endian). */ +#if 0 + TYPE_FLOATFORMAT (builtin_type_float) = TARGET_FLOAT_FORMAT; +#endif builtin_type_double = init_type (TYPE_CODE_FLT, TARGET_DOUBLE_BIT / TARGET_CHAR_BIT, 0, "double", (struct objfile *) NULL); +#if 0 + TYPE_FLOATFORMAT (builtin_type_double) = TARGET_DOUBLE_FORMAT; +#endif builtin_type_long_double = init_type (TYPE_CODE_FLT, TARGET_LONG_DOUBLE_BIT / TARGET_CHAR_BIT, 0, "long double", (struct objfile *) NULL); +#if 0 + TYPE_FLOATFORMAT (builtin_type_long_double) = TARGET_LONG_DOUBLE_FORMAT; +#endif builtin_type_complex = init_type (TYPE_CODE_COMPLEX, 2 * TARGET_FLOAT_BIT / TARGET_CHAR_BIT, 0, @@ -2881,25 +3224,212 @@ build_gdbtypes () init_type (TYPE_CODE_INT, 64 / 8, TYPE_FLAG_UNSIGNED, "uint64_t", (struct objfile *) NULL); + builtin_type_int128 = + init_type (TYPE_CODE_INT, 128 / 8, + 0, + "int128_t", (struct objfile *) NULL); + builtin_type_uint128 = + init_type (TYPE_CODE_INT, 128 / 8, + TYPE_FLAG_UNSIGNED, + "uint128_t", (struct objfile *) NULL); builtin_type_bool = init_type (TYPE_CODE_BOOL, TARGET_CHAR_BIT / TARGET_CHAR_BIT, 0, "bool", (struct objfile *) NULL); - /* Add user knob for controlling resolution of opaque types */ + /* Add user knob for controlling resolution of opaque types */ add_show_from_set - (add_set_cmd ("opaque-type-resolution", class_support, var_boolean, (char *)&opaque_type_resolution, + (add_set_cmd ("opaque-type-resolution", class_support, var_boolean, (char *) &opaque_type_resolution, "Set resolution of opaque struct/class/union types (if set before loading symbols).", &setlist), &showlist); opaque_type_resolution = 1; + /* Build SIMD types. */ + builtin_type_v4sf + = init_simd_type ("__builtin_v4sf", builtin_type_float, "f", 4); + builtin_type_v4si + = init_simd_type ("__builtin_v4si", builtin_type_int32, "f", 4); + builtin_type_v16qi + = init_simd_type ("__builtin_v16qi", builtin_type_int8, "f", 16); + builtin_type_v8qi + = init_simd_type ("__builtin_v8qi", builtin_type_int8, "f", 8); + builtin_type_v8hi + = init_simd_type ("__builtin_v8hi", builtin_type_int16, "f", 8); + builtin_type_v4hi + = init_simd_type ("__builtin_v4hi", builtin_type_int16, "f", 4); + builtin_type_v2si + = init_simd_type ("__builtin_v2si", builtin_type_int32, "f", 2); + + /* Vector types. */ + builtin_type_vec128 + = build_builtin_type_vec128 (); + + /* Pointer/Address types. */ + + /* NOTE: on some targets, addresses and pointers are not necessarily + the same --- for example, on the D10V, pointers are 16 bits long, + but addresses are 32 bits long. See doc/gdbint.texinfo, + ``Pointers Are Not Always Addresses''. + + The upshot is: + - gdb's `struct type' always describes the target's + representation. + - gdb's `struct value' objects should always hold values in + target form. + - gdb's CORE_ADDR values are addresses in the unified virtual + address space that the assembler and linker work with. Thus, + since target_read_memory takes a CORE_ADDR as an argument, it + can access any memory on the target, even if the processor has + separate code and data address spaces. + + So, for example: + - If v is a value holding a D10V code pointer, its contents are + in target form: a big-endian address left-shifted two bits. + - If p is a D10V pointer type, TYPE_LENGTH (p) == 2, just as + sizeof (void *) == 2 on the target. + + In this context, builtin_type_CORE_ADDR is a bit odd: it's a + target type for a value the target will never see. It's only + used to hold the values of (typeless) linker symbols, which are + indeed in the unified virtual address space. */ + builtin_type_void_data_ptr = make_pointer_type (builtin_type_void, NULL); + builtin_type_void_func_ptr + = lookup_pointer_type (lookup_function_type (builtin_type_void)); + builtin_type_CORE_ADDR = + init_type (TYPE_CODE_INT, TARGET_ADDR_BIT / 8, + TYPE_FLAG_UNSIGNED, + "__CORE_ADDR", (struct objfile *) NULL); + builtin_type_bfd_vma = + init_type (TYPE_CODE_INT, TARGET_BFD_VMA_BIT / 8, + TYPE_FLAG_UNSIGNED, + "__bfd_vma", (struct objfile *) NULL); } -extern void _initialize_gdbtypes PARAMS ((void)); +extern void _initialize_gdbtypes (void); void -_initialize_gdbtypes () +_initialize_gdbtypes (void) { + struct cmd_list_element *c; build_gdbtypes (); + + /* FIXME - For the moment, handle types by swapping them in and out. + Should be using the per-architecture data-pointer and a large + struct. */ + register_gdbarch_swap (&builtin_type_void, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_char, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_short, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_int, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_long, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_long_long, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_signed_char, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_unsigned_char, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_unsigned_short, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_unsigned_int, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_unsigned_long, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_unsigned_long_long, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_float, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_double, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_long_double, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_complex, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_double_complex, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_string, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_int8, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_uint8, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_int16, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_uint16, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_int32, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_uint32, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_int64, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_uint64, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_int128, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_uint128, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v4sf, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v4si, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v16qi, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v8qi, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v8hi, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v4hi, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_v2si, sizeof (struct type *), NULL); + register_gdbarch_swap (&builtin_type_vec128, sizeof (struct type *), NULL); + REGISTER_GDBARCH_SWAP (builtin_type_void_data_ptr); + REGISTER_GDBARCH_SWAP (builtin_type_void_func_ptr); + REGISTER_GDBARCH_SWAP (builtin_type_CORE_ADDR); + REGISTER_GDBARCH_SWAP (builtin_type_bfd_vma); + register_gdbarch_swap (NULL, 0, build_gdbtypes); + + /* Note: These types do not need to be swapped - they are target + neutral. */ + builtin_type_ieee_single_big = + init_type (TYPE_CODE_FLT, floatformat_ieee_single_big.totalsize / 8, + 0, "builtin_type_ieee_single_big", NULL); + TYPE_FLOATFORMAT (builtin_type_ieee_single_big) = &floatformat_ieee_single_big; + builtin_type_ieee_single_little = + init_type (TYPE_CODE_FLT, floatformat_ieee_single_little.totalsize / 8, + 0, "builtin_type_ieee_single_little", NULL); + TYPE_FLOATFORMAT (builtin_type_ieee_single_little) = &floatformat_ieee_single_little; + builtin_type_ieee_double_big = + init_type (TYPE_CODE_FLT, floatformat_ieee_double_big.totalsize / 8, + 0, "builtin_type_ieee_double_big", NULL); + TYPE_FLOATFORMAT (builtin_type_ieee_double_big) = &floatformat_ieee_double_big; + builtin_type_ieee_double_little = + init_type (TYPE_CODE_FLT, floatformat_ieee_double_little.totalsize / 8, + 0, "builtin_type_ieee_double_little", NULL); + TYPE_FLOATFORMAT (builtin_type_ieee_double_little) = &floatformat_ieee_double_little; + builtin_type_ieee_double_littlebyte_bigword = + init_type (TYPE_CODE_FLT, floatformat_ieee_double_littlebyte_bigword.totalsize / 8, + 0, "builtin_type_ieee_double_littlebyte_bigword", NULL); + TYPE_FLOATFORMAT (builtin_type_ieee_double_littlebyte_bigword) = &floatformat_ieee_double_littlebyte_bigword; + builtin_type_i387_ext = + init_type (TYPE_CODE_FLT, floatformat_i387_ext.totalsize / 8, + 0, "builtin_type_i387_ext", NULL); + TYPE_FLOATFORMAT (builtin_type_i387_ext) = &floatformat_i387_ext; + builtin_type_m68881_ext = + init_type (TYPE_CODE_FLT, floatformat_m68881_ext.totalsize / 8, + 0, "builtin_type_m68881_ext", NULL); + TYPE_FLOATFORMAT (builtin_type_m68881_ext) = &floatformat_m68881_ext; + builtin_type_i960_ext = + init_type (TYPE_CODE_FLT, floatformat_i960_ext.totalsize / 8, + 0, "builtin_type_i960_ext", NULL); + TYPE_FLOATFORMAT (builtin_type_i960_ext) = &floatformat_i960_ext; + builtin_type_m88110_ext = + init_type (TYPE_CODE_FLT, floatformat_m88110_ext.totalsize / 8, + 0, "builtin_type_m88110_ext", NULL); + TYPE_FLOATFORMAT (builtin_type_m88110_ext) = &floatformat_m88110_ext; + builtin_type_m88110_harris_ext = + init_type (TYPE_CODE_FLT, floatformat_m88110_harris_ext.totalsize / 8, + 0, "builtin_type_m88110_harris_ext", NULL); + TYPE_FLOATFORMAT (builtin_type_m88110_harris_ext) = &floatformat_m88110_harris_ext; + builtin_type_arm_ext_big = + init_type (TYPE_CODE_FLT, floatformat_arm_ext_big.totalsize / 8, + 0, "builtin_type_arm_ext_big", NULL); + TYPE_FLOATFORMAT (builtin_type_arm_ext_big) = &floatformat_arm_ext_big; + builtin_type_arm_ext_littlebyte_bigword = + init_type (TYPE_CODE_FLT, floatformat_arm_ext_littlebyte_bigword.totalsize / 8, + 0, "builtin_type_arm_ext_littlebyte_bigword", NULL); + TYPE_FLOATFORMAT (builtin_type_arm_ext_littlebyte_bigword) = &floatformat_arm_ext_littlebyte_bigword; + builtin_type_ia64_spill_big = + init_type (TYPE_CODE_FLT, floatformat_ia64_spill_big.totalsize / 8, + 0, "builtin_type_ia64_spill_big", NULL); + TYPE_FLOATFORMAT (builtin_type_ia64_spill_big) = &floatformat_ia64_spill_big; + builtin_type_ia64_spill_little = + init_type (TYPE_CODE_FLT, floatformat_ia64_spill_little.totalsize / 8, + 0, "builtin_type_ia64_spill_little", NULL); + TYPE_FLOATFORMAT (builtin_type_ia64_spill_little) = &floatformat_ia64_spill_little; + builtin_type_ia64_quad_big = + init_type (TYPE_CODE_FLT, floatformat_ia64_quad_big.totalsize / 8, + 0, "builtin_type_ia64_quad_big", NULL); + TYPE_FLOATFORMAT (builtin_type_ia64_quad_big) = &floatformat_ia64_quad_big; + builtin_type_ia64_quad_little = + init_type (TYPE_CODE_FLT, floatformat_ia64_quad_little.totalsize / 8, + 0, "builtin_type_ia64_quad_little", NULL); + TYPE_FLOATFORMAT (builtin_type_ia64_quad_little) = &floatformat_ia64_quad_little; + + add_show_from_set ( + add_set_cmd ("overload", no_class, var_zinteger, (char *) &overload_debug, + "Set debugging of C++ overloading.\n\ + When enabled, ranking of the functions\n\ + is displayed.", &setdebuglist), + &showdebuglist); } |