Skip to content
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

Jump to bottom

limits the continuation at the call forkpoint in the promiscuous mode #971

Merged
merged 2 commits into from
Aug 13, 2019
Merged

limits the continuation at the call forkpoint in the promiscuous mode #971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6519aea
fixes taken pathes in the primus promiscuous mode
gitoleg Aug 13, 2019
29cd15b
Merge remote-tracking branch 'upstream/master' into fix-primus-promis…
gitoleg Aug 13, 2019
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
4 changes: 3 additions & 1 deletion plugins/primus_promiscuous/primus_promiscuous_main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ module Main(Machine : Primus.Machine.S) = struct
Machine.Global.get state >>= fun {forkpoints} ->
if Set.mem forkpoints dst
then Eval.halt >>= never_returns
else Linker.exec (`tid dst)
else
Linker.exec (`tid dst) >>= fun () ->
Eval.halt >>= never_returns
| _ -> Machine.return ()

let fork_on_calls blk jmp = match Jmp.kind jmp with
Expand Down