From 10d5ed08a324ffd10d4db8ec58bbf6e77253bc36 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Sun, 23 Aug 2015 20:11:18 +0200 Subject: Do not add subsize tag to array types without size such as flexible array members. --- debug/CtoDwarf.ml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'debug') diff --git a/debug/CtoDwarf.ml b/debug/CtoDwarf.ml index 99b77e6f..103849d0 100644 --- a/debug/CtoDwarf.ml +++ b/debug/CtoDwarf.ml @@ -188,29 +188,33 @@ and fun_to_dwarf_tag rt args = s.id,((s::others)@et) (* Generate a dwarf tag for the given array type *) -and array_to_dwarf_tag child size = +and array_to_dwarf_tag child size = + let append_opt a b = + match a with + | None -> b + | Some a -> a::b in let size_to_subrange s = - let b = (match s with + match s with | None -> None | Some i -> let i = Int64.to_int i in - Some (BoundConst i)) in - let s = { - subrange_type = None; - subrange_upper_bound = b; - } in - new_entry (DW_TAG_subrange_type s) in + let s = + { + subrange_type = None; + subrange_upper_bound = Some (BoundConst i); + } in + Some (new_entry (DW_TAG_subrange_type s)) in let rec aux t = (match t with | TArray (child,size,_) -> let sub = size_to_subrange size in let t,c,e = aux child in - t,sub::c,e + t,append_opt sub c,e | _ -> let t,e = type_to_dwarf t in t,[],e) in let t,children,e = aux child in let sub = size_to_subrange size in - let children = List.rev (sub::children) in + let children = List.rev (append_opt sub children) in let arr = { array_type_file_loc = None; array_type = t; -- cgit From 20b311376d93fd68d51a66ac4c158c000333ae18 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Sun, 23 Aug 2015 20:13:33 +0200 Subject: Revert "Added support for the location of non static global variables." This reverts commit b4846ffadfa3fbb73ffa7d9c43e5218adeece8da. --- debug/CtoDwarf.ml | 2 +- debug/DwarfPrinter.ml | 8 +------- debug/DwarfTypes.mli | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'debug') diff --git a/debug/CtoDwarf.ml b/debug/CtoDwarf.ml index 103849d0..753f4cdd 100644 --- a/debug/CtoDwarf.ml +++ b/debug/CtoDwarf.ml @@ -308,7 +308,7 @@ let glob_var_to_dwarf (s,n,t,_) gloc = variable_file_loc = (Some gloc); variable_declaration = Some at_decl; variable_external = Some ext; - variable_location = if ext then Some (LocSymbol n.name) else None; + variable_location = None; variable_name = n.name; variable_segment = None; variable_type = i; diff --git a/debug/DwarfPrinter.ml b/debug/DwarfPrinter.ml index 70b68634..67245ca8 100644 --- a/debug/DwarfPrinter.ml +++ b/debug/DwarfPrinter.ml @@ -74,7 +74,6 @@ module DwarfPrinter(Target: DWARF_TARGET)(DwarfAbbrevs:DWARF_ABBREVS): | None -> () | Some (LocConst _) -> add_abbr_entry (0x2,location_const_type_abbr) buf | Some (LocBlock _) -> add_abbr_entry (0x2,location_block_type_abbr) buf - | Some (LocSymbol _) -> add_abbr_entry (0x2,location_block_type_abbr) buf (* Dwarf entity to string function *) let abbrev_string_of_entity entity has_sibling = @@ -295,12 +294,7 @@ module DwarfPrinter(Target: DWARF_TARGET)(DwarfAbbrevs:DWARF_ABBREVS): fprintf oc " .byte 0x%X\n" b let print_loc oc loc = - match loc with - | LocSymbol s -> - fprintf oc " .sleb128 5\n"; - fprintf oc " .byte 3\n"; - fprintf oc " .4byte %s\n" s - | _ -> () + () let print_data_location oc dl = () diff --git a/debug/DwarfTypes.mli b/debug/DwarfTypes.mli index 4852e550..d6592bd9 100644 --- a/debug/DwarfTypes.mli +++ b/debug/DwarfTypes.mli @@ -37,7 +37,6 @@ type address = int type block = string type location_value = - | LocSymbol of string | LocConst of constant | LocBlock of block -- cgit From 389f3e9554a7d29a8afa8d3c88804f9f988abdfe Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Mon, 24 Aug 2015 12:54:01 +0200 Subject: Also change the order of high and low pc in the compilation unit tag. --- debug/DwarfPrinter.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug') diff --git a/debug/DwarfPrinter.ml b/debug/DwarfPrinter.ml index 67245ca8..f9c2034e 100644 --- a/debug/DwarfPrinter.ml +++ b/debug/DwarfPrinter.ml @@ -335,8 +335,8 @@ module DwarfPrinter(Target: DWARF_TARGET)(DwarfAbbrevs:DWARF_ABBREVS): let print_compilation_unit oc tag = let prod_name = sprintf "AbsInt Angewandte Informatik GmbH:CompCert Version %s:%s" Version.version Configuration.arch in print_string oc (Sys.getcwd ()); - print_addr oc (get_start_addr ()); print_addr oc (get_end_addr ()); + print_addr oc (get_start_addr ()); print_uleb128 oc 1; print_string oc tag.compile_unit_name; print_string oc prod_name; -- cgit From c3579778940839b9d4753ec47169ceadda55c083 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Mon, 24 Aug 2015 17:21:01 +0200 Subject: Fixed error in handling of anonymous struct/union/enum types. Composite types should be always handled by the composite_type_info table and not by the normal type table. --- debug/CtoDwarf.ml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'debug') diff --git a/debug/CtoDwarf.ml b/debug/CtoDwarf.ml index 753f4cdd..c5f1142c 100644 --- a/debug/CtoDwarf.ml +++ b/debug/CtoDwarf.ml @@ -197,7 +197,7 @@ and array_to_dwarf_tag child size = match s with | None -> None | Some i -> - let i = Int64.to_int i in + let i = Int64.to_int (Int64.sub i Int64.one) in let s = { subrange_type = None; @@ -276,23 +276,30 @@ and attr_type_to_dwarf typ typ_string = (* Translate a given type to its dwarf representation *) and type_to_dwarf (typ: typ): int * dw_entry list = - let typ = strip_attributes typ in - let typ_string = typ_to_string typ in - try - Hashtbl.find type_table typ_string,[] - with Not_found -> - attr_type_to_dwarf typ typ_string + match typ with + | TStruct (i,_) + | TUnion (i,_) + | TEnum (i,_) -> + let t = get_composite_type i.stamp in + t,[] + | _ -> + let typ = strip_attributes typ in + let typ_string = typ_to_string typ in + try + Hashtbl.find type_table typ_string,[] + with Not_found -> + attr_type_to_dwarf typ typ_string (* Translate a typedef to its corresponding dwarf representation *) let typedef_to_dwarf gloc (name,t) = let i,t = type_to_dwarf t in - Hashtbl.add typedef_table name i; let td = { typedef_file_loc = gloc; typedef_name = name; typedef_type = i; } in let td = new_entry (DW_TAG_typedef td) in + Hashtbl.add typedef_table name td.id; td::t (* Translate a global var to its corresponding dwarf representation *) -- cgit From 5e0e155f859627e804d3acea25e0c0bcf187cec6 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Tue, 25 Aug 2015 12:09:29 +0200 Subject: Fixed abbreviation of DW_TAG_formal_parameter. Dwarf debuging entries for formal parameters were printed as variables. This could lead to confusion in function pointer types and later with local variables. --- debug/DwarfPrinter.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug') diff --git a/debug/DwarfPrinter.ml b/debug/DwarfPrinter.ml index f9c2034e..7f1caaf6 100644 --- a/debug/DwarfPrinter.ml +++ b/debug/DwarfPrinter.ml @@ -124,7 +124,7 @@ module DwarfPrinter(Target: DWARF_TARGET)(DwarfAbbrevs:DWARF_ABBREVS): add_abbr_entry (0x1c,value_type_abbr) buf; add_name buf | DW_TAG_formal_parameter e -> - prologue 0x34; + prologue 0x5; add_attr_some e.formal_parameter_file_loc add_file_loc; add_attr_some e.formal_parameter_artificial (add_abbr_entry (0x34,artificial_type_abbr)); add_location e.formal_parameter_location buf; -- cgit