gdb/

[deliverable/binutils-gdb.git] / gdb / dwarf2expr.h

diff --git a/gdb/dwarf2expr.h b/gdb/dwarf2expr.h
index db49b9c5cebca1f9bbb2c9085fdd6e08083c0f41..e85486a5000ebdef4c4d4a5bb0b034b8e78e23db 100644 (file)
--- a/gdb/dwarf2expr.h
+++ b/gdb/dwarf2expr.h
@@ -1,7 +1,6 @@
 /* DWARF 2 Expression Evaluator.
 
-   Copyright (C) 2001-2003, 2005, 2007-2012 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
    Contributed by Daniel Berlin <dan@dberlin.org>.
 
@@ -24,22 +23,9 @@
 #define DWARF2EXPR_H
 
 #include "leb128.h"
+#include "gdbtypes.h"
 
 struct dwarf_expr_context;
-enum call_site_parameter_kind;
-union call_site_parameter_u;
-
-/* Offset relative to the start of its containing CU (compilation unit).  */
-typedef struct
-{
-  unsigned int cu_off;
-} cu_offset;
-
-/* Offset relative to the start of its .debug_info or .debug_types section.  */
-typedef struct
-{
-  unsigned int sect_off;
-} sect_offset;
 
 /* Virtual method table for struct dwarf_expr_context below.  */
 
@@ -178,7 +164,7 @@ struct dwarf_expr_context
 
   /* For DWARF_VALUE_LITERAL, the current literal value's length and
      data.  For DWARF_VALUE_IMPLICIT_POINTER, LEN is the offset of the
-     target DIE of cu_offset kind.  */
+     target DIE of sect_offset kind.  */
   ULONGEST len;
   const gdb_byte *data;
 
@@ -249,7 +235,7 @@ struct dwarf_expr_piece
     struct
     {
       /* The referent DIE from DW_OP_GNU_implicit_pointer.  */
-      cu_offset die;
+      sect_offset die;
       /* The byte offset into the resulting data.  */
       LONGEST offset;
     } ptr;