diff options
Diffstat (limited to 'checklink')
| -rw-r--r-- | checklink/Asm_printers.ml | 2 | ||||
| -rw-r--r-- | checklink/Check.ml | 4 | ||||
| -rw-r--r-- | checklink/Validator.ml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/checklink/Asm_printers.ml b/checklink/Asm_printers.ml index c475d7da..38a420f6 100644 --- a/checklink/Asm_printers.ml +++ b/checklink/Asm_printers.ml @@ -188,7 +188,7 @@ let string_of_instruction = function | Pcmplwi (i0, c1) -> "Pcmplwi(" ^ string_of_ireg i0 ^ ", " ^ string_of_constant c1 ^ ")" | Pcmpw (i0, i1) -> "Pcmpw(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ")" | Pcmpwi (i0, c1) -> "Pcmpwi(" ^ string_of_ireg i0 ^ ", " ^ string_of_constant c1 ^ ")" -| Pcntlz (i0, i1) -> "Pcntlz(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ")" +| Pcntlzw (i0, i1) -> "Pcntlzw(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ")" | Pcreqv (c0, c1, c2) -> "Pcreqv(" ^ string_of_crbit c0 ^ ", " ^ string_of_crbit c1 ^ ", " ^ string_of_crbit c2 ^ ")" | Pcror (c0, c1, c2) -> "Pcror(" ^ string_of_crbit c0 ^ ", " ^ string_of_crbit c1 ^ ", " ^ string_of_crbit c2 ^ ")" | Pcrxor (c0, c1, c2) -> "Pcrxor(" ^ string_of_crbit c0 ^ ", " ^ string_of_crbit c1 ^ ", " ^ string_of_crbit c2 ^ ")" diff --git a/checklink/Check.ml b/checklink/Check.ml index bfd03c97..0e69ab72 100644 --- a/checklink/Check.ml +++ b/checklink/Check.ml @@ -1024,7 +1024,7 @@ let rec compare_code ccode ecode pc: checker = fun fw -> >>= recur_simpl | _ -> error end - | Pcntlz(r1, r2) -> + | Pcntlzw(r1, r2) -> begin match ecode with | CNTLZWx(rS, rA, rc) :: es -> OK(fw) @@ -2573,7 +2573,7 @@ let check_data (pv: (ident * unit globvar) list) (sfw: s_framework) (** Read a .sdump file *) -let sdump_magic_number = "CompCertSDUMP" ^ Configuration.version +let sdump_magic_number = "CompCertSDUMP" ^ Version.version let read_sdump file = let ic = open_in_bin file in diff --git a/checklink/Validator.ml b/checklink/Validator.ml index 6969409a..f9ca0edb 100644 --- a/checklink/Validator.ml +++ b/checklink/Validator.ml @@ -97,7 +97,7 @@ let anonymous arg = set_elf_file arg let usage = - "The CompCert C post-linking validator, version " ^ Configuration.version ^ " + "The CompCert C post-linking validator, version " ^ Version.version ^ " Usage: cchecklink [options] <.sdump files> <ELF executable> In the absence of options, checks are performed and a short result is displayed. Options are:" |