X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdwarf2expr.h;h=a8d6ae111dc707fa9d7d34cbd737eec8b2a3f5ea;hb=98bbb1b86180324b278842d8d73c79cb5d76d349;hp=63bdc6e73b053605af5aac24349b344fe5b4484a;hpb=192ca6d8eac4a5538036ef200b95d6ef3dbe9511;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h index 63bdc6e73b..a8d6ae111d 100644 --- a/gdb/dwarf2expr.h +++ b/gdb/dwarf2expr.h @@ -1,6 +1,6 @@ /* DWARF 2 Expression Evaluator. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2017 Free Software Foundation, Inc. Contributed by Daniel Berlin . @@ -49,18 +49,68 @@ enum dwarf_value_location DWARF_VALUE_IMPLICIT_POINTER }; +/* A piece of an object, as recorded by DW_OP_piece or DW_OP_bit_piece. */ +struct dwarf_expr_piece +{ + enum dwarf_value_location location; + + union + { + struct + { + /* This piece's address, for DWARF_VALUE_MEMORY pieces. */ + CORE_ADDR addr; + /* Non-zero if the piece is known to be in memory and on + the program's stack. */ + bool in_stack_memory; + } mem; + + /* The piece's register number, for DWARF_VALUE_REGISTER pieces. */ + int regno; + + /* The piece's literal value, for DWARF_VALUE_STACK pieces. */ + struct value *value; + + struct + { + /* A pointer to the data making up this piece, + for DWARF_VALUE_LITERAL pieces. */ + const gdb_byte *data; + /* The length of the available data. */ + ULONGEST length; + } literal; + + /* Used for DWARF_VALUE_IMPLICIT_POINTER. */ + struct + { + /* The referent DIE from DW_OP_implicit_pointer. */ + sect_offset die_sect_off; + /* The byte offset into the resulting data. */ + LONGEST offset; + } ptr; + } v; + + /* The length of the piece, in bits. */ + ULONGEST size; + /* The piece offset, in bits. */ + ULONGEST offset; +}; + /* The dwarf expression stack. */ struct dwarf_stack_value { + dwarf_stack_value (struct value *value_, int in_stack_memory_) + : value (value_), in_stack_memory (in_stack_memory_) + {} + struct value *value; - /* Non-zero if the piece is in memory and is known to be - on the program's stack. It is always ok to set this to zero. - This is used, for example, to optimize memory access from the target. - It can vastly speed up backtraces on long latency connections when - "set stack-cache on". */ - int in_stack_memory; + /* True if the piece is in memory and is known to be on the program's stack. + It is always ok to set this to zero. This is used, for example, to + optimize memory access from the target. It can vastly speed up backtraces + on long latency connections when "set stack-cache on". */ + bool in_stack_memory; }; /* The expression evaluator works with a dwarf_expr_context, describing @@ -68,20 +118,16 @@ struct dwarf_stack_value struct dwarf_expr_context { dwarf_expr_context (); - ~dwarf_expr_context (); + virtual ~dwarf_expr_context () = default; - void push_address (CORE_ADDR value, int in_stack_memory); + void push_address (CORE_ADDR value, bool in_stack_memory); void eval (const gdb_byte *addr, size_t len); struct value *fetch (int n); CORE_ADDR fetch_address (int n); - int fetch_in_stack_memory (int n); - - /* The stack of values, allocated with xmalloc. */ - struct dwarf_stack_value *stack; + bool fetch_in_stack_memory (int n); - /* The number of values currently pushed on the stack, and the - number of elements allocated to the stack. */ - int stack_len, stack_allocated; + /* The stack of values. */ + std::vector stack; /* Target architecture to use for address operations. */ struct gdbarch *gdbarch; @@ -114,8 +160,7 @@ struct dwarf_expr_context initialized; zero otherwise. */ int initialized; - /* An array of pieces. PIECES points to its first element; - NUM_PIECES is its length. + /* A vector of pieces. Each time DW_OP_piece is executed, we add a new element to the end of this array, recording the current top of the stack, the @@ -137,8 +182,7 @@ struct dwarf_expr_context no DW_OP_piece operations have no value to place in a piece's 'size' field; the size comes from the surrounding data. So the two cases need to be handled separately.) */ - int num_pieces; - struct dwarf_expr_piece *pieces; + std::vector pieces; /* Return the value of register number REGNUM (a DWARF register number), read as an address. */ @@ -156,137 +200,62 @@ struct dwarf_expr_context /* Return the location expression for the frame base attribute, in START and LENGTH. The result must be live until the current expression evaluation is complete. */ - virtual void get_frame_base (const gdb_byte **start, size_t *length) - { - error (_("%s is invalid in this context"), "DW_OP_fbreg"); - } + virtual void get_frame_base (const gdb_byte **start, size_t *length) = 0; /* Return the CFA for the frame. */ - virtual CORE_ADDR get_frame_cfa () - { - error (_("%s is invalid in this context"), "DW_OP_call_frame_cfa"); - } + virtual CORE_ADDR get_frame_cfa () = 0; /* Return the PC for the frame. */ virtual CORE_ADDR get_frame_pc () { - error (_("%s is invalid in this context"), "DW_OP_GNU_implicit_pointer"); + error (_("%s is invalid in this context"), "DW_OP_implicit_pointer"); } /* Return the thread-local storage address for DW_OP_GNU_push_tls_address or DW_OP_form_tls_address. */ - virtual CORE_ADDR get_tls_address (CORE_ADDR offset) - { - error (_("%s is invalid in this context"), "DW_OP_form_tls_address"); - } + virtual CORE_ADDR get_tls_address (CORE_ADDR offset) = 0; /* Execute DW_AT_location expression for the DWARF expression - subroutine in the DIE at DIE_OFFSET in the CU. Do not touch + subroutine in the DIE at DIE_CU_OFF in the CU. Do not touch STACK while it being passed to and returned from the called DWARF subroutine. */ - virtual void dwarf_call (cu_offset die_offset) - { - error (_("%s is invalid in this context"), "DW_OP_call*"); - } + virtual void dwarf_call (cu_offset die_cu_off) = 0; - /* Return the base type given by the indicated DIE. This can throw - an exception if the DIE is invalid or does not represent a base - type. If can also be NULL in the special case where the - callbacks are not performing evaluation, and thus it is - meaningful to substitute a stub type of the correct size. */ - virtual struct type *impl_get_base_type (cu_offset die) + /* Return the base type given by the indicated DIE at DIE_CU_OFF. + This can throw an exception if the DIE is invalid or does not + represent a base type. SIZE is non-zero if this function should + verify that the resulting type has the correct size. */ + virtual struct type *get_base_type (cu_offset die_cu_off, int size) { /* Anything will do. */ return builtin_type (this->gdbarch)->builtin_int; } - /* Push on DWARF stack an entry evaluated for DW_TAG_GNU_call_site's + /* Push on DWARF stack an entry evaluated for DW_TAG_call_site's parameter matching KIND and KIND_U at the caller of specified BATON. - If DEREF_SIZE is not -1 then use DW_AT_GNU_call_site_data_value instead of - DW_AT_GNU_call_site_value. */ + If DEREF_SIZE is not -1 then use DW_AT_call_data_value instead of + DW_AT_call_value. */ virtual void push_dwarf_reg_entry_value (enum call_site_parameter_kind kind, union call_site_parameter_u kind_u, - int deref_size) - { - internal_error (__FILE__, __LINE__, - _("Support for DW_OP_GNU_entry_value is unimplemented")); - } + int deref_size) = 0; /* Return the address indexed by DW_OP_GNU_addr_index. This can throw an exception if the index is out of range. */ - virtual CORE_ADDR get_addr_index (unsigned int index) - { - error (_("%s is invalid in this context"), "DW_OP_GNU_addr_index"); - } + virtual CORE_ADDR get_addr_index (unsigned int index) = 0; /* Return the `object address' for DW_OP_push_object_address. */ - virtual CORE_ADDR get_object_address () - { - internal_error (__FILE__, __LINE__, - _("Support for DW_OP_push_object_address " - "is unimplemented")); - } + virtual CORE_ADDR get_object_address () = 0; private: struct type *address_type () const; - void grow_stack (size_t need); - void push (struct value *value, int in_stack_memory); - int stack_empty_p () const; + void push (struct value *value, bool in_stack_memory); + bool stack_empty_p () const; void add_piece (ULONGEST size, ULONGEST offset); - struct type *get_base_type (cu_offset die, int size); void execute_stack_op (const gdb_byte *op_ptr, const gdb_byte *op_end); void pop (); }; - -/* A piece of an object, as recorded by DW_OP_piece or DW_OP_bit_piece. */ -struct dwarf_expr_piece -{ - enum dwarf_value_location location; - - union - { - struct - { - /* This piece's address, for DWARF_VALUE_MEMORY pieces. */ - CORE_ADDR addr; - /* Non-zero if the piece is known to be in memory and on - the program's stack. */ - int in_stack_memory; - } mem; - - /* The piece's register number, for DWARF_VALUE_REGISTER pieces. */ - int regno; - - /* The piece's literal value, for DWARF_VALUE_STACK pieces. */ - struct value *value; - - struct - { - /* A pointer to the data making up this piece, - for DWARF_VALUE_LITERAL pieces. */ - const gdb_byte *data; - /* The length of the available data. */ - ULONGEST length; - } literal; - - /* Used for DWARF_VALUE_IMPLICIT_POINTER. */ - struct - { - /* The referent DIE from DW_OP_GNU_implicit_pointer. */ - sect_offset die; - /* The byte offset into the resulting data. */ - LONGEST offset; - } ptr; - } v; - - /* The length of the piece, in bits. */ - ULONGEST size; - /* The piece offset, in bits. */ - ULONGEST offset; -}; - void dwarf_expr_require_composition (const gdb_byte *, const gdb_byte *, const char *);