Added more functions to print the abbreviations.

1 files changed, 47 insertions, 72 deletions

diff --git a/debug/DwarfTypes.ml b/debug/DwarfTypes.ml
index a5b5e3d1..b2779e33 100644
--- a/debug/DwarfTypes.ml
+++ b/debug/DwarfTypes.ml
@@ -30,12 +30,6 @@ type encoding =
   | DW_ATE_unsigned
   | DW_ATE_unsigned_char
 
-type identifier_case =
-  | DW_ID_case_sensitive
-  | DW_ID_up_case
-  | DW_ID_down_case
-  | DW_ID_case_insensitive
-
 type address = int
 
 type language =
@@ -44,35 +38,17 @@ type language =
 
 type block = string (* Used as bitvector *)
 
-type calling_convention =
-  | DW_CC_normal
-  | DW_CC_program
-  | DW_CC_nocall
-  | DW_CC_lo_user
-  | DW_CC_hi_user
-
-type inline =
-  | DW_INL_not_inlined
-  | DW_INL_inlined
-  | DW_INL_declared_not_inlined
-  | DW_INL_declared_inlined
-
-type const_value =
-  | String of string
-  | Const of constant
-  | Block of block
-
 type location_value =
-  | Const of constant
-  | Block of block
+  | LocConst of constant
+  | LocBlock of block
 
 type data_location_value =
-  | Block of block
-  | Ref of reference
+  | DataLocBlock of block
+  | DataLocRef of reference
 
 type bound_value =
-  | Const of constant
-  | Ref of reference
+  | BoundConst of constant
+  | BoundRef of reference
 
 (* Types representing the attribute information per tag value *)
 
@@ -125,14 +101,14 @@ type dw_tag_enumerator =
 
 type dw_tag_formal_parameter =
     {
-     dw_at_decl_file:          constant       option;
-     dw_at_decl_line:          constant       option;
-     dw_at_artificial:         flag           option;
-     dw_at_location:           location_value option;
-     dw_at_name:               string;
-     dw_at_segment:            location_value option;
-     dw_at_type:               reference;
-     dw_at_variable_parameter: flag           option;
+     formal_parameter_decl_file:          constant       option;
+     formal_parameter_decl_line:          constant       option;
+     formal_parameter_artificial:         flag           option;
+     formal_parameter_location:           location_value option;
+     formal_parameter_name:               string;
+     formal_parameter_segment:            location_value option;
+     formal_parameter_type:               reference;
+     formal_parameter_variable_parameter: flag           option;
    }
 
 type dw_tag_label =
@@ -176,67 +152,66 @@ type dw_tag_structure_type =
 
 type dw_tag_subprogram =
     {
-     dw_at_decl_file:  constant       option;
-     dw_at_decl_line:  constant       option;
-     dw_at_external:   flag           option;
-     dw_at_frame_base: location_value option;
-     dw_at_high_pc:    address;
-     dw_at_inline:     inline         option;
-     dw_at_low_pc:     address;
-     dw_at_name:       string;
-     dw_at_prototyped: flag;
-     dw_at_type:       reference;
+     subprogram_decl_file:  constant       option;
+     subprogram_decl_line:  constant       option;
+     subprogram_external:   flag           option;
+     subprogram_frame_base: location_value option;
+     subprogram_high_pc:    address;
+     subprogram_low_pc:     address;
+     subprogram_name:       string;
+     subprogram_prototyped: flag;
+     subprogram_type:       reference;
    }
 
 type dw_tag_subrange_type =
     {
-     dw_at_type:        reference option;
-     dw_at_upper_bound: bound_value;
+     subrange_type:        reference option;
+     subrange_upper_bound: bound_value;
    }
 
 type dw_tag_subroutine_type =
     {
-     dw_at_prototyped: flag;
+     subroutine_prototyped: flag;
    }
 
 type dw_tag_typedef =
     {
-     dw_at_decl_file: constant  option;
-     dw_at_decl_line: constant  option;
-     dw_at_name:      string;
-     dw_at_type:      reference;
+     typedef_decl_file: constant  option;
+     typedef_decl_line: constant  option;
+     typedef_name:      string;
+     typedef_type:      reference;
    }
 
 type dw_tag_union_type =
     {
-     dw_at_decl_file: constant  option;
-     dw_at_decl_line: constant  option;
-     dw_at_byte_size: constant;
-     dw_at_name:      string;
+     union_decl_file: constant  option;
+     union_decl_line: constant  option;
+     union_byte_size: constant;
+     union_name:      string;
    }
 
 type dw_tag_unspecified_parameter =
     {
-     dw_at_decl_file:  constant option;
-     dw_at_decl_line:  constant option;
-     dw_at_artificial: flag      option;
+     unspecified_parameter_decl_file:  constant option;
+     unspecified_parameter_decl_line:  constant option;
+     unspecified_parameter_artificial: flag     option;
    }
 
 type dw_tag_variable =
     {
-     dw_at_decl_file:   constant       option;
-     dw_at_decl_line:   constant       option;
-     dw_at_declaration: flag           option;
-     dw_at_external:    flag           option;
-     dw_at_location:    location_value option;
-     dw_at_name:        string;
-     dw_at_segment:     location_value option;
-     dw_at_type:        reference;
+     variable_decl_file:   constant       option;
+     variable_decl_line:   constant       option;
+     variable_declaration: flag           option;
+     variable_external:    flag           option;
+     variable_location:    location_value option;
+     variable_name:        string;
+     variable_segment:     location_value option;
+     variable_type:        reference;
    }
 
 type dw_tag_volatile_type =
     {
-     dw_at_type: reference;
+     volatile_type: reference;
    }
 
 type dw_tag =
@@ -252,7 +227,7 @@ type dw_tag =
   | DW_TAG_member of dw_tag_member
   | DW_TAG_pointer_type of dw_tag_pointer_type
   | DW_TAG_structure_type of dw_tag_structure_type
-  | DW_TAG_tag_subprogram of dw_tag_subprogram
+  | DW_TAG_subprogram of dw_tag_subprogram
   | DW_TAG_subrange_type of dw_tag_subrange_type
   | DW_TAG_subroutine_type of dw_tag_subroutine_type
   | DW_TAG_typedef of dw_tag_typedef