CHB: moving global variable handling to GlobalMemoryMap

Author: sipma

CodeHawk/CHB/bchcil/bCHParseCilFile.ml

@@ -32,36 +32,22 @@ open Frontc
 (* chlib *)
 open CHPretty
 
-(* chutil *)
-open CHLogger
-
 (* bchlib *)
 open BCHBCFiles
 open BCHBCTypes
-open BCHBCTypePretty
 open BCHBCTypeUtil
 open BCHCilToCBasic
-open BCHConstantDefinitions
 
 
 let update_symbolic_address_types () =
-  let globalvarnames = get_untyped_symbolic_address_names () in
-  begin
-    List.iter (fun name ->
-        if bcfiles#has_varinfo name then
-          let vinfo = bcfiles#get_varinfo name in
-          begin
-            update_symbolic_address_btype name vinfo.bvtype;
-            chlog#add
-              "symbolic address: update with vinfo"
-              (LBLOCK [STR name; STR ": "; STR (btype_to_string vinfo.bvtype)])
-          end
-        else
-          chlog#add "symbolic address: no update" (STR name)) globalvarnames;
-    chlog#add
-      "symbolic address updates"
-      (LBLOCK [STR "Names: "; STR (String.concat ", " globalvarnames)])
-  end
+  let gfunnames = bcfiles#get_gfun_names in
+  let varinfos = bcfiles#get_varinfos in
+  List.iter
+    (fun vinfo ->
+      if List.mem vinfo.bvname gfunnames then
+        ()
+      else
+        BCHGlobalMemoryMap.update_global_location_type vinfo) varinfos
 
 
 let parse_cil_file ?(computeCFG=true) ?(removeUnused=true) (filename: string) =

CodeHawk/CHB/bchcmdline/bCHXBinaryAnalyzer.ml

@@ -537,7 +537,9 @@ let main () =
       let t = ref (Unix.gettimeofday ()) in
       let _ = load_elf_files () in
       let _ = pr_timing [STR "elf files loaded"] in
-      let _ = List.iter parse_cil_file system_info#ifiles in
+      let _ =
+        List.iter (fun f ->
+            parse_cil_file ~removeUnused:false f) system_info#ifiles in
       let _ =
         if (List.length system_info#ifiles) > 0 then
           pr_timing [STR "c header files loaded"] in

CodeHawk/CHB/bchlib/Makefile

@@ -60,6 +60,7 @@ MLIS := \
 	bCHFunctionData \
 	bCHSystemData \
 	bCHConstantDefinitions \
+	bCHGlobalMemoryMap \
 	bCHStructTables \
 	bCHCallbackTables \
 	bCHImmediate \
@@ -153,6 +154,7 @@ SOURCES := \
 	bCHCodegraph \
 	bCHSystemData \
 	bCHConstantDefinitions \
+	bCHGlobalMemoryMap \
 	bCHStructTables \
 	bCHCallbackTables \
 	bCHImmediate \

CodeHawk/CHB/bchlib/bCHBCFiles.ml

@@ -70,6 +70,7 @@ object (self)
 
   method add_bcfile (f: bcfile_t) =
     let i = bcd#index_location in
+    begin
     List.iter (fun g ->
         match g with
         | GType (tinfo, loc) ->
@@ -92,8 +93,10 @@ object (self)
         | GEnumTagDecl (einfo, loc) ->
            H.replace genumtagdecls einfo.bename (bcd#index_enuminfo einfo, i loc)
         | GVarDecl (vinfo, loc) ->
+           let _ = chlog#add "bcfiles:add gvardecl" (STR vinfo.bvname) in
            H.replace gvardecls vinfo.bvname (bcd#index_varinfo vinfo, i loc)
         | GVar (vinfo, iinfo, loc) ->
+           let _ = chlog#add "bcfiles:add gvar" (STR vinfo.bvname) in
            H.replace gvars
              vinfo.bvname
              (bcd#index_varinfo vinfo,
@@ -102,8 +105,20 @@ object (self)
                | _ -> (-1)),
               i loc)
         | GFun (fundec, loc) ->
+           let _ = chlog#add "bcfiles:add gfun" (STR fundec.bsvar.bvname) in
              H.replace gfuns fundec.bsvar.bvname (fundec, bcd#index_location loc);
-        | _ -> ()) f.bglobals
+        | _ -> ()) f.bglobals;
+    chlog#add
+      "bcfiles:add_bcfile"
+      (LBLOCK [
+           STR "gvars: ";
+           INT (H.length gvars);
+           STR "; gvardecls: ";
+           INT (H.length gvardecls);
+           STR "; gfuns: ";
+           INT (H.length gfuns)
+         ])
+    end
 
   method update_global (g: bglobal_t) =
     let i = bcd#index_location in
@@ -370,6 +385,16 @@ object (self)
         (BCH_failure
            (LBLOCK [STR "No varinfo found with name "; STR name]))
 
+  method get_varinfos =
+    let result = ref [] in
+    begin
+      H.iter (fun _ (ix, _, _) ->
+          result := (bcd#get_varinfo ix) :: !result) gvars;
+      H.iter (fun _ (ix, _) ->
+          result := (bcd#get_varinfo ix) :: !result) gvardecls;
+      !result
+    end
+
   method list_varinfos =
     let result = ref [] in
     let v2s v = v.bvname ^ ": " ^ (btype_to_string v.bvtype) in

CodeHawk/CHB/bchlib/bCHBCTypes.mli

@@ -594,6 +594,9 @@ class type bcfiles_int =
         @raise BCH_failure if no varinfo exists with name [name].*)
     method get_varinfo: ?prefix:bool -> string -> bvarinfo_t
 
+    (** Returns all global varinfos (including functions) *)
+    method get_varinfos: bvarinfo_t list
+
     (** [has_varinfo name] returns true if there exists either a defined or
         declared variable with name [name]. Note that this includes function
         names.*)

CodeHawk/CHB/bchlib/bCHFunctionData.ml

@@ -261,6 +261,10 @@ object (self)
   method get_library_stubs: doubleword_int list =
     self#retrieve_addresses (fun f -> f#is_library_stub)
 
+  method is_in_function_stub ?(size=3) (va: doubleword_int): bool =
+    let libstubs = self#get_library_stubs in
+    List.exists (fun s -> s#le va && va#lt(s#add_int (size * 4))) libstubs
+
   method is_function_entry_point (fa:doubleword_int) = H.mem table fa#index
 
   method has_function_name (fa:doubleword_int) =