/* DWARF debugging format support for GDB.
- Copyright (C) 1991 Free Software Foundation, Inc.
- Written by Fred Fish at Cygnus Support, portions based on dbxread.c,
+ Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+ Written by Fred Fish at Cygnus Support. Portions based on dbxread.c,
mipsread.c, coffread.c, and dwarfread.c from a Data General SVR4 gdb port.
This file is part of GDB.
FIXME: Add generation of dependencies list to partial symtab code.
-FIXME: Currently we ignore host/target byte ordering and integer size
-differences. Should remap data from external form to an internal form
-before trying to use it.
-
FIXME: Resolve minor differences between what information we put in the
partial symbol table and what dbxread puts in. For example, we don't yet
put enum constants there. And dbxread seems to invent a lot of typedefs
FIXME: Figure out a better way to tell gdb about the name of the function
contain the user's entry point (I.E. main())
-FIXME: The current DWARF specification has a very strong bias towards
-machines with 32-bit integers, as it assumes that many attributes of the
-program (such as an address) will fit in such an integer. There are many
-references in the spec to things that are 2, 4, or 8 bytes long. Given that
-we will probably run into problems on machines where some of these assumptions
-are invalid (64-bit ints for example), we don't bother at this time to try to
-make this code more flexible and just use shorts, ints, and longs (and their
-sizes) where it seems appropriate. I.E. we use a short int to hold DWARF
-tags, and assume that the tag size in the file is the same as sizeof(short).
-
FIXME: See other FIXME's and "ifdef 0" scattered throughout the code for
other things to work on, if you get bored. :-)
*/
-#include <stdio.h>
-#ifdef __STDC__
-#include <stdarg.h>
-#else
+#include "defs.h"
#include <varargs.h>
-#endif
#include <fcntl.h>
+#include <string.h>
-#include "defs.h"
#include "bfd.h"
#include "symtab.h"
+#include "gdbtypes.h"
#include "symfile.h"
+#include "objfiles.h"
+#include "libbfd.h" /* FIXME Secret Internal BFD stuff (bfd_read) */
#include "elf/dwarf.h"
-#include "ansidecl.h"
#include "buildsym.h"
+#include "demangle.h"
#ifdef MAINTENANCE /* Define to 1 to compile in some maintenance stuff */
#define SQUAWK(stuff) dwarfwarn stuff
#define R_FP 14 /* Kludge to get frame pointer register number */
#endif
-typedef unsigned int DIEREF; /* Reference to a DIE */
+typedef unsigned int DIE_REF; /* Reference to a DIE */
#ifndef GCC_PRODUCER
#define GCC_PRODUCER "GNU C "
#endif
+#ifndef GPLUS_PRODUCER
+#define GPLUS_PRODUCER "GNU C++ "
+#endif
+
+#ifndef LCC_PRODUCER
+#define LCC_PRODUCER "NCR C/C++ "
+#endif
+
+#ifndef CFRONT_PRODUCER
+#define CFRONT_PRODUCER "CFRONT " /* A wild a** guess... */
+#endif
+
#define STREQ(a,b) (strcmp(a,b)==0)
#define STREQN(a,b,n) (strncmp(a,b,n)==0)
+/* Flags to target_to_host() that tell whether or not the data object is
+ expected to be signed. Used, for example, when fetching a signed
+ integer in the target environment which is used as a signed integer
+ in the host environment, and the two environments have different sized
+ ints. In this case, *somebody* has to sign extend the smaller sized
+ int. */
+
+#define GET_UNSIGNED 0 /* No sign extension required */
+#define GET_SIGNED 1 /* Sign extension required */
+
+/* Defines for things which are specified in the document "DWARF Debugging
+ Information Format" published by UNIX International, Programming Languages
+ SIG. These defines are based on revision 1.0.0, Jan 20, 1992. */
+
+#define SIZEOF_DIE_LENGTH 4
+#define SIZEOF_DIE_TAG 2
+#define SIZEOF_ATTRIBUTE 2
+#define SIZEOF_FORMAT_SPECIFIER 1
+#define SIZEOF_FMT_FT 2
+#define SIZEOF_LINETBL_LENGTH 4
+#define SIZEOF_LINETBL_LINENO 4
+#define SIZEOF_LINETBL_STMT 2
+#define SIZEOF_LINETBL_DELTA 4
+#define SIZEOF_LOC_ATOM_CODE 1
+
+#define FORM_FROM_ATTR(attr) ((attr) & 0xF) /* Implicitly specified */
+
+/* Macros that return the sizes of various types of data in the target
+ environment.
+
+ FIXME: Currently these are just compile time constants (as they are in
+ other parts of gdb as well). They need to be able to get the right size
+ either from the bfd or possibly from the DWARF info. It would be nice if
+ the DWARF producer inserted DIES that describe the fundamental types in
+ the target environment into the DWARF info, similar to the way dbx stabs
+ producers produce information about their fundamental types. */
+
+#define TARGET_FT_POINTER_SIZE(objfile) (TARGET_PTR_BIT / TARGET_CHAR_BIT)
+#define TARGET_FT_LONG_SIZE(objfile) (TARGET_LONG_BIT / TARGET_CHAR_BIT)
+
/* The Amiga SVR4 header file <dwarf.h> defines AT_element_list as a
FORM_BLOCK2, and this is the value emitted by the AT&T compiler.
However, the Issue 2 DWARF specification from AT&T defines it as
/* External variables referenced. */
-extern CORE_ADDR startup_file_start; /* From blockframe.c */
-extern CORE_ADDR startup_file_end; /* From blockframe.c */
-extern CORE_ADDR entry_scope_lowpc; /* From blockframe.c */
-extern CORE_ADDR entry_scope_highpc; /* From blockframc.c */
-extern CORE_ADDR main_scope_lowpc; /* From blockframe.c */
-extern CORE_ADDR main_scope_highpc; /* From blockframc.c */
extern int info_verbose; /* From main.c; nonzero => verbose */
-
+extern char *warning_pre_print; /* From utils.c */
/* The DWARF debugging information consists of two major pieces,
one is a block of DWARF Information Entries (DIE's) and the other
the information for a single DIE, the one currently being processed.
In order to make it easier to randomly access the attribute fields
- of the current DIE, which are specifically unordered within the DIE
+ of the current DIE, which are specifically unordered within the DIE,
each DIE is scanned and an instance of the "struct dieinfo"
structure is initialized.
typedef char BLOCK;
struct dieinfo {
- char * die; /* Pointer to the raw DIE data */
- long dielength; /* Length of the raw DIE data */
- DIEREF dieref; /* Offset of this DIE */
- short dietag; /* Tag for this DIE */
- long at_padding;
- long at_sibling;
- BLOCK * at_location;
- char * at_name;
- unsigned short at_fund_type;
- BLOCK * at_mod_fund_type;
- long at_user_def_type;
- BLOCK * at_mod_u_d_type;
- short at_ordering;
- BLOCK * at_subscr_data;
- long at_byte_size;
- short at_bit_offset;
- long at_bit_size;
- BLOCK * at_element_list;
- long at_stmt_list;
- long at_low_pc;
- long at_high_pc;
- long at_language;
- long at_member;
- long at_discr;
- BLOCK * at_discr_value;
- short at_visibility;
- long at_import;
- BLOCK * at_string_length;
- char * at_comp_dir;
- char * at_producer;
- long at_frame_base;
- long at_start_scope;
- long at_stride_size;
- long at_src_info;
- short at_prototyped;
- unsigned int has_at_low_pc:1;
- unsigned int has_at_stmt_list:1;
- unsigned int short_element_list:1;
+ char * die; /* Pointer to the raw DIE data */
+ unsigned long die_length; /* Length of the raw DIE data */
+ DIE_REF die_ref; /* Offset of this DIE */
+ unsigned short die_tag; /* Tag for this DIE */
+ unsigned long at_padding;
+ unsigned long at_sibling;
+ BLOCK * at_location;
+ char * at_name;
+ unsigned short at_fund_type;
+ BLOCK * at_mod_fund_type;
+ unsigned long at_user_def_type;
+ BLOCK * at_mod_u_d_type;
+ unsigned short at_ordering;
+ BLOCK * at_subscr_data;
+ unsigned long at_byte_size;
+ unsigned short at_bit_offset;
+ unsigned long at_bit_size;
+ BLOCK * at_element_list;
+ unsigned long at_stmt_list;
+ unsigned long at_low_pc;
+ unsigned long at_high_pc;
+ unsigned long at_language;
+ unsigned long at_member;
+ unsigned long at_discr;
+ BLOCK * at_discr_value;
+ unsigned short at_visibility;
+ unsigned long at_import;
+ BLOCK * at_string_length;
+ char * at_comp_dir;
+ char * at_producer;
+ unsigned long at_frame_base;
+ unsigned long at_start_scope;
+ unsigned long at_stride_size;
+ unsigned long at_src_info;
+ char * at_prototyped;
+ unsigned int has_at_low_pc:1;
+ unsigned int has_at_stmt_list:1;
+ unsigned int short_element_list:1;
};
static int diecount; /* Approximate count of dies for compilation unit */
static int isreg; /* Kludge to identify register variables */
static int offreg; /* Kludge to identify basereg references */
+/* This value is added to each symbol value. FIXME: Generalize to
+ the section_offsets structure used by dbxread. */
static CORE_ADDR baseaddr; /* Add to each symbol value */
+/* The section offsets used in the current psymtab or symtab. FIXME,
+ only used to pass one value (baseaddr) at the moment. */
+static struct section_offsets *base_section_offsets;
+
/* Each partial symbol table entry contains a pointer to private data for the
read_symtab() function to use when expanding a partial symbol table entry
to a full symbol table entry. For DWARF debugging info, this data is
local scope, and all other local scopes as nested local scopes, and worked
fine. Check to see if we really need to distinguish these in buildsym.c */
-struct pending **list_in_scope;
+struct pending **list_in_scope = &file_symbols;
/* DIES which have user defined types or modified user defined types refer to
other DIES for the type information. Thus we need to associate the offset
static int numutypes; /* Max number of user type pointers */
/* Forward declarations of static functions so we don't have to worry
- about ordering within this file. The EXFUN macro may be slightly
- misleading. Should probably be called DCLFUN instead, or something
- more intuitive, since it can be used for both static and external
- definitions. */
+ about ordering within this file. */
+
+static int
+attribute_size PARAMS ((unsigned int));
+
+static unsigned long
+target_to_host PARAMS ((char *, int, int, struct objfile *));
+
+static void
+add_enum_psymbol PARAMS ((struct dieinfo *, struct objfile *));
+
+static void
+handle_producer PARAMS ((char *));
+
+static void
+read_file_scope PARAMS ((struct dieinfo *, char *, char *, struct objfile *));
static void
-EXFUN (dwarfwarn, (char *fmt DOTS));
+read_func_scope PARAMS ((struct dieinfo *, char *, char *, struct objfile *));
static void
-EXFUN (scan_partial_symbols, (char *thisdie AND char *enddie));
+read_lexical_block_scope PARAMS ((struct dieinfo *, char *, char *,
+ struct objfile *));
static void
-EXFUN (scan_compilation_units,
- (char *filename AND char *thisdie AND char *enddie
- AND unsigned int dbfoff AND unsigned int lnoffset
- AND struct objfile *objfile));
-
-static struct partial_symtab *
-EXFUN(dwarf_start_psymtab, (struct objfile *objfile AND CORE_ADDR addr
- AND char *filename AND CORE_ADDR textlow
- AND CORE_ADDR texthigh AND int dbfoff
- AND int curoff AND int culength AND int lnfoff
- AND struct partial_symbol *global_syms
- AND struct partial_symbol *static_syms));
+dwarfwarn ();
static void
-EXFUN(add_partial_symbol, (struct dieinfo *dip));
+scan_partial_symbols PARAMS ((char *, char *, struct objfile *));
static void
-EXFUN(init_psymbol_list, (int total_symbols));
+scan_compilation_units PARAMS ((char *, char *, char *, unsigned int,
+ unsigned int, struct objfile *));
static void
-EXFUN(basicdieinfo, (struct dieinfo *dip AND char *diep));
+add_partial_symbol PARAMS ((struct dieinfo *, struct objfile *));
static void
-EXFUN(completedieinfo, (struct dieinfo *dip));
+init_psymbol_list PARAMS ((struct objfile *, int));
static void
-EXFUN(dwarf_psymtab_to_symtab, (struct partial_symtab *pst));
+basicdieinfo PARAMS ((struct dieinfo *, char *, struct objfile *));
static void
-EXFUN(psymtab_to_symtab_1, (struct partial_symtab *pst));
+completedieinfo PARAMS ((struct dieinfo *, struct objfile *));
+
+static void
+dwarf_psymtab_to_symtab PARAMS ((struct partial_symtab *));
+
+static void
+psymtab_to_symtab_1 PARAMS ((struct partial_symtab *));
static struct symtab *
-EXFUN(read_ofile_symtab, (struct partial_symtab *pst));
+read_ofile_symtab PARAMS ((struct partial_symtab *));
static void
-EXFUN(process_dies,
- (char *thisdie AND char *enddie AND struct objfile *objfile));
+process_dies PARAMS ((char *, char *, struct objfile *));
static void
-EXFUN(read_structure_scope,
- (struct dieinfo *dip AND char *thisdie AND char *enddie AND
- struct objfile *objfile));
+read_structure_scope PARAMS ((struct dieinfo *, char *, char *,
+ struct objfile *));
static struct type *
-EXFUN(decode_array_element_type, (char *scan AND char *end));
+decode_array_element_type PARAMS ((char *));
static struct type *
-EXFUN(decode_subscr_data, (char *scan AND char *end));
+decode_subscr_data PARAMS ((char *, char *));
+
+static void
+dwarf_read_array_type PARAMS ((struct dieinfo *));
static void
-EXFUN(dwarf_read_array_type, (struct dieinfo *dip));
+read_tag_pointer_type PARAMS ((struct dieinfo *dip));
static void
-EXFUN(read_subroutine_type,
- (struct dieinfo *dip AND char *thisdie AND char *enddie));
+read_subroutine_type PARAMS ((struct dieinfo *, char *, char *));
static void
-EXFUN(read_enumeration,
- (struct dieinfo *dip AND char *thisdie AND char *enddie));
+read_enumeration PARAMS ((struct dieinfo *, char *, char *, struct objfile *));
static struct type *
-EXFUN(struct_type,
- (struct dieinfo *dip AND char *thisdie AND char *enddie AND
- struct objfile *objfile));
+struct_type PARAMS ((struct dieinfo *, char *, char *, struct objfile *));
static struct type *
-EXFUN(enum_type, (struct dieinfo *dip));
+enum_type PARAMS ((struct dieinfo *, struct objfile *));
static void
-EXFUN(decode_line_numbers, (char *linetable));
+decode_line_numbers PARAMS ((char *));
static struct type *
-EXFUN(decode_die_type, (struct dieinfo *dip));
+decode_die_type PARAMS ((struct dieinfo *));
static struct type *
-EXFUN(decode_mod_fund_type, (char *typedata));
+decode_mod_fund_type PARAMS ((char *));
static struct type *
-EXFUN(decode_mod_u_d_type, (char *typedata));
+decode_mod_u_d_type PARAMS ((char *));
static struct type *
-EXFUN(decode_modified_type,
- (unsigned char *modifiers AND unsigned short modcount AND int mtype));
+decode_modified_type PARAMS ((char *, unsigned int, int));
static struct type *
-EXFUN(decode_fund_type, (unsigned short fundtype));
+decode_fund_type PARAMS ((unsigned int));
static char *
-EXFUN(create_name, (char *name AND struct obstack *obstackp));
+create_name PARAMS ((char *, struct obstack *));
static struct type *
-EXFUN(lookup_utype, (DIEREF dieref));
+lookup_utype PARAMS ((DIE_REF));
static struct type *
-EXFUN(alloc_utype, (DIEREF dieref AND struct type *usetype));
+alloc_utype PARAMS ((DIE_REF, struct type *));
static struct symbol *
-EXFUN(new_symbol, (struct dieinfo *dip));
+new_symbol PARAMS ((struct dieinfo *, struct objfile *));
static int
-EXFUN(locval, (char *loc));
+locval PARAMS ((char *));
static void
-EXFUN(record_misc_function, (char *name AND CORE_ADDR address AND
- enum misc_function_type));
-
-static int
-EXFUN(compare_psymbols,
- (struct partial_symbol *s1 AND struct partial_symbol *s2));
-
+record_minimal_symbol PARAMS ((char *, CORE_ADDR, enum minimal_symbol_type,
+ struct objfile *));
/*
SYNOPSIS
- void dwarf_build_psymtabs (int desc, char *filename, CORE_ADDR addr,
+ void dwarf_build_psymtabs (int desc, char *filename,
+ struct section_offsets *section_offsets,
int mainline, unsigned int dbfoff, unsigned int dbsize,
unsigned int lnoffset, unsigned int lnsize,
struct objfile *objfile)
*/
void
-DEFUN(dwarf_build_psymtabs,
- (desc, filename, addr, mainline, dbfoff, dbsize, lnoffset, lnsize,
- objfile),
- int desc AND
- char *filename AND
- CORE_ADDR addr AND
- int mainline AND
- unsigned int dbfoff AND
- unsigned int dbsize AND
- unsigned int lnoffset AND
- unsigned int lnsize AND
- struct objfile *objfile)
+dwarf_build_psymtabs (desc, filename, section_offsets, mainline, dbfoff, dbsize,
+ lnoffset, lnsize, objfile)
+ int desc;
+ char *filename;
+ struct section_offsets *section_offsets;
+ int mainline;
+ unsigned int dbfoff;
+ unsigned int dbsize;
+ unsigned int lnoffset;
+ unsigned int lnsize;
+ struct objfile *objfile;
{
struct cleanup *back_to;
+ current_objfile = objfile;
dbbase = xmalloc (dbsize);
dbroff = 0;
if ((lseek (desc, dbfoff, 0) != dbfoff) ||
Since we have no idea how many DIES we are looking at, we just guess
some arbitrary value. */
- if (mainline || global_psymbols.size == 0 || static_psymbols.size == 0)
+ if (mainline || objfile -> global_psymbols.size == 0 ||
+ objfile -> static_psymbols.size == 0)
{
- init_psymbol_list (1024);
+ init_psymbol_list (objfile, 1024);
}
- /* From this point on, we don't need to pass mainline around, so zap
- baseaddr to zero if we don't need relocation. */
+ /* Save the relocation factor where everybody can see it. */
- if (mainline)
- {
- baseaddr = 0;
- }
- else
- {
- baseaddr = addr;
- }
+ base_section_offsets = section_offsets;
+ baseaddr = ANOFFSET (section_offsets, 0);
/* Follow the compilation unit sibling chain, building a partial symbol
table entry for each one. Save enough information about each compilation
dbfoff, lnoffset, objfile);
do_cleanups (back_to);
+ current_objfile = NULL;
}
LOCAL FUNCTION
- record_misc_function -- add entry to miscellaneous function vector
+ record_minimal_symbol -- add entry to gdb's minimal symbol table
SYNOPSIS
- static void record_misc_function (char *name, CORE_ADDR address,
- enum misc_function_type mf_type)
+ static void record_minimal_symbol (char *name, CORE_ADDR address,
+ enum minimal_symbol_type ms_type,
+ struct objfile *objfile)
DESCRIPTION
Given a pointer to the name of a symbol that should be added to the
- miscellaneous function vector, and the address associated with that
+ minimal symbol table, and the address associated with that
symbol, records this information for later use in building the
- miscellaneous function vector.
+ minimal symbol table.
*/
static void
-DEFUN(record_misc_function, (name, address, mf_type),
- char *name AND CORE_ADDR address AND enum misc_function_type mf_type)
+record_minimal_symbol (name, address, ms_type, objfile)
+ char *name;
+ CORE_ADDR address;
+ enum minimal_symbol_type ms_type;
+ struct objfile *objfile;
{
- prim_record_misc_function (obsavestring (name, strlen (name)), address,
- mf_type);
+ name = obsavestring (name, strlen (name), &objfile -> symbol_obstack);
+ prim_record_minimal_symbol (name, address, ms_type);
}
/*
information for the DIE where the problem was noticed.
*/
-#ifdef __STDC__
-
-static void
-DEFUN(dwarfwarn, (fmt), char *fmt DOTS)
-{
- va_list ap;
-
- va_start (ap, fmt);
- warning_setup ();
- fprintf (stderr, "DWARF warning (ref 0x%x): ", curdie -> dieref);
- if (curdie -> at_name)
- {
- fprintf (stderr, "'%s': ", curdie -> at_name);
- }
- vfprintf (stderr, fmt, ap);
- fprintf (stderr, "\n");
- fflush (stderr);
- va_end (ap);
-}
-
-#else
-
static void
dwarfwarn (va_alist)
va_dcl
va_start (ap);
fmt = va_arg (ap, char *);
warning_setup ();
- fprintf (stderr, "DWARF warning (ref 0x%x): ", curdie -> dieref);
+ fprintf (stderr, "warning: DWARF ref 0x%x: ", curdie -> die_ref);
if (curdie -> at_name)
{
fprintf (stderr, "'%s': ", curdie -> at_name);
va_end (ap);
}
-#endif
-
-/*
-
-LOCAL FUNCTION
-
- compare_psymbols -- compare two partial symbols by name
-
-DESCRIPTION
-
- Given pointer to two partial symbol table entries, compare
- them by name and return -N, 0, or +N (ala strcmp). Typically
- used by sorting routines like qsort().
-
-NOTES
-
- This is a copy from dbxread.c. It should be moved to a generic
- gdb file and made available for all psymtab builders (FIXME).
-
- Does direct compare of first two characters before punting
- and passing to strcmp for longer compares. Note that the
- original version had a bug whereby two null strings or two
- identically named one character strings would return the
- comparison of memory following the null byte.
-
- */
-
-static int
-DEFUN(compare_psymbols, (s1, s2),
- struct partial_symbol *s1 AND
- struct partial_symbol *s2)
-{
- register char *st1 = SYMBOL_NAME (s1);
- register char *st2 = SYMBOL_NAME (s2);
-
- if ((st1[0] - st2[0]) || !st1[0])
- {
- return (st1[0] - st2[0]);
- }
- else if ((st1[1] - st2[1]) || !st1[1])
- {
- return (st1[1] - st2[1]);
- }
- else
- {
- return (strcmp (st1 + 2, st2 + 2));
- }
-}
-
/*
LOCAL FUNCTION
*/
static void
-DEFUN(read_lexical_block_scope, (dip, thisdie, enddie, objfile),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie AND
- struct objfile *objfile)
+read_lexical_block_scope (dip, thisdie, enddie, objfile)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
register struct context_stack *new;
- (void) push_context (0, dip -> at_low_pc);
- process_dies (thisdie + dip -> dielength, enddie, objfile);
+ push_context (0, dip -> at_low_pc);
+ process_dies (thisdie + dip -> die_length, enddie, objfile);
new = pop_context ();
if (local_symbols != NULL)
{
finish_block (0, &local_symbols, new -> old_blocks, new -> start_addr,
- dip -> at_high_pc);
+ dip -> at_high_pc, objfile);
}
local_symbols = new -> locals;
}
SYNOPSIS
- static type *lookup_utype (DIEREF dieref)
+ static type *lookup_utype (DIE_REF die_ref)
DESCRIPTION
*/
static struct type *
-DEFUN(lookup_utype, (dieref), DIEREF dieref)
+lookup_utype (die_ref)
+ DIE_REF die_ref;
{
struct type *type = NULL;
int utypeidx;
- utypeidx = (dieref - dbroff) / 4;
+ utypeidx = (die_ref - dbroff) / 4;
if ((utypeidx < 0) || (utypeidx >= numutypes))
{
- dwarfwarn ("reference to DIE (0x%x) outside compilation unit", dieref);
+ dwarfwarn ("reference to DIE (0x%x) outside compilation unit", die_ref);
}
else
{
SYNOPSIS
- static type *alloc_utype (DIEREF dieref, struct type *utypep)
+ static type *alloc_utype (DIE_REF die_ref, struct type *utypep)
DESCRIPTION
- Given a die reference DIEREF, and a possible pointer to a user
+ Given a die reference DIE_REF, and a possible pointer to a user
defined type UTYPEP, register that this reference has a user
defined type and either use the specified type in UTYPEP or
make a new empty type that will be filled in later.
We should only be called after calling lookup_utype() to verify that
- there is not currently a type registered for DIEREF.
+ there is not currently a type registered for DIE_REF.
*/
static struct type *
-DEFUN(alloc_utype, (dieref, utypep),
- DIEREF dieref AND
- struct type *utypep)
+alloc_utype (die_ref, utypep)
+ DIE_REF die_ref;
+ struct type *utypep;
{
struct type **typep;
int utypeidx;
- utypeidx = (dieref - dbroff) / 4;
+ utypeidx = (die_ref - dbroff) / 4;
typep = utypes + utypeidx;
if ((utypeidx < 0) || (utypeidx >= numutypes))
{
- utypep = builtin_type_int;
- dwarfwarn ("reference to DIE (0x%x) outside compilation unit", dieref);
+ utypep = lookup_fundamental_type (current_objfile, FT_INTEGER);
+ dwarfwarn ("reference to DIE (0x%x) outside compilation unit", die_ref);
}
else if (*typep != NULL)
{
{
if (utypep == NULL)
{
- utypep = (struct type *)
- obstack_alloc (symbol_obstack, sizeof (struct type));
- (void) memset (utypep, 0, sizeof (struct type));
+ utypep = alloc_type (current_objfile);
}
*typep = utypep;
}
*/
static struct type *
-DEFUN(decode_die_type, (dip), struct dieinfo *dip)
+decode_die_type (dip)
+ struct dieinfo *dip;
{
struct type *type = NULL;
}
else
{
- type = builtin_type_int;
+ type = lookup_fundamental_type (current_objfile, FT_INTEGER);
}
return (type);
}
*/
static struct type *
-DEFUN(struct_type, (dip, thisdie, enddie, objfile),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie AND
- struct objfile *objfile)
+struct_type (dip, thisdie, enddie, objfile)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
struct type *type;
struct nextfield {
struct dieinfo mbr;
char *nextdie;
- if ((type = lookup_utype (dip -> dieref)) == NULL)
+ if ((type = lookup_utype (dip -> die_ref)) == NULL)
{
/* No forward references created an empty type, so install one now */
- type = alloc_utype (dip -> dieref, NULL);
+ type = alloc_utype (dip -> die_ref, NULL);
}
INIT_CPLUS_SPECIFIC(type);
- switch (dip -> dietag)
+ switch (dip -> die_tag)
{
case TAG_structure_type:
TYPE_CODE (type) = TYPE_CODE_STRUCT;
&& *dip -> at_name != '~'
&& *dip -> at_name != '.')
{
- TYPE_NAME (type) = obconcat (tpart1, " ", dip -> at_name);
+ TYPE_NAME (type) = obconcat (&objfile -> type_obstack,
+ tpart1, " ", dip -> at_name);
}
if (dip -> at_byte_size != 0)
{
TYPE_LENGTH (type) = dip -> at_byte_size;
}
- thisdie += dip -> dielength;
+ thisdie += dip -> die_length;
while (thisdie < enddie)
{
- basicdieinfo (&mbr, thisdie);
- completedieinfo (&mbr);
- if (mbr.dielength <= sizeof (long))
+ basicdieinfo (&mbr, thisdie, objfile);
+ completedieinfo (&mbr, objfile);
+ if (mbr.die_length <= SIZEOF_DIE_LENGTH)
{
break;
}
}
else
{
- nextdie = thisdie + mbr.dielength;
+ nextdie = thisdie + mbr.die_length;
}
- switch (mbr.dietag)
+ switch (mbr.die_tag)
{
case TAG_member:
/* Get space to record the next field's data. */
new -> next = list;
list = new;
/* Save the data. */
- list -> field.name = savestring (mbr.at_name, strlen (mbr.at_name));
+ list -> field.name =
+ obsavestring (mbr.at_name, strlen (mbr.at_name),
+ &objfile -> type_obstack);
list -> field.type = decode_die_type (&mbr);
list -> field.bitpos = 8 * locval (mbr.at_location);
- list -> field.bitsize = 0;
+ /* Handle bit fields. */
+ list -> field.bitsize = mbr.at_bit_size;
+#if BITS_BIG_ENDIAN
+ /* For big endian bits, the at_bit_offset gives the additional
+ bit offset from the MSB of the containing anonymous object to
+ the MSB of the field. We don't have to do anything special
+ since we don't need to know the size of the anonymous object. */
+ list -> field.bitpos += mbr.at_bit_offset;
+#else
+ /* For little endian bits, we need to have a non-zero at_bit_size,
+ so that we know we are in fact dealing with a bitfield. Compute
+ the bit offset to the MSB of the anonymous object, subtract off
+ the number of bits from the MSB of the field to the MSB of the
+ object, and then subtract off the number of bits of the field
+ itself. The result is the bit offset of the LSB of the field. */
+ if (mbr.at_bit_size > 0)
+ {
+ list -> field.bitpos +=
+ mbr.at_byte_size * 8 - mbr.at_bit_offset - mbr.at_bit_size;
+ }
+#endif
nfields++;
break;
default:
{
TYPE_NFIELDS (type) = nfields;
TYPE_FIELDS (type) = (struct field *)
- obstack_alloc (symbol_obstack, sizeof (struct field) * nfields);
+ obstack_alloc (&objfile -> type_obstack,
+ sizeof (struct field) * nfields);
/* Copy the saved-up fields into the field vector. */
for (n = nfields; list; list = list -> next)
{
*/
static void
-DEFUN(read_structure_scope, (dip, thisdie, enddie, objfile),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie AND
- struct objfile *objfile)
+read_structure_scope (dip, thisdie, enddie, objfile)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
struct type *type;
struct symbol *sym;
type = struct_type (dip, thisdie, enddie, objfile);
if (!(TYPE_FLAGS (type) & TYPE_FLAG_STUB))
{
- if ((sym = new_symbol (dip)) != NULL)
+ if ((sym = new_symbol (dip, objfile)) != NULL)
{
SYMBOL_TYPE (sym) = type;
}
*/
static struct type *
-DEFUN(decode_array_element_type, (scan, end), char *scan AND char *end)
+decode_array_element_type (scan)
+ char *scan;
{
struct type *typep;
- short attribute;
- DIEREF dieref;
+ DIE_REF die_ref;
+ unsigned short attribute;
unsigned short fundtype;
+ int nbytes;
- (void) memcpy (&attribute, scan, sizeof (short));
- scan += sizeof (short);
- switch (attribute)
+ attribute = target_to_host (scan, SIZEOF_ATTRIBUTE, GET_UNSIGNED,
+ current_objfile);
+ scan += SIZEOF_ATTRIBUTE;
+ if ((nbytes = attribute_size (attribute)) == -1)
{
- case AT_fund_type:
- (void) memcpy (&fundtype, scan, sizeof (short));
- typep = decode_fund_type (fundtype);
- break;
- case AT_mod_fund_type:
- typep = decode_mod_fund_type (scan);
- break;
- case AT_user_def_type:
- (void) memcpy (&dieref, scan, sizeof (DIEREF));
- if ((typep = lookup_utype (dieref)) == NULL)
- {
- typep = alloc_utype (dieref, NULL);
- }
- break;
- case AT_mod_u_d_type:
- typep = decode_mod_u_d_type (scan);
- break;
- default:
SQUAWK (("bad array element type attribute 0x%x", attribute));
- typep = builtin_type_int;
- break;
+ typep = lookup_fundamental_type (current_objfile, FT_INTEGER);
+ }
+ else
+ {
+ switch (attribute)
+ {
+ case AT_fund_type:
+ fundtype = target_to_host (scan, nbytes, GET_UNSIGNED,
+ current_objfile);
+ typep = decode_fund_type (fundtype);
+ break;
+ case AT_mod_fund_type:
+ typep = decode_mod_fund_type (scan);
+ break;
+ case AT_user_def_type:
+ die_ref = target_to_host (scan, nbytes, GET_UNSIGNED,
+ current_objfile);
+ if ((typep = lookup_utype (die_ref)) == NULL)
+ {
+ typep = alloc_utype (die_ref, NULL);
+ }
+ break;
+ case AT_mod_u_d_type:
+ typep = decode_mod_u_d_type (scan);
+ break;
+ default:
+ SQUAWK (("bad array element type attribute 0x%x", attribute));
+ typep = lookup_fundamental_type (current_objfile, FT_INTEGER);
+ break;
+ }
}
return (typep);
}
*/
static struct type *
-DEFUN(decode_subscr_data, (scan, end), char *scan AND char *end)
+decode_subscr_data (scan, end)
+ char *scan;
+ char *end;
{
struct type *typep = NULL;
struct type *nexttype;
- int format;
- short fundtype;
- long lowbound;
- long highbound;
+ unsigned int format;
+ unsigned short fundtype;
+ unsigned long lowbound;
+ unsigned long highbound;
+ int nbytes;
- format = *scan++;
+ format = target_to_host (scan, SIZEOF_FORMAT_SPECIFIER, GET_UNSIGNED,
+ current_objfile);
+ scan += SIZEOF_FORMAT_SPECIFIER;
switch (format)
{
case FMT_ET:
- typep = decode_array_element_type (scan, end);
+ typep = decode_array_element_type (scan);
break;
case FMT_FT_C_C:
- (void) memcpy (&fundtype, scan, sizeof (short));
- scan += sizeof (short);
+ fundtype = target_to_host (scan, SIZEOF_FMT_FT, GET_UNSIGNED,
+ current_objfile);
+ scan += SIZEOF_FMT_FT;
if (fundtype != FT_integer && fundtype != FT_signed_integer
&& fundtype != FT_unsigned_integer)
{
SQUAWK (("array subscripts must be integral types, not type 0x%x",
- fundtype));
+ fundtype));
}
else
{
- (void) memcpy (&lowbound, scan, sizeof (long));
- scan += sizeof (long);
- (void) memcpy (&highbound, scan, sizeof (long));
- scan += sizeof (long);
+ nbytes = TARGET_FT_LONG_SIZE (current_objfile);
+ lowbound = target_to_host (scan, nbytes, GET_UNSIGNED,
+ current_objfile);
+ scan += nbytes;
+ highbound = target_to_host (scan, nbytes, GET_UNSIGNED,
+ current_objfile);
+ scan += nbytes;
nexttype = decode_subscr_data (scan, end);
if (nexttype != NULL)
{
- typep = (struct type *)
- obstack_alloc (symbol_obstack, sizeof (struct type));
- (void) memset (typep, 0, sizeof (struct type));
+ typep = alloc_type (current_objfile);
TYPE_CODE (typep) = TYPE_CODE_ARRAY;
TYPE_LENGTH (typep) = TYPE_LENGTH (nexttype);
- TYPE_LENGTH (typep) *= lowbound + highbound + 1;
+ TYPE_LENGTH (typep) *= (highbound - lowbound) + 1;
TYPE_TARGET_TYPE (typep) = nexttype;
}
}
*/
static void
-DEFUN(dwarf_read_array_type, (dip), struct dieinfo *dip)
+dwarf_read_array_type (dip)
+ struct dieinfo *dip;
{
struct type *type;
+ struct type *utype;
char *sub;
char *subend;
- short temp;
+ unsigned short blocksz;
+ int nbytes;
if (dip -> at_ordering != ORD_row_major)
{
}
if ((sub = dip -> at_subscr_data) != NULL)
{
- (void) memcpy (&temp, sub, sizeof (short));
- subend = sub + sizeof (short) + temp;
- sub += sizeof (short);
+ nbytes = attribute_size (AT_subscr_data);
+ blocksz = target_to_host (sub, nbytes, GET_UNSIGNED, current_objfile);
+ subend = sub + nbytes + blocksz;
+ sub += nbytes;
type = decode_subscr_data (sub, subend);
if (type == NULL)
{
- type = alloc_utype (dip -> dieref, NULL);
- TYPE_CODE (type) = TYPE_CODE_ARRAY;
- TYPE_TARGET_TYPE (type) = builtin_type_int;
- TYPE_LENGTH (type) = 1 * TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+ if ((utype = lookup_utype (dip -> die_ref)) == NULL)
+ {
+ utype = alloc_utype (dip -> die_ref, NULL);
+ }
+ TYPE_CODE (utype) = TYPE_CODE_ARRAY;
+ TYPE_TARGET_TYPE (utype) =
+ lookup_fundamental_type (current_objfile, FT_INTEGER);
+ TYPE_LENGTH (utype) = 1 * TYPE_LENGTH (TYPE_TARGET_TYPE (utype));
}
else
{
- type = alloc_utype (dip -> dieref, type);
+ if ((utype = lookup_utype (dip -> die_ref)) == NULL)
+ {
+ alloc_utype (dip -> die_ref, type);
+ }
+ else
+ {
+ TYPE_CODE (utype) = TYPE_CODE_ARRAY;
+ TYPE_LENGTH (utype) = TYPE_LENGTH (type);
+ TYPE_TARGET_TYPE (utype) = TYPE_TARGET_TYPE (type);
+ }
}
}
}
/*
+LOCAL FUNCTION
+
+ read_tag_pointer_type -- read TAG_pointer_type DIE
+
+SYNOPSIS
+
+ static void read_tag_pointer_type (struct dieinfo *dip)
+
+DESCRIPTION
+
+ Extract all information from a TAG_pointer_type DIE and add to
+ the user defined type vector.
+ */
+
+static void
+read_tag_pointer_type (dip)
+ struct dieinfo *dip;
+{
+ struct type *type;
+ struct type *utype;
+
+ type = decode_die_type (dip);
+ if ((utype = lookup_utype (dip -> die_ref)) == NULL)
+ {
+ utype = lookup_pointer_type (type);
+ alloc_utype (dip -> die_ref, utype);
+ }
+ else
+ {
+ TYPE_TARGET_TYPE (utype) = type;
+ TYPE_POINTER_TYPE (type) = utype;
+
+ /* We assume the machine has only one representation for pointers! */
+ /* FIXME: This confuses host<->target data representations, and is a
+ poor assumption besides. */
+
+ TYPE_LENGTH (utype) = sizeof (char *);
+ TYPE_CODE (utype) = TYPE_CODE_PTR;
+ }
+}
+
+/*
+
LOCAL FUNCTION
read_subroutine_type -- process TAG_subroutine_type dies
*/
static void
-DEFUN(read_subroutine_type, (dip, thisdie, enddie),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie)
+read_subroutine_type (dip, thisdie, enddie)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
{
- struct type *type;
+ struct type *type; /* Type that this function returns */
+ struct type *ftype; /* Function that returns above type */
+ /* Decode the type that this subroutine returns */
+
type = decode_die_type (dip);
- type = lookup_function_type (type);
- type = alloc_utype (dip -> dieref, type);
+
+ /* Check to see if we already have a partially constructed user
+ defined type for this DIE, from a forward reference. */
+
+ if ((ftype = lookup_utype (dip -> die_ref)) == NULL)
+ {
+ /* This is the first reference to one of these types. Make
+ a new one and place it in the user defined types. */
+ ftype = lookup_function_type (type);
+ alloc_utype (dip -> die_ref, ftype);
+ }
+ else
+ {
+ /* We have an existing partially constructed type, so bash it
+ into the correct type. */
+ TYPE_TARGET_TYPE (ftype) = type;
+ TYPE_FUNCTION_TYPE (type) = ftype;
+ TYPE_LENGTH (ftype) = 1;
+ TYPE_CODE (ftype) = TYPE_CODE_FUNC;
+ }
}
/*
SYNOPSIS
static void read_enumeration (struct dieinfo *dip, char *thisdie,
- char *enddie)
+ char *enddie, struct objfile *objfile)
DESCRIPTION
*/
static void
-DEFUN(read_enumeration, (dip, thisdie, enddie),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie)
+read_enumeration (dip, thisdie, enddie, objfile)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
struct type *type;
struct symbol *sym;
- type = enum_type (dip);
- if ((sym = new_symbol (dip)) != NULL)
+ type = enum_type (dip, objfile);
+ if ((sym = new_symbol (dip, objfile)) != NULL)
{
SYMBOL_TYPE (sym) = type;
}
SYNOPSIS
- static type *enum_type (struct dieinfo *dip)
+ static type *enum_type (struct dieinfo *dip, struct objfile *objfile)
DESCRIPTION
Note that the DWARF specification explicitly mandates that enum
constants occur in reverse order from the source program order,
for "consistency" and because this ordering is easier for many
- compilers to generate. (Draft 5, sec 3.9.5, Enumeration type
+ compilers to generate. (Draft 6, sec 3.8.5, Enumeration type
Entries). Because gdb wants to see the enum members in program
source order, we have to ensure that the order gets reversed while
we are processing them.
*/
static struct type *
-DEFUN(enum_type, (dip), struct dieinfo *dip)
+enum_type (dip, objfile)
+ struct dieinfo *dip;
+ struct objfile *objfile;
{
struct type *type;
struct nextfield {
int n;
char *scan;
char *listend;
- long ltemp;
- short stemp;
+ unsigned short blocksz;
struct symbol *sym;
+ int nbytes;
- if ((type = lookup_utype (dip -> dieref)) == NULL)
+ if ((type = lookup_utype (dip -> die_ref)) == NULL)
{
/* No forward references created an empty type, so install one now */
- type = alloc_utype (dip -> dieref, NULL);
+ type = alloc_utype (dip -> die_ref, NULL);
}
TYPE_CODE (type) = TYPE_CODE_ENUM;
/* Some compilers try to be helpful by inventing "fake" names for
&& *dip -> at_name != '~'
&& *dip -> at_name != '.')
{
- TYPE_NAME (type) = obconcat ("enum", " ", dip -> at_name);
+ TYPE_NAME (type) = obconcat (&objfile -> type_obstack, "enum",
+ " ", dip -> at_name);
}
if (dip -> at_byte_size != 0)
{
{
if (dip -> short_element_list)
{
- (void) memcpy (&stemp, scan, sizeof (stemp));
- listend = scan + stemp + sizeof (stemp);
- scan += sizeof (stemp);
+ nbytes = attribute_size (AT_short_element_list);
}
else
{
- (void) memcpy (<emp, scan, sizeof (ltemp));
- listend = scan + ltemp + sizeof (ltemp);
- scan += sizeof (ltemp);
+ nbytes = attribute_size (AT_element_list);
}
+ blocksz = target_to_host (scan, nbytes, GET_UNSIGNED, objfile);
+ listend = scan + nbytes + blocksz;
+ scan += nbytes;
while (scan < listend)
{
new = (struct nextfield *) alloca (sizeof (struct nextfield));
list = new;
list -> field.type = NULL;
list -> field.bitsize = 0;
- (void) memcpy (&list -> field.bitpos, scan, sizeof (long));
- scan += sizeof (long);
- list -> field.name = savestring (scan, strlen (scan));
+ list -> field.bitpos =
+ target_to_host (scan, TARGET_FT_LONG_SIZE (objfile), GET_SIGNED,
+ objfile);
+ scan += TARGET_FT_LONG_SIZE (objfile);
+ list -> field.name = obsavestring (scan, strlen (scan),
+ &objfile -> type_obstack);
scan += strlen (scan) + 1;
nfields++;
/* Handcraft a new symbol for this enum member. */
- sym = (struct symbol *) obstack_alloc (symbol_obstack,
+ sym = (struct symbol *) obstack_alloc (&objfile->symbol_obstack,
sizeof (struct symbol));
- (void) memset (sym, 0, sizeof (struct symbol));
- SYMBOL_NAME (sym) = create_name (list -> field.name, symbol_obstack);
+ memset (sym, 0, sizeof (struct symbol));
+ SYMBOL_NAME (sym) = create_name (list -> field.name,
+ &objfile->symbol_obstack);
SYMBOL_NAMESPACE (sym) = VAR_NAMESPACE;
SYMBOL_CLASS (sym) = LOC_CONST;
SYMBOL_TYPE (sym) = type;
add_symbol_to_list (sym, list_in_scope);
}
/* Now create the vector of fields, and record how big it is. This is
- where we reverse the order, by pulling the members of the list in
+ where we reverse the order, by pulling the members off the list in
reverse order from how they were inserted. If we have no fields
(this is apparently possible in C++) then skip building a field
vector. */
{
TYPE_NFIELDS (type) = nfields;
TYPE_FIELDS (type) = (struct field *)
- obstack_alloc (symbol_obstack, sizeof (struct field) * nfields);
+ obstack_alloc (&objfile->symbol_obstack, sizeof (struct field) * nfields);
/* Copy the saved-up fields into the field vector. */
for (n = 0; (n < nfields) && (list != NULL); list = list -> next)
{
*/
static void
-DEFUN(read_func_scope, (dip, thisdie, enddie, objfile),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie AND
- struct objfile *objfile)
+read_func_scope (dip, thisdie, enddie, objfile)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
register struct context_stack *new;
- if (entry_point >= dip -> at_low_pc && entry_point < dip -> at_high_pc)
+ if (objfile -> ei.entry_point >= dip -> at_low_pc &&
+ objfile -> ei.entry_point < dip -> at_high_pc)
{
- entry_scope_lowpc = dip -> at_low_pc;
- entry_scope_highpc = dip -> at_high_pc;
+ objfile -> ei.entry_func_lowpc = dip -> at_low_pc;
+ objfile -> ei.entry_func_highpc = dip -> at_high_pc;
}
if (STREQ (dip -> at_name, "main")) /* FIXME: hardwired name */
{
- main_scope_lowpc = dip -> at_low_pc;
- main_scope_highpc = dip -> at_high_pc;
+ objfile -> ei.main_func_lowpc = dip -> at_low_pc;
+ objfile -> ei.main_func_highpc = dip -> at_high_pc;
}
new = push_context (0, dip -> at_low_pc);
- new -> name = new_symbol (dip);
+ new -> name = new_symbol (dip, objfile);
list_in_scope = &local_symbols;
- process_dies (thisdie + dip -> dielength, enddie, objfile);
+ process_dies (thisdie + dip -> die_length, enddie, objfile);
new = pop_context ();
/* Make a block for the local symbols within. */
finish_block (new -> name, &local_symbols, new -> old_blocks,
- new -> start_addr, dip -> at_high_pc);
+ new -> start_addr, dip -> at_high_pc, objfile);
list_in_scope = &file_symbols;
}
+
+/*
+
+LOCAL FUNCTION
+
+ handle_producer -- process the AT_producer attribute
+
+DESCRIPTION
+
+ Perform any operations that depend on finding a particular
+ AT_producer attribute.
+
+ */
+
+static void
+handle_producer (producer)
+ char *producer;
+{
+
+ /* If this compilation unit was compiled with g++ or gcc, then set the
+ processing_gcc_compilation flag. */
+
+ processing_gcc_compilation =
+ STREQN (producer, GPLUS_PRODUCER, strlen (GPLUS_PRODUCER))
+ || STREQN (producer, GCC_PRODUCER, strlen (GCC_PRODUCER));
+
+ /* Select a demangling style if we can identify the producer and if
+ the current style is auto. We leave the current style alone if it
+ is not auto. We also leave the demangling style alone if we find a
+ gcc (cc1) producer, as opposed to a g++ (cc1plus) producer. */
+
+#if 1 /* Works, but is experimental. -fnf */
+ if (current_demangling_style == auto_demangling)
+ {
+ if (STREQN (producer, GPLUS_PRODUCER, strlen (GPLUS_PRODUCER)))
+ {
+ set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
+ }
+ else if (STREQN (producer, LCC_PRODUCER, strlen (LCC_PRODUCER)))
+ {
+ set_demangling_style (LUCID_DEMANGLING_STYLE_STRING);
+ }
+ else if (STREQN (producer, CFRONT_PRODUCER, strlen (CFRONT_PRODUCER)))
+ {
+ set_demangling_style (CFRONT_DEMANGLING_STYLE_STRING);
+ }
+ }
+#endif
+}
+
+
/*
LOCAL FUNCTION
*/
static void
-DEFUN(read_file_scope, (dip, thisdie, enddie, objfile),
- struct dieinfo *dip AND
- char *thisdie AND
- char *enddie AND
- struct objfile *objfile)
+read_file_scope (dip, thisdie, enddie, objfile)
+ struct dieinfo *dip;
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
struct cleanup *back_to;
struct symtab *symtab;
- if (entry_point >= dip -> at_low_pc && entry_point < dip -> at_high_pc)
+ if (objfile -> ei.entry_point >= dip -> at_low_pc &&
+ objfile -> ei.entry_point < dip -> at_high_pc)
{
- startup_file_start = dip -> at_low_pc;
- startup_file_end = dip -> at_high_pc;
+ objfile -> ei.entry_file_lowpc = dip -> at_low_pc;
+ objfile -> ei.entry_file_highpc = dip -> at_high_pc;
}
if (dip -> at_producer != NULL)
{
- processing_gcc_compilation =
- STREQN (dip -> at_producer, GCC_PRODUCER, strlen (GCC_PRODUCER));
+ handle_producer (dip -> at_producer);
}
numutypes = (enddie - thisdie) / 4;
utypes = (struct type **) xmalloc (numutypes * sizeof (struct type *));
back_to = make_cleanup (free, utypes);
- (void) memset (utypes, 0, numutypes * sizeof (struct type *));
- start_symtab (dip -> at_name, NULL, dip -> at_low_pc);
+ memset (utypes, 0, numutypes * sizeof (struct type *));
+ start_symtab (dip -> at_name, dip -> at_comp_dir, dip -> at_low_pc);
decode_line_numbers (lnbase);
- process_dies (thisdie + dip -> dielength, enddie, objfile);
+ process_dies (thisdie + dip -> die_length, enddie, objfile);
symtab = end_symtab (dip -> at_high_pc, 0, 0, objfile);
/* FIXME: The following may need to be expanded for other languages */
switch (dip -> at_language)
*/
static void
-DEFUN(process_dies, (thisdie, enddie, objfile),
- char *thisdie AND char *enddie AND struct objfile *objfile)
+process_dies (thisdie, enddie, objfile)
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
char *nextdie;
struct dieinfo di;
while (thisdie < enddie)
{
- basicdieinfo (&di, thisdie);
- if (di.dielength < sizeof (long))
+ basicdieinfo (&di, thisdie, objfile);
+ if (di.die_length < SIZEOF_DIE_LENGTH)
{
break;
}
- else if (di.dietag == TAG_padding)
+ else if (di.die_tag == TAG_padding)
{
- nextdie = thisdie + di.dielength;
+ nextdie = thisdie + di.die_length;
}
else
{
- completedieinfo (&di);
+ completedieinfo (&di, objfile);
if (di.at_sibling != 0)
{
nextdie = dbbase + di.at_sibling - dbroff;
}
else
{
- nextdie = thisdie + di.dielength;
+ nextdie = thisdie + di.die_length;
}
- switch (di.dietag)
+ switch (di.die_tag)
{
case TAG_compile_unit:
read_file_scope (&di, thisdie, nextdie, objfile);
read_structure_scope (&di, thisdie, nextdie, objfile);
break;
case TAG_enumeration_type:
- read_enumeration (&di, thisdie, nextdie);
+ read_enumeration (&di, thisdie, nextdie, objfile);
break;
case TAG_subroutine_type:
read_subroutine_type (&di, thisdie, nextdie);
case TAG_array_type:
dwarf_read_array_type (&di);
break;
+ case TAG_pointer_type:
+ read_tag_pointer_type (&di);
+ break;
default:
- (void) new_symbol (&di);
+ new_symbol (&di, objfile);
break;
}
}
*/
static void
-DEFUN(decode_line_numbers, (linetable), char *linetable)
+decode_line_numbers (linetable)
+ char *linetable;
{
char *tblscan;
char *tblend;
- long length;
- long base;
- long line;
- long pc;
+ unsigned long length;
+ unsigned long base;
+ unsigned long line;
+ unsigned long pc;
if (linetable != NULL)
{
tblscan = tblend = linetable;
- (void) memcpy (&length, tblscan, sizeof (long));
- tblscan += sizeof (long);
+ length = target_to_host (tblscan, SIZEOF_LINETBL_LENGTH, GET_UNSIGNED,
+ current_objfile);
+ tblscan += SIZEOF_LINETBL_LENGTH;
tblend += length;
- (void) memcpy (&base, tblscan, sizeof (long));
+ base = target_to_host (tblscan, TARGET_FT_POINTER_SIZE (objfile),
+ GET_UNSIGNED, current_objfile);
+ tblscan += TARGET_FT_POINTER_SIZE (objfile);
base += baseaddr;
- tblscan += sizeof (long);
while (tblscan < tblend)
{
- (void) memcpy (&line, tblscan, sizeof (long));
- tblscan += sizeof (long) + sizeof (short);
- (void) memcpy (&pc, tblscan, sizeof (long));
- tblscan += sizeof (long);
+ line = target_to_host (tblscan, SIZEOF_LINETBL_LINENO, GET_UNSIGNED,
+ current_objfile);
+ tblscan += SIZEOF_LINETBL_LINENO + SIZEOF_LINETBL_STMT;
+ pc = target_to_host (tblscan, SIZEOF_LINETBL_DELTA, GET_UNSIGNED,
+ current_objfile);
+ tblscan += SIZEOF_LINETBL_DELTA;
pc += base;
- if (line > 0)
+ if (line != 0)
{
record_line (current_subfile, line, pc);
}
*/
static int
-DEFUN(locval, (loc), char *loc)
+locval (loc)
+ char *loc;
{
unsigned short nbytes;
- auto int stack[64];
+ unsigned short locsize;
+ auto long stack[64];
int stacki;
char *end;
long regno;
+ int loc_atom_code;
+ int loc_value_size;
- (void) memcpy (&nbytes, loc, sizeof (short));
- end = loc + sizeof (short) + nbytes;
+ nbytes = attribute_size (AT_location);
+ locsize = target_to_host (loc, nbytes, GET_UNSIGNED, current_objfile);
+ loc += nbytes;
+ end = loc + locsize;
stacki = 0;
stack[stacki] = 0;
isreg = 0;
offreg = 0;
- for (loc += sizeof (short); loc < end; loc += sizeof (long))
+ loc_value_size = TARGET_FT_LONG_SIZE (current_objfile);
+ while (loc < end)
{
- switch (*loc++) {
- case 0:
- /* error */
- loc = end;
- break;
- case OP_REG:
- /* push register (number) */
- (void) memcpy (&stack[++stacki], loc, sizeof (long));
- isreg = 1;
- break;
- case OP_BASEREG:
- /* push value of register (number) */
- /* Actually, we compute the value as if register has 0 */
- offreg = 1;
- (void) memcpy (®no, loc, sizeof (long));
- if (regno == R_FP)
- {
- stack[++stacki] = 0;
- }
- else
- {
- stack[++stacki] = 0;
- SQUAWK (("BASEREG %d not handled!", regno));
- }
- break;
- case OP_ADDR:
- /* push address (relocated address) */
- (void) memcpy (&stack[++stacki], loc, sizeof (long));
- break;
- case OP_CONST:
- /* push constant (number) */
- (void) memcpy (&stack[++stacki], loc, sizeof (long));
- break;
- case OP_DEREF2:
- /* pop, deref and push 2 bytes (as a long) */
- SQUAWK (("OP_DEREF2 address %#x not handled", stack[stacki]));
- break;
- case OP_DEREF4: /* pop, deref and push 4 bytes (as a long) */
- SQUAWK (("OP_DEREF4 address %#x not handled", stack[stacki]));
- break;
- case OP_ADD: /* pop top 2 items, add, push result */
- stack[stacki - 1] += stack[stacki];
- stacki--;
- break;
- }
+ loc_atom_code = target_to_host (loc, SIZEOF_LOC_ATOM_CODE, GET_UNSIGNED,
+ current_objfile);
+ loc += SIZEOF_LOC_ATOM_CODE;
+ switch (loc_atom_code)
+ {
+ case 0:
+ /* error */
+ loc = end;
+ break;
+ case OP_REG:
+ /* push register (number) */
+ stack[++stacki] = target_to_host (loc, loc_value_size,
+ GET_UNSIGNED, current_objfile);
+ loc += loc_value_size;
+ isreg = 1;
+ break;
+ case OP_BASEREG:
+ /* push value of register (number) */
+ /* Actually, we compute the value as if register has 0 */
+ offreg = 1;
+ regno = target_to_host (loc, loc_value_size, GET_UNSIGNED,
+ current_objfile);
+ loc += loc_value_size;
+ if (regno == R_FP)
+ {
+ stack[++stacki] = 0;
+ }
+ else
+ {
+ stack[++stacki] = 0;
+ SQUAWK (("BASEREG %d not handled!", regno));
+ }
+ break;
+ case OP_ADDR:
+ /* push address (relocated address) */
+ stack[++stacki] = target_to_host (loc, loc_value_size,
+ GET_UNSIGNED, current_objfile);
+ loc += loc_value_size;
+ break;
+ case OP_CONST:
+ /* push constant (number) FIXME: signed or unsigned! */
+ stack[++stacki] = target_to_host (loc, loc_value_size,
+ GET_SIGNED, current_objfile);
+ loc += loc_value_size;
+ break;
+ case OP_DEREF2:
+ /* pop, deref and push 2 bytes (as a long) */
+ SQUAWK (("OP_DEREF2 address 0x%x not handled", stack[stacki]));
+ break;
+ case OP_DEREF4: /* pop, deref and push 4 bytes (as a long) */
+ SQUAWK (("OP_DEREF4 address 0x%x not handled", stack[stacki]));
+ break;
+ case OP_ADD: /* pop top 2 items, add, push result */
+ stack[stacki - 1] += stack[stacki];
+ stacki--;
+ break;
+ }
}
return (stack[stacki]);
}
DESCRIPTION
+ When expanding a partial symbol table entry to a full symbol table
+ entry, this is the function that gets called to read in the symbols
+ for the compilation unit.
+
+ Returns a pointer to the newly constructed symtab (which is now
+ the new first one on the objfile's symtab list).
*/
static struct symtab *
-DEFUN(read_ofile_symtab, (pst),
- struct partial_symtab *pst)
+read_ofile_symtab (pst)
+ struct partial_symtab *pst;
{
struct cleanup *back_to;
- long lnsize;
+ unsigned long lnsize;
int foffset;
- bfd *abfd = pst->objfile->obfd;
-
+ bfd *abfd;
+ char lnsizedata[SIZEOF_LINETBL_LENGTH];
+
+ abfd = pst -> objfile -> obfd;
+ current_objfile = pst -> objfile;
+
/* Allocate a buffer for the entire chunk of DIE's for this compilation
unit, seek to the location in the file, and read in all the DIE's. */
dbbase = xmalloc (DBLENGTH(pst));
dbroff = DBROFF(pst);
foffset = DBFOFF(pst) + dbroff;
- baseaddr = pst -> addr;
+ base_section_offsets = pst->section_offsets;
+ baseaddr = ANOFFSET (pst->section_offsets, 0);
if (bfd_seek (abfd, foffset, 0) ||
(bfd_read (dbbase, DBLENGTH(pst), 1, abfd) != DBLENGTH(pst)))
{
back_to = make_cleanup (free, dbbase);
/* If there is a line number table associated with this compilation unit
- then read the first long word from the line number table fragment, which
- contains the size of the fragment in bytes (including the long word
- itself). Allocate a buffer for the fragment and read it in for future
+ then read the size of this fragment in bytes, from the fragment itself.
+ Allocate a buffer for the fragment and read it in for future
processing. */
lnbase = NULL;
if (LNFOFF (pst))
{
if (bfd_seek (abfd, LNFOFF (pst), 0) ||
- (bfd_read (&lnsize, sizeof(long), 1, abfd) != sizeof(long)))
+ (bfd_read ((PTR) lnsizedata, sizeof (lnsizedata), 1, abfd) !=
+ sizeof (lnsizedata)))
{
error ("can't read DWARF line number table size");
}
+ lnsize = target_to_host (lnsizedata, SIZEOF_LINETBL_LENGTH,
+ GET_UNSIGNED, pst -> objfile);
lnbase = xmalloc (lnsize);
if (bfd_seek (abfd, LNFOFF (pst), 0) ||
(bfd_read (lnbase, lnsize, 1, abfd) != lnsize))
process_dies (dbbase, dbbase + DBLENGTH(pst), pst -> objfile);
do_cleanups (back_to);
- return (symtab_list);
+ current_objfile = NULL;
+ return (pst -> objfile -> symtabs);
}
/*
*/
static void
-DEFUN(psymtab_to_symtab_1,
- (pst),
- struct partial_symtab *pst)
+psymtab_to_symtab_1 (pst)
+ struct partial_symtab *pst;
{
int i;
+ struct cleanup *old_chain;
- if (!pst)
- {
- return;
- }
- if (pst->readin)
- {
- fprintf (stderr, "Psymtab for %s already read in. Shouldn't happen.\n",
- pst -> filename);
- return;
- }
-
- /* Read in all partial symtabs on which this one is dependent */
- for (i = 0; i < pst -> number_of_dependencies; i++)
- if (!pst -> dependencies[i] -> readin)
- {
- /* Inform about additional files that need to be read in. */
- if (info_verbose)
- {
- fputs_filtered (" ", stdout);
- wrap_here ("");
- fputs_filtered ("and ", stdout);
- wrap_here ("");
- printf_filtered ("%s...", pst -> dependencies[i] -> filename);
- wrap_here (""); /* Flush output */
- fflush (stdout);
- }
- psymtab_to_symtab_1 (pst -> dependencies[i]);
- }
-
- if (DBLENGTH(pst)) /* Otherwise it's a dummy */
+ if (pst != NULL)
{
- pst -> symtab = read_ofile_symtab (pst);
- if (info_verbose)
+ if (pst->readin)
+ {
+ warning ("psymtab for %s already read in. Shouldn't happen.",
+ pst -> filename);
+ }
+ else
{
- printf_filtered ("%d DIE's, sorting...", diecount);
- fflush (stdout);
+ /* Read in all partial symtabs on which this one is dependent */
+ for (i = 0; i < pst -> number_of_dependencies; i++)
+ {
+ if (!pst -> dependencies[i] -> readin)
+ {
+ /* Inform about additional files that need to be read in. */
+ if (info_verbose)
+ {
+ fputs_filtered (" ", stdout);
+ wrap_here ("");
+ fputs_filtered ("and ", stdout);
+ wrap_here ("");
+ printf_filtered ("%s...",
+ pst -> dependencies[i] -> filename);
+ wrap_here ("");
+ fflush (stdout); /* Flush output */
+ }
+ psymtab_to_symtab_1 (pst -> dependencies[i]);
+ }
+ }
+ if (DBLENGTH (pst)) /* Otherwise it's a dummy */
+ {
+ buildsym_init ();
+ old_chain = make_cleanup (really_free_pendings, 0);
+ pst -> symtab = read_ofile_symtab (pst);
+ if (info_verbose)
+ {
+ printf_filtered ("%d DIE's, sorting...", diecount);
+ wrap_here ("");
+ fflush (stdout);
+ }
+ sort_symtab_syms (pst -> symtab);
+ do_cleanups (old_chain);
+ }
+ pst -> readin = 1;
}
- sort_symtab_syms (pst -> symtab);
}
- pst -> readin = 1;
}
/*
*/
static void
-DEFUN(dwarf_psymtab_to_symtab, (pst), struct partial_symtab *pst)
+dwarf_psymtab_to_symtab (pst)
+ struct partial_symtab *pst;
{
- if (!pst)
- {
- return;
- }
- if (pst -> readin)
- {
- fprintf (stderr, "Psymtab for %s already read in. Shouldn't happen.\n",
- pst -> filename);
- return;
- }
-
- if (DBLENGTH(pst) || pst -> number_of_dependencies)
+ if (pst != NULL)
{
- /* Print the message now, before starting serious work, to avoid
- disconcerting pauses. */
- if (info_verbose)
+ if (pst -> readin)
{
- printf_filtered ("Reading in symbols for %s...", pst -> filename);
- fflush (stdout);
+ warning ("psymtab for %s already read in. Shouldn't happen.",
+ pst -> filename);
}
-
- psymtab_to_symtab_1 (pst);
-
-#if 0 /* FIXME: Check to see what dbxread is doing here and see if
- we need to do an equivalent or is this something peculiar to
- stabs/a.out format. */
- /* Match with global symbols. This only needs to be done once,
- after all of the symtabs and dependencies have been read in. */
- scan_file_globals ();
-#endif
-
- /* Finish up the debug error message. */
- if (info_verbose)
+ else
{
- printf_filtered ("done.\n");
+ if (DBLENGTH (pst) || pst -> number_of_dependencies)
+ {
+ /* Print the message now, before starting serious work, to avoid
+ disconcerting pauses. */
+ if (info_verbose)
+ {
+ printf_filtered ("Reading in symbols for %s...",
+ pst -> filename);
+ fflush (stdout);
+ }
+
+ psymtab_to_symtab_1 (pst);
+
+#if 0 /* FIXME: Check to see what dbxread is doing here and see if
+ we need to do an equivalent or is this something peculiar to
+ stabs/a.out format.
+ Match with global symbols. This only needs to be done once,
+ after all of the symtabs and dependencies have been read in.
+ */
+ scan_file_globals (pst -> objfile);
+#endif
+
+ /* Finish up the verbose info message. */
+ if (info_verbose)
+ {
+ printf_filtered ("done.\n");
+ fflush (stdout);
+ }
+ }
}
}
}
SYNOPSIS
- static void init_psymbol_list (int total_symbols)
+ static void init_psymbol_list (struct objfile *objfile, int total_symbols)
DESCRIPTION
*/
static void
-DEFUN(init_psymbol_list, (total_symbols), int total_symbols)
+init_psymbol_list (objfile, total_symbols)
+ struct objfile *objfile;
+ int total_symbols;
{
/* Free any previously allocated psymbol lists. */
- if (global_psymbols.list)
+ if (objfile -> global_psymbols.list)
{
- free (global_psymbols.list);
+ mfree (objfile -> md, (PTR)objfile -> global_psymbols.list);
}
- if (static_psymbols.list)
+ if (objfile -> static_psymbols.list)
{
- free (static_psymbols.list);
+ mfree (objfile -> md, (PTR)objfile -> static_psymbols.list);
}
/* Current best guess is that there are approximately a twentieth
of the total symbols (in a debugging file) are global or static
oriented symbols */
- global_psymbols.size = total_symbols / 10;
- static_psymbols.size = total_symbols / 10;
- global_psymbols.next = global_psymbols.list = (struct partial_symbol *)
- xmalloc (global_psymbols.size * sizeof (struct partial_symbol));
- static_psymbols.next = static_psymbols.list = (struct partial_symbol *)
- xmalloc (static_psymbols.size * sizeof (struct partial_symbol));
-}
-
-/*
-
-LOCAL FUNCTION
-
- dwarf_start_psymtab -- allocate and fill a partial symtab entry
-
-DESCRIPTION
-
- Allocate and partially fill a partial symtab. It will be completely
- filled at the end of the symbol list.
-
- SYMFILE_NAME is the name of the symbol-file we are reading from, and
- ADDR is the address relative to which its symbols are (incremental)
- or 0 (normal). FILENAME is the name of the compilation unit that
- these symbols were defined in, and they appear starting a address
- TEXTLOW. DBROFF is the absolute file offset in SYMFILE_NAME where
- the full symbols can be read for compilation unit FILENAME.
- GLOBAL_SYMS and STATIC_SYMS are pointers to the current end of the
- psymtab vector.
-
- */
-
-static struct partial_symtab *
-DEFUN(dwarf_start_psymtab,
- (objfile, addr, filename, textlow, texthigh, dbfoff, curoff,
- culength, lnfoff, global_syms, static_syms),
- struct objfile *objfile AND
- CORE_ADDR addr AND
- char *filename AND
- CORE_ADDR textlow AND
- CORE_ADDR texthigh AND
- int dbfoff AND
- int curoff AND
- int culength AND
- int lnfoff AND
- struct partial_symbol *global_syms AND
- struct partial_symbol *static_syms)
-{
- struct partial_symtab *result;
-
- result = (struct partial_symtab *)
- obstack_alloc (psymbol_obstack, sizeof (struct partial_symtab));
- (void) memset (result, 0, sizeof (struct partial_symtab));
- result -> addr = addr;
- result -> objfile = objfile;
- result -> filename = create_name (filename, psymbol_obstack);
- result -> textlow = textlow;
- result -> texthigh = texthigh;
- result -> read_symtab_private = (char *) obstack_alloc (psymbol_obstack,
- sizeof (struct dwfinfo));
- DBFOFF (result) = dbfoff;
- DBROFF (result) = curoff;
- DBLENGTH (result) = culength;
- LNFOFF (result) = lnfoff;
- result -> readin = 0;
- result -> symtab = NULL;
- result -> read_symtab = dwarf_psymtab_to_symtab;
- result -> globals_offset = global_syms - global_psymbols.list;
- result -> statics_offset = static_syms - static_psymbols.list;
-
- result->n_global_syms = 0;
- result->n_static_syms = 0;
-
- return result;
+ objfile -> global_psymbols.size = total_symbols / 10;
+ objfile -> static_psymbols.size = total_symbols / 10;
+ objfile -> global_psymbols.next =
+ objfile -> global_psymbols.list = (struct partial_symbol *)
+ xmmalloc (objfile -> md, objfile -> global_psymbols.size
+ * sizeof (struct partial_symbol));
+ objfile -> static_psymbols.next =
+ objfile -> static_psymbols.list = (struct partial_symbol *)
+ xmmalloc (objfile -> md, objfile -> static_psymbols.size
+ * sizeof (struct partial_symbol));
}
/*
*/
static void
-DEFUN(add_enum_psymbol, (dip), struct dieinfo *dip)
+add_enum_psymbol (dip, objfile)
+ struct dieinfo *dip;
+ struct objfile *objfile;
{
char *scan;
char *listend;
- long ltemp;
- short stemp;
+ unsigned short blocksz;
+ int nbytes;
if ((scan = dip -> at_element_list) != NULL)
{
if (dip -> short_element_list)
{
- (void) memcpy (&stemp, scan, sizeof (stemp));
- listend = scan + stemp + sizeof (stemp);
- scan += sizeof (stemp);
+ nbytes = attribute_size (AT_short_element_list);
}
else
{
- (void) memcpy (<emp, scan, sizeof (ltemp));
- listend = scan + ltemp + sizeof (ltemp);
- scan += sizeof (ltemp);
+ nbytes = attribute_size (AT_element_list);
}
+ blocksz = target_to_host (scan, nbytes, GET_UNSIGNED, objfile);
+ scan += nbytes;
+ listend = scan + blocksz;
while (scan < listend)
{
- scan += sizeof (long);
+ scan += TARGET_FT_LONG_SIZE (objfile);
ADD_PSYMBOL_TO_LIST (scan, strlen (scan), VAR_NAMESPACE, LOC_CONST,
- static_psymbols, 0);
+ objfile -> static_psymbols, 0);
scan += strlen (scan) + 1;
}
}
*/
static void
-DEFUN(add_partial_symbol, (dip), struct dieinfo *dip)
+add_partial_symbol (dip, objfile)
+ struct dieinfo *dip;
+ struct objfile *objfile;
{
- switch (dip -> dietag)
+ switch (dip -> die_tag)
{
case TAG_global_subroutine:
- record_misc_function (dip -> at_name, dip -> at_low_pc, mf_text);
+ record_minimal_symbol (dip -> at_name, dip -> at_low_pc, mst_text,
+ objfile);
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- VAR_NAMESPACE, LOC_BLOCK, global_psymbols,
+ VAR_NAMESPACE, LOC_BLOCK,
+ objfile -> global_psymbols,
dip -> at_low_pc);
break;
case TAG_global_variable:
- record_misc_function (dip -> at_name, locval (dip -> at_location),
- mf_data);
+ record_minimal_symbol (dip -> at_name, locval (dip -> at_location),
+ mst_data, objfile);
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- VAR_NAMESPACE, LOC_STATIC, global_psymbols,
+ VAR_NAMESPACE, LOC_STATIC,
+ objfile -> global_psymbols,
0);
break;
case TAG_subroutine:
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- VAR_NAMESPACE, LOC_BLOCK, static_psymbols,
+ VAR_NAMESPACE, LOC_BLOCK,
+ objfile -> static_psymbols,
dip -> at_low_pc);
break;
case TAG_local_variable:
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- VAR_NAMESPACE, LOC_STATIC, static_psymbols,
+ VAR_NAMESPACE, LOC_STATIC,
+ objfile -> static_psymbols,
0);
break;
case TAG_typedef:
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- VAR_NAMESPACE, LOC_TYPEDEF, static_psymbols,
+ VAR_NAMESPACE, LOC_TYPEDEF,
+ objfile -> static_psymbols,
0);
break;
case TAG_structure_type:
case TAG_union_type:
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- STRUCT_NAMESPACE, LOC_TYPEDEF, static_psymbols,
+ STRUCT_NAMESPACE, LOC_TYPEDEF,
+ objfile -> static_psymbols,
0);
break;
case TAG_enumeration_type:
if (dip -> at_name)
{
ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
- STRUCT_NAMESPACE, LOC_TYPEDEF, static_psymbols,
+ STRUCT_NAMESPACE, LOC_TYPEDEF,
+ objfile -> static_psymbols,
0);
}
- add_enum_psymbol (dip);
+ add_enum_psymbol (dip, objfile);
break;
}
}
*/
static void
-DEFUN(scan_partial_symbols, (thisdie, enddie), char *thisdie AND char *enddie)
+scan_partial_symbols (thisdie, enddie, objfile)
+ char *thisdie;
+ char *enddie;
+ struct objfile *objfile;
{
char *nextdie;
struct dieinfo di;
while (thisdie < enddie)
{
- basicdieinfo (&di, thisdie);
- if (di.dielength < sizeof (long))
+ basicdieinfo (&di, thisdie, objfile);
+ if (di.die_length < SIZEOF_DIE_LENGTH)
{
break;
}
else
{
- nextdie = thisdie + di.dielength;
+ nextdie = thisdie + di.die_length;
/* To avoid getting complete die information for every die, we
only do it (below) for the cases we are interested in. */
- switch (di.dietag)
+ switch (di.die_tag)
{
case TAG_global_subroutine:
case TAG_subroutine:
case TAG_global_variable:
case TAG_local_variable:
- completedieinfo (&di);
+ completedieinfo (&di, objfile);
if (di.at_name && (di.has_at_low_pc || di.at_location))
{
- add_partial_symbol (&di);
+ add_partial_symbol (&di, objfile);
}
break;
case TAG_typedef:
case TAG_structure_type:
case TAG_union_type:
- completedieinfo (&di);
+ completedieinfo (&di, objfile);
if (di.at_name)
{
- add_partial_symbol (&di);
+ add_partial_symbol (&di, objfile);
}
break;
case TAG_enumeration_type:
- completedieinfo (&di);
- add_partial_symbol (&di);
+ completedieinfo (&di, objfile);
+ add_partial_symbol (&di, objfile);
break;
}
}
*/
static void
-DEFUN(scan_compilation_units,
- (filename, thisdie, enddie, dbfoff, lnoffset, objfile),
- char *filename AND
- char *thisdie AND
- char *enddie AND
- unsigned int dbfoff AND
- unsigned int lnoffset AND
- struct objfile *objfile)
+scan_compilation_units (filename, thisdie, enddie, dbfoff, lnoffset, objfile)
+ char *filename;
+ char *thisdie;
+ char *enddie;
+ unsigned int dbfoff;
+ unsigned int lnoffset;
+ struct objfile *objfile;
{
char *nextdie;
struct dieinfo di;
while (thisdie < enddie)
{
- basicdieinfo (&di, thisdie);
- if (di.dielength < sizeof (long))
+ basicdieinfo (&di, thisdie, objfile);
+ if (di.die_length < SIZEOF_DIE_LENGTH)
{
break;
}
- else if (di.dietag != TAG_compile_unit)
+ else if (di.die_tag != TAG_compile_unit)
{
- nextdie = thisdie + di.dielength;
+ nextdie = thisdie + di.die_length;
}
else
{
- completedieinfo (&di);
+ completedieinfo (&di, objfile);
if (di.at_sibling != 0)
{
nextdie = dbbase + di.at_sibling - dbroff;
}
else
{
- nextdie = thisdie + di.dielength;
+ nextdie = thisdie + di.die_length;
}
curoff = thisdie - dbbase;
culength = nextdie - thisdie;
curlnoffset = di.has_at_stmt_list ? lnoffset + di.at_stmt_list : 0;
- pst = dwarf_start_psymtab (objfile, baseaddr, di.at_name,
- di.at_low_pc,
- di.at_high_pc,
- dbfoff, curoff, culength, curlnoffset,
- global_psymbols.next,
- static_psymbols.next);
- scan_partial_symbols (thisdie + di.dielength, nextdie);
- pst -> n_global_syms = global_psymbols.next -
- (global_psymbols.list + pst -> globals_offset);
- pst -> n_static_syms = static_psymbols.next -
- (static_psymbols.list + pst -> statics_offset);
- /* Sort the global list; don't sort the static list */
- qsort (global_psymbols.list + pst -> globals_offset,
- pst -> n_global_syms, sizeof (struct partial_symbol),
- compare_psymbols);
+
+ /* First allocate a new partial symbol table structure */
+
+ pst = start_psymtab_common (objfile, base_section_offsets, di.at_name,
+ di.at_low_pc,
+ objfile -> global_psymbols.next,
+ objfile -> static_psymbols.next);
+
+ pst -> texthigh = di.at_high_pc;
+ pst -> read_symtab_private = (char *)
+ obstack_alloc (&objfile -> psymbol_obstack,
+ sizeof (struct dwfinfo));
+ DBFOFF (pst) = dbfoff;
+ DBROFF (pst) = curoff;
+ DBLENGTH (pst) = culength;
+ LNFOFF (pst) = curlnoffset;
+ pst -> read_symtab = dwarf_psymtab_to_symtab;
+
+ /* Now look for partial symbols */
+
+ scan_partial_symbols (thisdie + di.die_length, nextdie, objfile);
+
+ pst -> n_global_syms = objfile -> global_psymbols.next -
+ (objfile -> global_psymbols.list + pst -> globals_offset);
+ pst -> n_static_syms = objfile -> static_psymbols.next -
+ (objfile -> static_psymbols.list + pst -> statics_offset);
+ sort_pst_symbols (pst);
/* If there is already a psymtab or symtab for a file of this name,
remove it. (If there is a symtab, more drastic things also
happen.) This happens in VxWorks. */
free_named_symtabs (pst -> filename);
- /* Place the partial symtab on the partial symtab list */
- pst -> next = partial_symtab_list;
- partial_symtab_list = pst;
}
thisdie = nextdie;
}
SYNOPSIS
- static struct symbol *new_symbol (struct dieinfo *dip)
+ static struct symbol *new_symbol (struct dieinfo *dip,
+ struct objfile *objfile)
DESCRIPTION
*/
static struct symbol *
-DEFUN(new_symbol, (dip), struct dieinfo *dip)
+new_symbol (dip, objfile)
+ struct dieinfo *dip;
+ struct objfile *objfile;
{
struct symbol *sym = NULL;
if (dip -> at_name != NULL)
{
- sym = (struct symbol *) obstack_alloc (symbol_obstack,
+ sym = (struct symbol *) obstack_alloc (&objfile -> symbol_obstack,
sizeof (struct symbol));
- (void) memset (sym, 0, sizeof (struct symbol));
- SYMBOL_NAME (sym) = create_name (dip -> at_name, symbol_obstack);
+ memset (sym, 0, sizeof (struct symbol));
+ SYMBOL_NAME (sym) = create_name (dip -> at_name, &objfile->symbol_obstack);
/* default assumptions */
SYMBOL_NAMESPACE (sym) = VAR_NAMESPACE;
SYMBOL_CLASS (sym) = LOC_STATIC;
SYMBOL_TYPE (sym) = decode_die_type (dip);
- switch (dip -> dietag)
+ switch (dip -> die_tag)
{
case TAG_label:
SYMBOL_VALUE (sym) = dip -> at_low_pc;
SYMBOL_VALUE (sym) = dip -> at_low_pc;
SYMBOL_TYPE (sym) = lookup_function_type (SYMBOL_TYPE (sym));
SYMBOL_CLASS (sym) = LOC_BLOCK;
- if (dip -> dietag == TAG_global_subroutine)
+ if (dip -> die_tag == TAG_global_subroutine)
{
add_symbol_to_list (sym, &global_symbols);
}
Decode a block of data containing a modified fundamental
type specification. TYPEDATA is a pointer to the block,
- which consists of a two byte length, containing the size
- of the rest of the block. At the end of the block is a
- two byte value that gives the fundamental type. Everything
+ which starts with a length containing the size of the rest
+ of the block. At the end of the block is a fundmental type
+ code value that gives the fundamental type. Everything
in between are type modifiers.
We simply compute the number of modifiers and call the general
*/
static struct type *
-DEFUN(decode_mod_fund_type, (typedata), char *typedata)
+decode_mod_fund_type (typedata)
+ char *typedata;
{
struct type *typep = NULL;
unsigned short modcount;
- unsigned char *modifiers;
+ int nbytes;
/* Get the total size of the block, exclusive of the size itself */
- (void) memcpy (&modcount, typedata, sizeof (short));
+
+ nbytes = attribute_size (AT_mod_fund_type);
+ modcount = target_to_host (typedata, nbytes, GET_UNSIGNED, current_objfile);
+ typedata += nbytes;
+
/* Deduct the size of the fundamental type bytes at the end of the block. */
- modcount -= sizeof (short);
- /* Skip over the two size bytes at the beginning of the block. */
- modifiers = (unsigned char *) typedata + sizeof (short);
+
+ modcount -= attribute_size (AT_fund_type);
+
/* Now do the actual decoding */
- typep = decode_modified_type (modifiers, modcount, AT_mod_fund_type);
+
+ typep = decode_modified_type (typedata, modcount, AT_mod_fund_type);
return (typep);
}
*/
static struct type *
-DEFUN(decode_mod_u_d_type, (typedata), char *typedata)
+decode_mod_u_d_type (typedata)
+ char *typedata;
{
struct type *typep = NULL;
unsigned short modcount;
- unsigned char *modifiers;
+ int nbytes;
/* Get the total size of the block, exclusive of the size itself */
- (void) memcpy (&modcount, typedata, sizeof (short));
+
+ nbytes = attribute_size (AT_mod_u_d_type);
+ modcount = target_to_host (typedata, nbytes, GET_UNSIGNED, current_objfile);
+ typedata += nbytes;
+
/* Deduct the size of the reference type bytes at the end of the block. */
- modcount -= sizeof (long);
- /* Skip over the two size bytes at the beginning of the block. */
- modifiers = (unsigned char *) typedata + sizeof (short);
+
+ modcount -= attribute_size (AT_user_def_type);
+
/* Now do the actual decoding */
- typep = decode_modified_type (modifiers, modcount, AT_mod_u_d_type);
+
+ typep = decode_modified_type (typedata, modcount, AT_mod_u_d_type);
return (typep);
}
SYNOPSIS
- static struct type *decode_modified_type (unsigned char *modifiers,
+ static struct type *decode_modified_type (char *modifiers,
unsigned short modcount, int mtype)
DESCRIPTION
*/
static struct type *
-DEFUN(decode_modified_type,
- (modifiers, modcount, mtype),
- unsigned char *modifiers AND unsigned short modcount AND int mtype)
+decode_modified_type (modifiers, modcount, mtype)
+ char *modifiers;
+ unsigned int modcount;
+ int mtype;
{
struct type *typep = NULL;
unsigned short fundtype;
- DIEREF dieref;
- unsigned char modifier;
+ DIE_REF die_ref;
+ char modifier;
+ int nbytes;
if (modcount == 0)
{
switch (mtype)
{
case AT_mod_fund_type:
- (void) memcpy (&fundtype, modifiers, sizeof (short));
+ nbytes = attribute_size (AT_fund_type);
+ fundtype = target_to_host (modifiers, nbytes, GET_UNSIGNED,
+ current_objfile);
typep = decode_fund_type (fundtype);
break;
case AT_mod_u_d_type:
- (void) memcpy (&dieref, modifiers, sizeof (DIEREF));
- if ((typep = lookup_utype (dieref)) == NULL)
+ nbytes = attribute_size (AT_user_def_type);
+ die_ref = target_to_host (modifiers, nbytes, GET_UNSIGNED,
+ current_objfile);
+ if ((typep = lookup_utype (die_ref)) == NULL)
{
- typep = alloc_utype (dieref, NULL);
+ typep = alloc_utype (die_ref, NULL);
}
break;
default:
SQUAWK (("botched modified type decoding (mtype 0x%x)", mtype));
- typep = builtin_type_int;
+ typep = lookup_fundamental_type (current_objfile, FT_INTEGER);
break;
}
}
typep = decode_modified_type (modifiers, --modcount, mtype);
switch (modifier)
{
- case MOD_pointer_to:
- typep = lookup_pointer_type (typep);
- break;
- case MOD_reference_to:
- typep = lookup_reference_type (typep);
- break;
- case MOD_const:
- SQUAWK (("type modifier 'const' ignored")); /* FIXME */
- break;
- case MOD_volatile:
- SQUAWK (("type modifier 'volatile' ignored")); /* FIXME */
- break;
- default:
- if (!(MOD_lo_user <= modifier && modifier <= MOD_hi_user))
- {
- SQUAWK (("unknown type modifier %u", modifier));
- }
- break;
+ case MOD_pointer_to:
+ typep = lookup_pointer_type (typep);
+ break;
+ case MOD_reference_to:
+ typep = lookup_reference_type (typep);
+ break;
+ case MOD_const:
+ SQUAWK (("type modifier 'const' ignored")); /* FIXME */
+ break;
+ case MOD_volatile:
+ SQUAWK (("type modifier 'volatile' ignored")); /* FIXME */
+ break;
+ default:
+ if (!(MOD_lo_user <= (unsigned char) modifier
+ && (unsigned char) modifier <= MOD_hi_user))
+ {
+ SQUAWK (("unknown type modifier %u",
+ (unsigned char) modifier));
+ }
+ break;
}
}
return (typep);
If we encounter a fundamental type that we are unprepared to
deal with, and it is not in the range of those types defined
as application specific types, then we issue a warning and
- treat the type as builtin_type_int.
+ treat the type as an "int".
*/
static struct type *
-DEFUN(decode_fund_type, (fundtype), unsigned short fundtype)
+decode_fund_type (fundtype)
+ unsigned int fundtype;
{
struct type *typep = NULL;
{
case FT_void:
- typep = builtin_type_void;
+ typep = lookup_fundamental_type (current_objfile, FT_VOID);
break;
+ case FT_boolean: /* Was FT_set in AT&T version */
+ typep = lookup_fundamental_type (current_objfile, FT_BOOLEAN);
+ break;
+
case FT_pointer: /* (void *) */
- typep = lookup_pointer_type (builtin_type_void);
+ typep = lookup_fundamental_type (current_objfile, FT_VOID);
+ typep = lookup_pointer_type (typep);
break;
case FT_char:
+ typep = lookup_fundamental_type (current_objfile, FT_CHAR);
+ break;
+
case FT_signed_char:
- typep = builtin_type_char;
+ typep = lookup_fundamental_type (current_objfile, FT_SIGNED_CHAR);
+ break;
+
+ case FT_unsigned_char:
+ typep = lookup_fundamental_type (current_objfile, FT_UNSIGNED_CHAR);
break;
case FT_short:
+ typep = lookup_fundamental_type (current_objfile, FT_SHORT);
+ break;
+
case FT_signed_short:
- typep = builtin_type_short;
+ typep = lookup_fundamental_type (current_objfile, FT_SIGNED_SHORT);
+ break;
+
+ case FT_unsigned_short:
+ typep = lookup_fundamental_type (current_objfile, FT_UNSIGNED_SHORT);
break;
case FT_integer:
+ typep = lookup_fundamental_type (current_objfile, FT_INTEGER);
+ break;
+
case FT_signed_integer:
- case FT_boolean: /* Was FT_set in AT&T version */
- typep = builtin_type_int;
+ typep = lookup_fundamental_type (current_objfile, FT_SIGNED_INTEGER);
+ break;
+
+ case FT_unsigned_integer:
+ typep = lookup_fundamental_type (current_objfile, FT_UNSIGNED_INTEGER);
break;
case FT_long:
+ typep = lookup_fundamental_type (current_objfile, FT_LONG);
+ break;
+
case FT_signed_long:
- typep = builtin_type_long;
+ typep = lookup_fundamental_type (current_objfile, FT_SIGNED_LONG);
break;
- case FT_float:
- typep = builtin_type_float;
+ case FT_unsigned_long:
+ typep = lookup_fundamental_type (current_objfile, FT_UNSIGNED_LONG);
break;
- case FT_dbl_prec_float:
- typep = builtin_type_double;
+ case FT_long_long:
+ typep = lookup_fundamental_type (current_objfile, FT_LONG_LONG);
break;
-
- case FT_unsigned_char:
- typep = builtin_type_unsigned_char;
+
+ case FT_signed_long_long:
+ typep = lookup_fundamental_type (current_objfile, FT_SIGNED_LONG_LONG);
break;
-
- case FT_unsigned_short:
- typep = builtin_type_unsigned_short;
+
+ case FT_unsigned_long_long:
+ typep = lookup_fundamental_type (current_objfile, FT_UNSIGNED_LONG_LONG);
break;
-
- case FT_unsigned_integer:
- typep = builtin_type_unsigned_int;
+
+ case FT_float:
+ typep = lookup_fundamental_type (current_objfile, FT_FLOAT);
break;
- case FT_unsigned_long:
- typep = builtin_type_unsigned_long;
+ case FT_dbl_prec_float:
+ typep = lookup_fundamental_type (current_objfile, FT_DBL_PREC_FLOAT);
break;
case FT_ext_prec_float:
- typep = builtin_type_long_double;
+ typep = lookup_fundamental_type (current_objfile, FT_EXT_PREC_FLOAT);
break;
case FT_complex:
- typep = builtin_type_complex;
+ typep = lookup_fundamental_type (current_objfile, FT_COMPLEX);
break;
case FT_dbl_prec_complex:
- typep = builtin_type_double_complex;
+ typep = lookup_fundamental_type (current_objfile, FT_DBL_PREC_COMPLEX);
break;
- case FT_long_long:
- case FT_signed_long_long:
- typep = builtin_type_long_long;
+ case FT_ext_prec_complex:
+ typep = lookup_fundamental_type (current_objfile, FT_EXT_PREC_COMPLEX);
break;
-
- case FT_unsigned_long_long:
- typep = builtin_type_unsigned_long_long;
- break;
-
+
}
if ((typep == NULL) && !(FT_lo_user <= fundtype && fundtype <= FT_hi_user))
{
SQUAWK (("unexpected fundamental type 0x%x", fundtype));
- typep = builtin_type_void;
+ typep = lookup_fundamental_type (current_objfile, FT_VOID);
}
return (typep);
*/
static char *
-DEFUN(create_name, (name, obstackp), char *name AND struct obstack *obstackp)
+create_name (name, obstackp)
+ char *name;
+ struct obstack *obstackp;
{
int length;
char *newname;
length = strlen (name) + 1;
newname = (char *) obstack_alloc (obstackp, length);
- (void) strcpy (newname, name);
+ strcpy (newname, name);
return (newname);
}
SYNOPSIS
- void basicdieinfo (char *diep, struct dieinfo *dip)
+ void basicdieinfo (char *diep, struct dieinfo *dip,
+ struct objfile *objfile)
DESCRIPTION
Note that since there is no guarantee that the data is properly
aligned in memory for the type of access required (indirection
- through anything other than a char pointer), we use memcpy to
- shuffle data items larger than a char. Possibly inefficient, but
- quite portable.
+ through anything other than a char pointer), and there is no
+ guarantee that it is in the same byte order as the gdb host,
+ we call a function which deals with both alignment and byte
+ swapping issues. Possibly inefficient, but quite portable.
We also take care of some other basic things at this point, such
as ensuring that the instance of the die info structure starts
NOTES
All DIE's must have at least a valid length, thus the minimum
- DIE size is sizeof (long). In order to have a valid tag, the
- DIE size must be at least sizeof (short) larger, otherwise they
+ DIE size is SIZEOF_DIE_LENGTH. In order to have a valid tag, the
+ DIE size must be at least SIZEOF_DIE_TAG larger, otherwise they
are forced to be TAG_padding DIES.
- Padding DIES must be at least sizeof(long) in length, implying that
- if a padding DIE is used for alignment and the amount needed is less
- than sizeof(long) then the padding DIE has to be big enough to align
- to the next alignment boundry.
+ Padding DIES must be at least SIZEOF_DIE_LENGTH in length, implying
+ that if a padding DIE is used for alignment and the amount needed is
+ less than SIZEOF_DIE_LENGTH, then the padding DIE has to be big
+ enough to align to the next alignment boundry.
*/
static void
-DEFUN(basicdieinfo, (dip, diep), struct dieinfo *dip AND char *diep)
+basicdieinfo (dip, diep, objfile)
+ struct dieinfo *dip;
+ char *diep;
+ struct objfile *objfile;
{
curdie = dip;
- (void) memset (dip, 0, sizeof (struct dieinfo));
+ memset (dip, 0, sizeof (struct dieinfo));
dip -> die = diep;
- dip -> dieref = dbroff + (diep - dbbase);
- (void) memcpy (&dip -> dielength, diep, sizeof (long));
- if (dip -> dielength < sizeof (long))
+ dip -> die_ref = dbroff + (diep - dbbase);
+ dip -> die_length = target_to_host (diep, SIZEOF_DIE_LENGTH, GET_UNSIGNED,
+ objfile);
+ if (dip -> die_length < SIZEOF_DIE_LENGTH)
{
- dwarfwarn ("malformed DIE, bad length (%d bytes)", dip -> dielength);
+ dwarfwarn ("malformed DIE, bad length (%d bytes)", dip -> die_length);
}
- else if (dip -> dielength < (sizeof (long) + sizeof (short)))
+ else if (dip -> die_length < (SIZEOF_DIE_LENGTH + SIZEOF_DIE_TAG))
{
- dip -> dietag = TAG_padding;
+ dip -> die_tag = TAG_padding;
}
else
{
- (void) memcpy (&dip -> dietag, diep + sizeof (long), sizeof (short));
+ diep += SIZEOF_DIE_LENGTH;
+ dip -> die_tag = target_to_host (diep, SIZEOF_DIE_TAG, GET_UNSIGNED,
+ objfile);
}
}
SYNOPSIS
- void completedieinfo (struct dieinfo *dip)
+ void completedieinfo (struct dieinfo *dip, struct objfile *objfile)
DESCRIPTION
Note that since there is no guarantee that the data is properly
aligned in memory for the type of access required (indirection
- through anything other than a char pointer), we use memcpy to
- shuffle data items larger than a char. Possibly inefficient, but
- quite portable.
+ through anything other than a char pointer), and there is no
+ guarantee that it is in the same byte order as the gdb host,
+ we call a function which deals with both alignment and byte
+ swapping issues. Possibly inefficient, but quite portable.
NOTES
*/
static void
-DEFUN(completedieinfo, (dip), struct dieinfo *dip)
+completedieinfo (dip, objfile)
+ struct dieinfo *dip;
+ struct objfile *objfile;
{
char *diep; /* Current pointer into raw DIE data */
char *end; /* Terminate DIE scan here */
unsigned short attr; /* Current attribute being scanned */
unsigned short form; /* Form of the attribute */
- short block2sz; /* Size of a block2 attribute field */
- long block4sz; /* Size of a block4 attribute field */
+ int nbytes; /* Size of next field to read */
diecount++;
diep = dip -> die;
- end = diep + dip -> dielength;
- diep += sizeof (long) + sizeof (short);
+ end = diep + dip -> die_length;
+ diep += SIZEOF_DIE_LENGTH + SIZEOF_DIE_TAG;
while (diep < end)
{
- (void) memcpy (&attr, diep, sizeof (short));
- diep += sizeof (short);
+ attr = target_to_host (diep, SIZEOF_ATTRIBUTE, GET_UNSIGNED, objfile);
+ diep += SIZEOF_ATTRIBUTE;
+ if ((nbytes = attribute_size (attr)) == -1)
+ {
+ SQUAWK (("unknown attribute length, skipped remaining attributes"));;
+ diep = end;
+ continue;
+ }
switch (attr)
{
case AT_fund_type:
- (void) memcpy (&dip -> at_fund_type, diep, sizeof (short));
+ dip -> at_fund_type = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_ordering:
- (void) memcpy (&dip -> at_ordering, diep, sizeof (short));
+ dip -> at_ordering = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_bit_offset:
- (void) memcpy (&dip -> at_bit_offset, diep, sizeof (short));
+ dip -> at_bit_offset = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_visibility:
- (void) memcpy (&dip -> at_visibility, diep, sizeof (short));
+ dip -> at_visibility = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_sibling:
- (void) memcpy (&dip -> at_sibling, diep, sizeof (long));
+ dip -> at_sibling = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_stmt_list:
- (void) memcpy (&dip -> at_stmt_list, diep, sizeof (long));
+ dip -> at_stmt_list = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
dip -> has_at_stmt_list = 1;
break;
case AT_low_pc:
- (void) memcpy (&dip -> at_low_pc, diep, sizeof (long));
+ dip -> at_low_pc = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
dip -> at_low_pc += baseaddr;
dip -> has_at_low_pc = 1;
break;
case AT_high_pc:
- (void) memcpy (&dip -> at_high_pc, diep, sizeof (long));
+ dip -> at_high_pc = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
dip -> at_high_pc += baseaddr;
break;
case AT_language:
- (void) memcpy (&dip -> at_language, diep, sizeof (long));
+ dip -> at_language = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_user_def_type:
- (void) memcpy (&dip -> at_user_def_type, diep, sizeof (long));
+ dip -> at_user_def_type = target_to_host (diep, nbytes,
+ GET_UNSIGNED, objfile);
break;
case AT_byte_size:
- (void) memcpy (&dip -> at_byte_size, diep, sizeof (long));
+ dip -> at_byte_size = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_bit_size:
- (void) memcpy (&dip -> at_bit_size, diep, sizeof (long));
+ dip -> at_bit_size = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_member:
- (void) memcpy (&dip -> at_member, diep, sizeof (long));
+ dip -> at_member = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_discr:
- (void) memcpy (&dip -> at_discr, diep, sizeof (long));
+ dip -> at_discr = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_import:
- (void) memcpy (&dip -> at_import, diep, sizeof (long));
+ dip -> at_import = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_location:
dip -> at_location = diep;
dip -> at_name = diep;
break;
case AT_comp_dir:
- dip -> at_comp_dir = diep;
+ /* For now, ignore any "hostname:" portion, since gdb doesn't
+ know how to deal with it. (FIXME). */
+ dip -> at_comp_dir = strrchr (diep, ':');
+ if (dip -> at_comp_dir != NULL)
+ {
+ dip -> at_comp_dir++;
+ }
+ else
+ {
+ dip -> at_comp_dir = diep;
+ }
break;
case AT_producer:
dip -> at_producer = diep;
break;
case AT_frame_base:
- (void) memcpy (&dip -> at_frame_base, diep, sizeof (long));
+ dip -> at_frame_base = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_start_scope:
- (void) memcpy (&dip -> at_start_scope, diep, sizeof (long));
+ dip -> at_start_scope = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_stride_size:
- (void) memcpy (&dip -> at_stride_size, diep, sizeof (long));
+ dip -> at_stride_size = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_src_info:
- (void) memcpy (&dip -> at_src_info, diep, sizeof (long));
+ dip -> at_src_info = target_to_host (diep, nbytes, GET_UNSIGNED,
+ objfile);
break;
case AT_prototyped:
- (void) memcpy (&dip -> at_prototyped, diep, sizeof (short));
+ dip -> at_prototyped = diep;
break;
default:
/* Found an attribute that we are unprepared to handle. However
we can just ignore the unknown attribute. */
break;
}
- form = attr & 0xF;
+ form = FORM_FROM_ATTR (attr);
switch (form)
{
case FORM_DATA2:
- diep += sizeof (short);
+ diep += 2;
break;
case FORM_DATA4:
- diep += sizeof (long);
+ case FORM_REF:
+ diep += 4;
break;
case FORM_DATA8:
- diep += 8 * sizeof (char); /* sizeof (long long) ? */
+ diep += 8;
break;
case FORM_ADDR:
- case FORM_REF:
- diep += sizeof (long);
+ diep += TARGET_FT_POINTER_SIZE (objfile);
break;
case FORM_BLOCK2:
- (void) memcpy (&block2sz, diep, sizeof (short));
- block2sz += sizeof (short);
- diep += block2sz;
+ diep += 2 + target_to_host (diep, nbytes, GET_UNSIGNED, objfile);
break;
case FORM_BLOCK4:
- (void) memcpy (&block4sz, diep, sizeof (long));
- block4sz += sizeof (long);
- diep += block4sz;
+ diep += 4 + target_to_host (diep, nbytes, GET_UNSIGNED, objfile);
break;
case FORM_STRING:
diep += strlen (diep) + 1;
break;
default:
- SQUAWK (("unknown attribute form (0x%x), skipped rest", form));
+ SQUAWK (("unknown attribute form (0x%x)", form));
+ SQUAWK (("unknown attribute length, skipped remaining attributes"));;
diep = end;
break;
}
}
}
+
+/*
+
+LOCAL FUNCTION
+
+ target_to_host -- swap in target data to host
+
+SYNOPSIS
+
+ target_to_host (char *from, int nbytes, int signextend,
+ struct objfile *objfile)
+
+DESCRIPTION
+
+ Given pointer to data in target format in FROM, a byte count for
+ the size of the data in NBYTES, a flag indicating whether or not
+ the data is signed in SIGNEXTEND, and a pointer to the current
+ objfile in OBJFILE, convert the data to host format and return
+ the converted value.
+
+NOTES
+
+ FIXME: If we read data that is known to be signed, and expect to
+ use it as signed data, then we need to explicitly sign extend the
+ result until the bfd library is able to do this for us.
+
+ */
+
+static unsigned long
+target_to_host (from, nbytes, signextend, objfile)
+ char *from;
+ int nbytes;
+ int signextend; /* FIXME: Unused */
+ struct objfile *objfile;
+{
+ unsigned long rtnval;
+
+ switch (nbytes)
+ {
+ case 8:
+ rtnval = bfd_get_64 (objfile -> obfd, (bfd_byte *) from);
+ break;
+ case 4:
+ rtnval = bfd_get_32 (objfile -> obfd, (bfd_byte *) from);
+ break;
+ case 2:
+ rtnval = bfd_get_16 (objfile -> obfd, (bfd_byte *) from);
+ break;
+ case 1:
+ rtnval = bfd_get_8 (objfile -> obfd, (bfd_byte *) from);
+ break;
+ default:
+ dwarfwarn ("no bfd support for %d byte data object", nbytes);
+ rtnval = 0;
+ break;
+ }
+ return (rtnval);
+}
+
+/*
+
+LOCAL FUNCTION
+
+ attribute_size -- compute size of data for a DWARF attribute
+
+SYNOPSIS
+
+ static int attribute_size (unsigned int attr)
+
+DESCRIPTION
+
+ Given a DWARF attribute in ATTR, compute the size of the first
+ piece of data associated with this attribute and return that
+ size.
+
+ Returns -1 for unrecognized attributes.
+
+ */
+
+static int
+attribute_size (attr)
+ unsigned int attr;
+{
+ int nbytes; /* Size of next data for this attribute */
+ unsigned short form; /* Form of the attribute */
+
+ form = FORM_FROM_ATTR (attr);
+ switch (form)
+ {
+ case FORM_STRING: /* A variable length field is next */
+ nbytes = 0;
+ break;
+ case FORM_DATA2: /* Next 2 byte field is the data itself */
+ case FORM_BLOCK2: /* Next 2 byte field is a block length */
+ nbytes = 2;
+ break;
+ case FORM_DATA4: /* Next 4 byte field is the data itself */
+ case FORM_BLOCK4: /* Next 4 byte field is a block length */
+ case FORM_REF: /* Next 4 byte field is a DIE offset */
+ nbytes = 4;
+ break;
+ case FORM_DATA8: /* Next 8 byte field is the data itself */
+ nbytes = 8;
+ break;
+ case FORM_ADDR: /* Next field size is target sizeof(void *) */
+ nbytes = TARGET_FT_POINTER_SIZE (objfile);
+ break;
+ default:
+ SQUAWK (("unknown attribute form (0x%x)", form));
+ nbytes = -1;
+ break;
+ }
+ return (nbytes);
+}
projects / deliverable / binutils-gdb.git / blobdiff