diff options
| author | Peter Sewell | 2014-11-23 12:27:39 +0000 |
|---|---|---|
| committer | Peter Sewell | 2014-11-23 12:27:39 +0000 |
| commit | 3de2cba4d5706c741a5f445cb2e33608d1043248 (patch) | |
| tree | c12f9125fba56eb7eaabfc68b5b92643be2e209b /src | |
| parent | 19954c9035ff2e4fc1869efb3c4f7fab35b9672c (diff) | |
resolve little conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/lem_interp/interp_interface.lem | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lem_interp/interp_interface.lem b/src/lem_interp/interp_interface.lem index 7c5b295e..26f5f508 100644 --- a/src/lem_interp/interp_interface.lem +++ b/src/lem_interp/interp_interface.lem @@ -453,10 +453,6 @@ val integer_address_of_int_list : list int -> integer let integer_address_of_int_list (is: list int) = failwith "TODO" (* regarding is as a list of bytes in memory, lowest-address first, convert to an integer *) -val integer_of_byte_list : list byte -> integer -(* TODO *)let integer_of_byte_list (a:list byte):integer = failwith "TODO" -val byte_list_of_integer : int -> integer -> list byte -(* TODO *)let byte_list_of_integer (len:int) (a:integer):list byte = failwith "TODO" let bit_to_bool = function | Bitc_zero -> false |