2006-05-03 Paul Brook <paul@codesourcery.com>
+ Daniel Jacobowitz <dan@codesourcery.com>
+
+ * gdb/dwarf2read.c (read_subroutine_type): Add armcc workaround.
+
+ * gdb/dwarf2read.c (read_structure_type): Look for ADS vtable
+ pointers.
+
+ * gdb/dwarf2read.c (dwarf_decode_lines): Don't set dir for absolute
+ paths.
+ (dwarf_decode_lines): Ditto.
+ (dwarf2_start_subfile): Split absolute filenames into path+file.
+
+ * gdb/symtab.h (struct symbol): Add is_argument.
+ (SYMBOL_IS_ARGUMENT): Define.
+ * gdb/stack.c (print_frame_args): Use SYMBOL_IS_ARGUMENT.
+ (print_frame_arg_vars): Ditto.
+ * gdb/dwarf2read.c (new_symbol): Set SYMBOL_IS_ARGUMENT.
+ (new_symbol): Mark optimized out arguments.
+
+ * gdb/dwarf2read.c (partial_read_comp_unit_head): Accept version 3.
+
+ * gdb/dwarf2read.c (read_unspecified_type): New function.
+ (read_type_die): Handle DW_TAG_unspecified_type.
+
+2006-05-03 Paul Brook <paul@codesourcery.com>
+ Daniel Jacobowitz <dan@codesourcery.com>
* gdb/dwarf2read.c (field_info): Add baseclasses.
(dwarf2_add_field): Check base classes.
info_ptr = read_comp_unit_head (header, info_ptr, abfd);
- if (header->version != 2)
+ if (header->version != 2 && header->version != 3)
error (_("Dwarf Error: wrong version in compilation unit header "
"(is %d, should be %d) [in module %s]"), header->version,
2, bfd_get_filename (abfd));
}
}
}
+ else if (cu->producer
+ && strncmp (cu->producer,
+ "ARM C++ Compiler, ADS", 21) == 0)
+ {
+ /* The ARM compiler does not provide direct indication
+ of the containing type, but the vtable pointer is
+ always named __VPTR. Of course, we don't support this
+ C++ ABI, so this isn't too useful. */
+
+ int i;
+
+ for (i = TYPE_NFIELDS (type) - 1;
+ i >= TYPE_N_BASECLASSES (type);
+ --i)
+ {
+ if (strcmp (TYPE_FIELD_NAME (type, i), "__VPTR") == 0)
+ {
+ TYPE_VPTR_FIELDNO (type) = i;
+ TYPE_VPTR_BASETYPE (type) = type;
+ break;
+ }
+ }
+ }
}
do_cleanups (back_to);
struct type *type; /* Type that this function returns */
struct type *ftype; /* Function that returns above type */
struct attribute *attr;
+ struct die_info *spec_die;
/* Decode the type that this subroutine returns */
if (die->type)
{
return;
}
+
+ /* This works around a bug in armcc. It marks "this" as artificial
+ in the declaration but not in the definition. It's also more
+ efficient. Should we be doing this for all types? */
+ spec_die = die_specification (die, cu);
+ if (spec_die)
+ {
+ if (spec_die->type == NULL)
+ read_type_die (spec_die, cu);
+ die->type = spec_die->type;
+ set_die_type (die, die->type, cu);
+ return;
+ }
+
type = die_type (die, cu);
ftype = make_function_type (type, (struct type **) 0);
set_die_type (die, range_type, cu);
}
+static void
+read_unspecified_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *type;
+ struct attribute *attr;
+
+ if (die->type)
+ return;
+
+ /* For now, we only support the C meaning of an unspecified type: void. */
+
+ attr = dwarf2_attr (die, DW_AT_name, cu);
+ type = init_type (TYPE_CODE_VOID, 0, 0, attr ? DW_STRING (attr) : "",
+ cu->objfile);
+
+ set_die_type (die, type, cu);
+}
/* Read a whole compilation unit into a linked list of dies. */
if (fe->dir_index)
dir = lh->include_dirs[fe->dir_index - 1];
- else
+ else if (!IS_ABSOLUTE_PATH (fe->name))
dir = comp_dir;
+ else
+ dir = NULL;
+
dwarf2_start_subfile (fe->name, dir);
}
fe = &lh->file_names[file - 1];
if (fe->dir_index)
dir = lh->include_dirs[fe->dir_index - 1];
- else
+ else if (!IS_ABSOLUTE_PATH (fe->name))
dir = comp_dir;
+ else
+ dir = NULL;
if (!decode_for_pst_p)
dwarf2_start_subfile (fe->name, dir);
}
static void
dwarf2_start_subfile (char *filename, char *dirname)
{
+ /* If the filename is absolute and no directory is known then
+ split into a directory and relative path. */
+ if (dirname == NULL && IS_ABSOLUTE_PATH (filename))
+ {
+ char *new_name = (char *) lbasename (filename);
+ dirname = alloca (new_name - filename);
+ memcpy (dirname, filename, new_name - filename - 1);
+ dirname[new_name - filename - 1] = '\0';
+ filename = new_name;
+ }
+
/* If the filename isn't absolute, try to match an existing subfile
with the full pathname. */
if (!IS_ABSOLUTE_PATH (filename) && dirname != NULL)
{
struct subfile *subfile;
- char *fullname = concat (dirname, "/", filename, (char *)NULL);
+ char *fullname;
+
+ if (dirname[strlen (dirname) - 1] == '/')
+ fullname = concat (dirname, filename, (char *)NULL);
+ else
+ fullname = concat (dirname, "/", filename, (char *)NULL);
for (subfile = subfiles; subfile; subfile = subfile->next)
{
}
xfree (fullname);
}
+
start_subfile (filename, dirname);
}
}
break;
case DW_TAG_formal_parameter:
+ SYMBOL_IS_ARGUMENT (sym) = 1;
attr = dwarf2_attr (die, DW_AT_location, cu);
if (attr)
{
if (SYMBOL_CLASS (sym) == LOC_COMPUTED)
SYMBOL_CLASS (sym) = LOC_COMPUTED_ARG;
}
+ else
+ SYMBOL_CLASS (sym) = LOC_OPTIMIZED_OUT;
attr = dwarf2_attr (die, DW_AT_const_value, cu);
if (attr)
{
case DW_TAG_base_type:
read_base_type (die, cu);
break;
+ case DW_TAG_unspecified_type:
+ read_unspecified_type (die, cu);
+ break;
default:
complaint (&symfile_complaints, _("unexepected tag in read_type_die: '%s'"),
dwarf_tag_name (die->tag));
ENUM_BITFIELD(address_class) aclass : 6;
+ /* Currently the address class determines whether a block-local symbol
+ is a local variable or an argument. If IS_ARGUMENT is set, the symbol
+ is an argument even if ACLASS does not indicate so. This is not set
+ by all debug readers in all circumstances, so a symbol is an argument
+ if either this flag or ACLASS indicates so. */
+ unsigned int is_argument : 1;
+
/* Line number of definition. FIXME: Should we really make the assumption
that nobody will try to debug files longer than 64K lines? What about
machine generated programs? */
#define SYMBOL_OBJFILE(symbol) (symbol)->aux_value.objfile
#define SYMBOL_OPS(symbol) (symbol)->ops
#define SYMBOL_LOCATION_BATON(symbol) (symbol)->aux_value.ptr
+#define SYMBOL_IS_ARGUMENT(symbol) (symbol)->is_argument
\f
/* A partial_symbol records the name, domain, and address class of
symbols whose types we have not parsed yet. For functions, it also
projects / external / binutils.git / commitdiff