CHB:ARM: add more identification to xdata values

Author: sipma

CodeHawk/CH/chutil/cHLogger.ml

@@ -237,5 +237,5 @@ let log_error_result
   let tag = if tag = "" then tag else tag ^ ":" in
   let msg = if msg = "" then msg else msg ^ ": " in
   ch_error_log#add
-    (tag ^ filename ^ (string_of_int linenumber))
+    (tag ^ filename ^ ":" ^ (string_of_int linenumber))
     (LBLOCK [STR msg; STR (String.concat "; " error)])

CodeHawk/CHB/bchlib/bCHFloc.ml

@@ -1237,8 +1237,12 @@ object (self)
           (fun offset -> self#f#env#mk_gloc_variable gloc offset)
           (gloc#address_memory_offset ~tgtsize:size ~tgtbtype:btype addrvalue))
     | _ ->
-       Error [__FILE__ ^ ":" ^ (string_of_int __LINE__) ^ ": "
-              ^ "Unable to create global variable for " ^ (x2s addrvalue)]
+       let (memref_r, memoff_r) = self#decompose_memaddr addrvalue in
+       TR.tmap2
+         ~msg1:(__FILE__ ^ ":" ^ (string_of_int __LINE__))
+         (fun memref memoff ->
+           self#f#env#mk_offset_memory_variable memref memoff)
+         memref_r memoff_r
 
   method decompose_memaddr (x: xpr_t):
            (memory_reference_int traceresult * memory_offset_t traceresult) =