diff options
| author | Thomas Bauereiss | 2018-05-11 12:04:10 +0100 |
|---|---|---|
| committer | Thomas Bauereiss | 2018-05-11 12:04:10 +0100 |
| commit | ff18bac6654a73cedf32a45ee406fe3e74ae3efd (patch) | |
| tree | ed940ea575c93d741c84cd24cd3e029d0a590b81 /lib | |
| parent | 823fe1d82e753add2d54ba010689a81af027ba6d (diff) | |
| parent | db3b6d21c18f4ac516c2554db6890274d2b8292c (diff) | |
Merge branch 'sail2' into cheri-mono
In order to use up-to-date sequential CHERI model for test suite
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/arith.sail | 2 | ||||
| -rw-r--r-- | lib/elf.sail | 2 | ||||
| -rw-r--r-- | lib/vector_dec.sail | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/arith.sail b/lib/arith.sail index fa091772..54ecdbbc 100644 --- a/lib/arith.sail +++ b/lib/arith.sail @@ -5,7 +5,7 @@ $include <flow.sail> // ***** Addition ***** -val add_atom = {ocaml: "add_int", lem: "integerAdd"} : forall 'n 'm. +val add_atom = {ocaml: "add_int", lem: "integerAdd", c: "add_int"} : forall 'n 'm. (atom('n), atom('m)) -> atom('n + 'm) val add_int = {ocaml: "add_int", lem: "integerAdd", c: "add_int"} : (int, int) -> int diff --git a/lib/elf.sail b/lib/elf.sail index e953839d..2d799d4d 100644 --- a/lib/elf.sail +++ b/lib/elf.sail @@ -3,11 +3,13 @@ $define _ELF val elf_entry = { ocaml: "Elf_loader.elf_entry", + lem: "elf_entry", c: "elf_entry" } : unit -> int val elf_tohost = { ocaml: "Elf_loader.elf_tohost", + lem: "elf_tohost", c: "elf_tohost" } : unit -> int diff --git a/lib/vector_dec.sail b/lib/vector_dec.sail index 1307bb56..17603e03 100644 --- a/lib/vector_dec.sail +++ b/lib/vector_dec.sail @@ -68,11 +68,13 @@ val vector_update = { val add_bits = { ocaml: "add_vec", + lem: "add_vec", c: "add_bits" } : forall 'n. (bits('n), bits('n)) -> bits('n) val add_bits_int = { ocaml: "add_vec_int", + lem: "add_vec_int", c: "add_bits_int" } : forall 'n. (bits('n), int) -> bits('n) |