Compare commits

..

No commits in common. "bfe3d8dc92d9b489768ae3c5af1cee2129f55469" and "607743a66f1ff1b470ad2c6a52ce65b9872dc4bf" have entirely different histories.

View file

@ -131,23 +131,24 @@ struct
else let state_ext = env_add state id arg_tag mem_id in else let state_ext = env_add state id arg_tag mem_id in
mem_set state_ext id BotV mem_set state_ext id BotV
(* TODO; FIXME: forbid duplicates, collect lists of all spoils & checks ? *) (* TODO: use state_before ?? or state in some order (both orders ?, mod and then check ?) *)
let st_spoil_by_args (state : state) (arg_tags : tag list) (args : data list) : state = let st_spoil_by_args (state : state) (arg_tags : tag list) (args : data list) : state =
match state with (env, mem, mem_len, _visited) -> match state with (env, mem, mem_len, _visited) ->
let state_before = state in let state_before = state in
let spoil_folder (state : state) (tag : tag) (id : data) : state = let spoil_folder (state : state) (tag : tag) (id : data) : state =
let parent_tag = fst (env_get state id) in let parent_tag = fst (env_get state id) in
if is_write tag > is_write parent_tag then raise @@ Incorrect_const_cast id if is_write tag > is_write parent_tag then raise @@ Incorrect_const_cast id
else let state = if is_read tag then (mem_check state_before id; state) else state (* NOTE: state override *) else let state' = if is_read tag then (mem_check state_before id; state) else state (* NOTE: state override *)
in if not @@ is_write tag then state in if not @@ is_write tag then state'
else match is_out tag with else match is_out tag with
| true -> mem_set state id UnitV | true -> mem_set state' id UnitV
| false -> if is_copy tag then state | false -> if is_copy tag then state'
else mem_set state id BotV else mem_set state' id BotV
in List.fold_left2 spoil_folder state arg_tags args in List.fold_left2 spoil_folder state arg_tags args
let list_drop n xs = List.of_seq @@ Seq.drop n @@ List.to_seq xs let list_drop n xs = List.of_seq @@ Seq.drop n @@ List.to_seq xs
(* TODO: FIXME: require at least one read / write for read / write args ?? *)
let rec eval_stmt (state : state) (prog : fun_decl list) (stmt : stmt) : state = let rec eval_stmt (state : state) (prog : fun_decl list) (stmt : stmt) : state =
match stmt with match stmt with
| Call (f_id, args) -> let (arg_tags, _) as f_decl = List.nth prog f_id in | Call (f_id, args) -> let (arg_tags, _) as f_decl = List.nth prog f_id in
@ -157,8 +158,14 @@ struct
let state_fun = eval_fun new_state_with_visited prog f_decl (List.map (fun arg -> LValue arg) args) in let state_fun = eval_fun new_state_with_visited prog f_decl (List.map (fun arg -> LValue arg) args) in
(* NOTE: now memory in function is not spoiled *) (* NOTE: now memory in function is not spoiled *)
state_fun state_fun
in st_spoil_by_args state_with_visited arg_tags args in
| Read id -> mem_check state id; state (* let state_checked = List.fold_left2 (fun s arg arg_tag -> *)
(* if is_read arg_tag *)
(* then mem_check s arg *)
(* else s) *)
(* state_with_visited args arg_tags in *)
st_spoil_by_args state_with_visited arg_tags args
| Read id -> mem_check state id
| Write id -> if is_write @@ fst @@ env_get state id | Write id -> if is_write @@ fst @@ env_get state id
then mem_set state id UnitV then mem_set state id UnitV
else raise @@ Incorrect_const_cast id else raise @@ Incorrect_const_cast id