diff options
| author |  varobert <varobert@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-07-12 12:06:20 +0000 |
|---|---|---|
| committer | varobert <varobert@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2012-07-12 12:06:20 +0000 |
| commit | e22118f5fe37a5129bf874fd7f49007d8b35b0f0 (patch) | |
| tree | e5ffd3e1b6d23f55b4f71e6864c5fd553a75d944 /checklink | |
| parent | c7739571407c3d99f1de390c518a8726889f4b70 (diff) | |
checklink: minor fixes
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1971 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'checklink')
| -rw-r--r-- | checklink/Check.ml | 14 | ||||
| -rw-r--r-- | checklink/Validator.ml | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/checklink/Check.ml b/checklink/Check.ml index 8df09c5..c9fb67f 100644 --- a/checklink/Check.ml +++ b/checklink/Check.ml @@ -796,7 +796,7 @@ let check_sda ident ofs r addr ffw: f_framework or_err = let expected_addr = Safe32.(sym.st_value + ofs - addr) in try let r_addr = from_inferrable (IntMap.find r ffw.sf.ef.sda_map) in - if Safe32.(r_addr = expected_addr) + if r_addr = expected_addr then OK(ffw) else ERR( Printf.sprintf @@ -3197,9 +3197,10 @@ let warn_sda_mapping efw = | Provided(vaddr, conflicts) -> efw >>> add_log (ERROR( - Printf.sprintf "Conflicting SDA mappings for register r%u: -Specified: 0x%lX -Expected: %s" + Printf.sprintf " + Conflicting SDA mappings for register r%u: + Specified: 0x%lX + Expected: %s" r vaddr (string_of_list (Printf.sprintf "0x%lX") ", " conflicts) )) | Inferred(vaddr, []) -> @@ -3211,8 +3212,9 @@ Expected: %s" | Inferred(vaddr, conflicts) -> efw >>> add_log (ERROR( - Printf.sprintf "Conflicting SDA mappings for register r%u: -%s" + Printf.sprintf " + Conflicting SDA mappings for register r%u: + %s" r (string_of_list (Printf.sprintf "0x%lX") ", " (vaddr :: conflicts)) )) ) diff --git a/checklink/Validator.ml b/checklink/Validator.ml index 4baa5d6..baf06fc 100644 --- a/checklink/Validator.ml +++ b/checklink/Validator.ml @@ -33,7 +33,7 @@ let options = [ "-exe", Arg.String set_elf_file, "<filename> Specify the ELF executable file to analyze"; "-conf", Arg.String set_conf_file, - "<filename> Specify a configuration file (see README)"; + "<filename> Specify a configuration file"; (* Parsing behavior *) "-relaxed", Arg.Set ELF_parsers.relaxed, "Allows the following behaviors in the ELF parser: |