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.

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

Adapted islaris to the latest isla and to the (currently under review) latest isla-lang #25

Merged
merged 13 commits into from
Dec 5, 2023

Conversation

ric-almeida
Copy link
Collaborator

To be reviewed in combination with this PR on isla-lang: rems-project/isla-lang#10

Copy link
Collaborator

@Mjiig Mjiig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine to me (and given that it builds probably could have been committed without review).

@@ -22,7 +22,7 @@ jobs:

env:
OCAML: "ocaml-variants.4.14.0+options ocaml-option-flambda"
OPAM_PINS: "coq version 8.17.0 isla-lang git git+https://git@github.com/rems-project/isla-lang.git#4ee3daa3a9f04b2d6a55dd94026ff5f9d79db5fc"
OPAM_PINS: "coq version 8.17.0 isla-lang git git+https://github.com/ric-almeida/isla-lang.git"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is just pinning to same comment as the linked PR for isla-lang? We should make sure to change this back when that's merged.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's linking to the same commit. I'll update it once it's merged.

| Ast.AbstractPrimop(r,v,args,a) ->
pp "AbstractPrimop %a %a %a %a" pp_sail_name r pp_valu v pp_arg_list args pp_lrng a
| Call (_, _) -> () (* TODO: fill in here? *)
| Return (_, _) -> () (* TODO: fill in here? *)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably we should output the Coq constructors for these and filter them somewhere else if we don't want them, but it's not very important.

@@ -84,7 +84,7 @@ let event_filter : Arch.t -> int -> event -> bool = fun arch i e ->
| Smt(Assert(_), _) -> i = 0
| Cycle(_)
| MarkReg(_, _, _)
| Smt(DefineEnum(_), _) -> false
| Smt(DefineEnum(_,_,_), _) -> false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should be retaining this now that it contains a little useful information? (With nop operational semantics, presumably)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. We're not using this now, but I've set this to true now in case we will use it in the future.

theories/opsem.v Show resolved Hide resolved
@ric-almeida
Copy link
Collaborator Author

ric-almeida commented Dec 4, 2023

Seems fine to me (and given that it builds probably could have been committed without review).

But in general I open the PRs after checking that they're building. Thanks for reviewing.

@ric-almeida ric-almeida merged commit 1e32bf4 into rems-project:main Dec 5, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants