Skip to content

prunes Primus leave events on abnormal evaluation #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2019
Merged

prunes Primus leave events on abnormal evaluation #1003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions lib/bap_primus/bap_primus_interpreter.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,21 +539,16 @@ module Make (Machine : Machine) = struct
!!pos_left curr


let term ?(cleanup=Machine.return ()) return cls f t =
let term return cls f t =
Machine.Local.get state >>= fun s ->
match Pos.next s.curr cls t with
| Error err -> Machine.raise err
| Ok curr ->
update_pc t >>= fun () ->
Machine.Local.update state (fun s -> {s with curr}) >>= fun () ->
enter cls curr t >>= fun () ->
Machine.catch (f t)
(fun exn ->
leave cls curr t >>= fun () ->
cleanup >>= fun () ->
Machine.raise exn) >>= fun r ->
f t >>= fun r ->
leave cls curr t >>= fun () ->
cleanup >>= fun () ->
return r

let normal = Machine.return
Expand Down