First try of debug information for gcc.

7 files changed, 88 insertions, 30 deletions

diff --git a/debug/Debug.ml b/debug/Debug.ml
index 6da0927d..348310f6 100644
--- a/debug/Debug.ml
+++ b/debug/Debug.ml
@@ -45,11 +45,13 @@ type implem =
      mutable function_end: atom -> positive -> unit;
      mutable add_label: atom -> positive -> int -> unit;
      mutable atom_parameter: ident -> ident -> atom -> unit;
-     mutable add_compilation_section_start: string ->(int * int * int * string) -> unit;
+     mutable add_compilation_section_start: string -> int -> unit;
+     mutable add_compilation_section_end: string -> int -> unit;
      mutable compute_file_enum: (string -> int) -> (string-> int) -> (unit -> unit) -> unit;
      mutable exists_section: string -> bool;
      mutable remove_unused: ident -> unit;
      mutable variable_printed: string -> unit;
+     mutable add_diab_info: string -> (int * int * string) -> unit;
    }
 
 let implem =
@@ -78,10 +80,12 @@ let implem =
    add_label = (fun _ _ _ -> ());
    atom_parameter = (fun _ _ _ -> ());
    add_compilation_section_start = (fun _ _ -> ());
+   add_compilation_section_end = (fun _ _ -> ());
    compute_file_enum = (fun _ _ _ -> ());
    exists_section = (fun _ -> true);
    remove_unused = (fun _ -> ());
    variable_printed = (fun _ -> ());
+   add_diab_info = (fun _ _ -> ());
 }
 
 let init_compile_unit name = implem.init name
@@ -108,7 +112,9 @@ let function_end atom loc = implem.function_end atom loc
 let add_label atom p lbl = implem.add_label atom p lbl
 let atom_parameter fid pid atom = implem.atom_parameter fid pid atom
 let add_compilation_section_start sec addr = implem.add_compilation_section_start sec addr
+let add_compilation_section_end sec addr = implem.add_compilation_section_end sec addr
 let exists_section sec = implem.exists_section sec
 let compute_file_enum end_l entry_l line_e = implem.compute_file_enum end_l entry_l line_e
 let remove_unused ident = implem.remove_unused ident
 let variable_printed ident = implem.variable_printed ident
+let add_diab_info sec addr = implem.add_diab_info sec addr
diff --git a/debug/Debug.mli b/debug/Debug.mli
index e9b566a5..98a13b30 100644
--- a/debug/Debug.mli
+++ b/debug/Debug.mli
@@ -43,11 +43,13 @@ type implem =
      mutable function_end: atom -> positive -> unit;
      mutable add_label: atom -> positive -> int -> unit;
      mutable atom_parameter: ident -> ident -> atom -> unit;
-     mutable add_compilation_section_start: string -> (int * int * int * string) -> unit;
+     mutable add_compilation_section_start: string -> int -> unit;
+     mutable add_compilation_section_end: string -> int -> unit;
      mutable compute_file_enum: (string -> int) -> (string-> int) -> (unit -> unit) -> unit;
      mutable exists_section: string -> bool;
      mutable remove_unused: ident -> unit;
      mutable variable_printed: string -> unit;
+     mutable add_diab_info: string -> (int * int * string) -> unit;
    }
 
 val implem: implem
@@ -75,8 +77,10 @@ val function_end: atom -> positive -> unit
 val add_label: atom -> positive -> int -> unit
 val generate_debug_info: (atom -> string) -> string -> debug_entries option
 val atom_parameter: ident -> ident -> atom -> unit
-val add_compilation_section_start: string -> (int * int * int * string) -> unit
+val add_compilation_section_start: string -> int -> unit
+val add_compilation_section_end: string -> int -> unit
 val compute_file_enum: (string -> int) -> (string-> int) -> (unit -> unit) -> unit
 val exists_section: string -> bool
 val remove_unused: ident -> unit
 val variable_printed: string -> unit
+val add_diab_info: string -> (int * int * string) -> unit
diff --git a/debug/DebugInformation.ml b/debug/DebugInformation.ml
index 40cc4060..12ae835b 100644
--- a/debug/DebugInformation.ml
+++ b/debug/DebugInformation.ml
@@ -643,27 +643,32 @@ let function_end atom loc =
   List.iter (fun id-> end_live_range (atom,id) loc) !open_vars;
   open_vars:= []
 
-let compilation_section_start: (string,int * int * int * string) Hashtbl.t = Hashtbl.create 7
+let compilation_section_start: (string,int) Hashtbl.t = Hashtbl.create 7
 let compilation_section_end: (string,int) Hashtbl.t = Hashtbl.create 7
 
+let diab_additional: (string,int * int * string) Hashtbl.t = Hashtbl.create 7
+
 let add_compilation_section_start sec addr =
   Hashtbl.add compilation_section_start sec addr
 
 let add_compilation_section_end sec addr =
   Hashtbl.add compilation_section_end sec addr
 
+let add_diab_info sec addr =
+  Hashtbl.add diab_additional sec addr
+
 let exists_section sec =
   Hashtbl.mem compilation_section_start sec
 
 let filenum: (string * string,int) Hashtbl.t = Hashtbl.create 7
 
 let compute_file_enum end_label entry_label line_end =
-  Hashtbl.iter (fun sec (_,_,_,secname) ->
+  Hashtbl.iter (fun sec (_,_,secname) ->
     Hashtbl.add compilation_section_end sec (end_label secname);
     StringSet.iter (fun file ->
       let lbl = entry_label file in
       Hashtbl.add filenum (sec,file) lbl) !all_files;
-    line_end ()) compilation_section_start
+    line_end ()) diab_additional
 
 let printed_vars: StringSet.t ref = ref StringSet.empty
 
@@ -686,5 +691,6 @@ let init name =
   Hashtbl.reset compilation_section_start;
   Hashtbl.reset compilation_section_end;
   Hashtbl.reset filenum;
+  Hashtbl.reset diab_additional;
   all_files := StringSet.empty;
   printed_vars := StringSet.empty;
diff --git a/debug/DebugInit.ml b/debug/DebugInit.ml
index bf2c23c0..5aac6566 100644
--- a/debug/DebugInit.ml
+++ b/debug/DebugInit.ml
@@ -47,10 +47,12 @@ let init_debug () =
   implem.add_label <- DebugInformation.add_label;
   implem.atom_parameter <- DebugInformation.atom_parameter;
   implem.add_compilation_section_start <- DebugInformation.add_compilation_section_start;
+  implem.add_compilation_section_end <- DebugInformation.add_compilation_section_end;
   implem.compute_file_enum <- DebugInformation.compute_file_enum;
   implem.exists_section <- DebugInformation.exists_section;
   implem.remove_unused <- DebugInformation.remove_unused;
-  implem.variable_printed <- DebugInformation.variable_printed
+  implem.variable_printed <- DebugInformation.variable_printed;
+  implem.add_diab_info <- DebugInformation.add_diab_info
 
 let init_none () =
   implem.init <- (fun _ -> ());
@@ -77,9 +79,11 @@ let init_none () =
   implem.add_label <- (fun _ _ _ -> ());
   implem.atom_parameter <- (fun _ _ _ -> ());
   implem.add_compilation_section_start <- (fun _ _ -> ());
+  implem.add_compilation_section_end <- (fun _ _ -> ());
   implem.exists_section <- (fun _ -> true);
   implem.remove_unused <- (fun _ -> ());
-  implem.variable_printed <- (fun _ -> ())
+  implem.variable_printed <- (fun _ -> ());
+  implem.add_diab_info <- (fun _ _ -> ())
 
 let init () =
   if !Clflags.option_g && Configuration.advanced_debug then
diff --git a/debug/DwarfPrinter.ml b/debug/DwarfPrinter.ml
index 79d21960..980c49db 100644
--- a/debug/DwarfPrinter.ml
+++ b/debug/DwarfPrinter.ml
@@ -246,9 +246,7 @@ module DwarfPrinter(Target: DWARF_TARGET):
       let abbrevs = Hashtbl.fold (fun s i acc -> (s,i)::acc) abbrev_mapping [] in
       let abbrevs = List.sort (fun (_,a) (_,b) -> Pervasives.compare a b) abbrevs in
       section oc Section_debug_abbrev;
-      let lbl = new_label () in
-      abbrev_start_addr := lbl;
-      print_label oc lbl;
+      print_label oc !abbrev_start_addr;
       List.iter (fun (s,id) ->
         fprintf oc "	.uleb128	%d\n" id;
         output_string oc s;
@@ -258,6 +256,8 @@ module DwarfPrinter(Target: DWARF_TARGET):
 
     let debug_start_addr = ref (-1)
 
+    let debug_stmt_list = ref (-1)
+
     let entry_labels: (int,int) Hashtbl.t = Hashtbl.create 7
 
     (* Translate the ids to address labels *)
@@ -314,10 +314,13 @@ module DwarfPrinter(Target: DWARF_TARGET):
       fprintf oc "	.4byte		%a\n" label ref
 
     let print_file_loc oc = function
-      | Some (file,col) ->
+      | Some (Diab_file_loc (file,col)) ->
           fprintf oc "	.4byte		%a\n" label file;
           print_uleb128 oc col
-      | None -> ()
+      | Some (Gnu_file_loc (file,col)) ->
+          fprintf oc "	.4byte		%l\n" file;
+          print_uleb128 oc col 
+     | None -> ()
 
     let print_loc_expr oc = function
       | DW_OP_bregx (a,b) ->
@@ -417,7 +420,7 @@ module DwarfPrinter(Target: DWARF_TARGET):
       print_uleb128 oc 1;
       print_string oc tag.compile_unit_name;
       print_string oc prod_name;
-      print_addr oc tag.compile_unit_stmt_list
+      print_addr oc !debug_stmt_list
 
     let print_const_type oc ct =
       print_ref oc ct.const_type
@@ -558,14 +561,14 @@ module DwarfPrinter(Target: DWARF_TARGET):
 
     (* Print the debug abbrev section *)
     let print_debug_abbrev oc entries =
-      List.iter (fun (_,_,e,_) -> compute_abbrev e) entries;
+      List.iter (fun (_,_,_,e,_) -> compute_abbrev e) entries;
       print_abbrev oc
 
     (* Print the debug info section *)
-    let print_debug_info oc sec start entry  =
+    let print_debug_info oc start line_start entry  =
       Hashtbl.reset entry_labels;
       debug_start_addr:= start;
-      section oc (Section_debug_info sec);      
+      debug_stmt_list:= line_start;
       print_label oc start;
       let debug_length_start = new_label ()  (* Address used for length calculation *)
       and debug_end = new_label () in
@@ -591,14 +594,32 @@ module DwarfPrinter(Target: DWARF_TARGET):
       List.iter (print_location_entry oc c_low) l
 
     let print_diab_entries oc entries =
+      let abbrev_start = new_label () in
+      abbrev_start_addr := abbrev_start;  
       print_debug_abbrev oc entries;
-      List.iter (fun (s,d,e,_) -> print_debug_info oc s d e) entries;
+      List.iter (fun (s,d,l,e,_) ->
+        section oc (Section_debug_info s);      
+        print_debug_info oc d l e) entries;
       section oc Section_debug_loc;
-      List.iter (fun (_,_,_,l) -> print_location_list oc l) entries
+      List.iter (fun (_,_,_,_,l) -> print_location_list oc l) entries
+
+    let print_gnu_entries oc cp loc =
+      compute_abbrev cp;
+      let line_start = new_label ()
+      and start = new_label ()
+      and  abbrev_start = new_label () in
+      abbrev_start_addr := abbrev_start;
+      section oc (Section_debug_info "");
+      print_debug_info oc start line_start cp;
+      print_abbrev oc;
+      section oc Section_debug_loc;
+      print_location_list oc loc;
+      fprintf oc "	.section	.debug_line,\"\",@progbits\n";
+      print_label oc line_start
 
     (* Print the debug info and abbrev section *)
     let print_debug oc = function
       | Diab entries -> print_diab_entries oc entries
-      | _ -> ()
+      | Gnu (cp,loc) -> print_gnu_entries oc cp loc
 
   end
diff --git a/debug/DwarfTypes.mli b/debug/DwarfTypes.mli
index 96c763b3..ed75b3d7 100644
--- a/debug/DwarfTypes.mli
+++ b/debug/DwarfTypes.mli
@@ -60,8 +60,10 @@ type bound_value =
 
 (* Types representing the attribute information per tag value *)
 
-type file_loc = int * constant
-
+type file_loc = 
+  | Diab_file_loc of int * constant
+  | Gnu_file_loc of int * constant
+     
 type dw_tag_array_type =
     {
      array_type_file_loc: file_loc option;
@@ -80,7 +82,6 @@ type dw_tag_compile_unit =
      compile_unit_name:      string;
      compile_unit_low_pc:    int;
      compile_unit_high_pc:   int;
-     compile_unit_stmt_list: int;
    }
 
 type dw_tag_const_type =
@@ -248,7 +249,7 @@ type location_entry =
    }
 type dw_locations = int * location_entry list
 
-type diab_entries =  (string * int * dw_entry * dw_locations) list
+type diab_entries =  (string * int * int * dw_entry * dw_locations) list
 
 type gnu_entries = dw_entry * dw_locations
 
diff --git a/debug/Dwarfgen.ml b/debug/Dwarfgen.ml
index 0a18b4e3..d2cdecbf 100644
--- a/debug/Dwarfgen.ml
+++ b/debug/Dwarfgen.ml
@@ -440,7 +440,7 @@ let definition_to_entry file (acc,bcc) id t =
 module StringMap = Map.Make(String)
 
 let diab_file_loc sec (f,l)  =
-  Hashtbl.find filenum (sec,f),l
+  Diab_file_loc (Hashtbl.find filenum (sec,f),l)
 
 let gen_diab_debug_info sec_name var_section : debug_entries =
   let defs = Hashtbl.fold (fun id t acc ->
@@ -453,18 +453,34 @@ let gen_diab_debug_info sec_name var_section : debug_entries =
     let defs,(ty,locs) = List.fold_left (fun (acc,bcc) (id,t) -> 
       let t,bcc = definition_to_entry (diab_file_loc s) bcc id t in
       t::acc,bcc) ([],(IntSet.empty,[])) defs in
-    let line_start,low_pc,debug_start,_ = Hashtbl.find compilation_section_start s
+    let low_pc = Hashtbl.find compilation_section_start s
+    and line_start,debug_start,_ = Hashtbl.find diab_additional s
     and high_pc = Hashtbl.find compilation_section_end s in
     let cp = {
       compile_unit_name = !file_name;
       compile_unit_low_pc = low_pc;
-      compile_unit_high_pc = high_pc;
-      compile_unit_stmt_list = line_start; 
+      compile_unit_high_pc = high_pc; 
     } in
     let cp = new_entry (next_id ()) (DW_TAG_compile_unit cp) in
     let cp = add_children cp ((gen_types (diab_file_loc s) ty) @ defs) in
-    (s,debug_start,cp,(low_pc,locs))::acc) defs [] in
+    (s,debug_start,line_start,cp,(low_pc,locs))::acc) defs [] in
   Diab entries
 
+let gnu_file_loc (f,l) =
+    Gnu_file_loc ((fst (Hashtbl.find Fileinfo.filename_info f),l))
+
 let gen_gnu_debug_info sec_name var_section : debug_entries =
-  Diab []
+  let low_pc = Hashtbl.find compilation_section_start ".text"
+  and high_pc = Hashtbl.find compilation_section_end ".text" in
+  let defs,(ty,locs) = Hashtbl.fold (fun  id t (acc,bcc) -> 
+    let t,bcc = definition_to_entry gnu_file_loc bcc id t in
+    t::acc,bcc) definitions ([],(IntSet.empty,[])) in
+  let types = gen_types gnu_file_loc ty in
+  let cp = {
+    compile_unit_name = !file_name;
+    compile_unit_low_pc = low_pc;
+    compile_unit_high_pc = high_pc; 
+  } in
+  let cp = new_entry (next_id ()) (DW_TAG_compile_unit cp) in
+  let cp = add_children cp (types@defs) in
+  Gnu (cp,(low_pc,locs))