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

Merge branch 'master' into next #356

Merged
merged 37 commits into from
Mar 26, 2022
Merged

Merge branch 'master' into next #356

merged 37 commits into from
Mar 26, 2022

Conversation

josephlr
Copy link
Contributor

This is mostly just an additive change, based on the existing changes to master.

The only weird change is in src/instructions/tables.rs where we change the asm! flags. This was caused by a merge error in #338.

I think we only have a few more breaking changes to implement before we should release 0.15

All the other existing issues and PRs seem additive (except maybe #195).

phil-opp and others added 30 commits February 3, 2022 13:53
An overflow should not be possible since `VirtAddr` ise guarenteed to be a canoncial address, but it's better to be safe.
This ensures that we never return a non-canonical address from these methods, even if there is a bug in the address calculation. This is important because the `VirtAddr` type guarantees that all addresses are canoncial.
…le address

Not just the invalid higher bits. We made the internal fields public in #340, but fortunately we didn't release this change yet, so this fix is still non-breaking.
Fix: `VirtAddrNotValid` and `PhysAddrNotValid` should contain the whole address
implement `core::iter::Step` for `VirtAddr` and `Page`
Fixed overflow bug in PageRangeInclusive
Add support for IA32_U_CET and IA32_S_CET, which are used for Control flow
Execution Technology (CET) configuration.

Signed-off-by: Jarkko Sakkinen <jarkko@profian.com>
Both `const_fn_fn_ptr_basics` and `const_fn_trait_bound` were stabilized
in Rust relese 1.61. We can't immediately remove the `const_fn!` quite
yet. 1.61 is not yet on stable, and even it were, removing them would
increase our MSRV to 1.61 (which we may or may not want to do in a patch
release).

See also: #262 (comment)

Signed-off-by: Joe Richey <joerichey@google.com>
const_fn: Remove stabilized features
Signed-off-by: Joe Richey <joerichey@google.com>
Signed-off-by: Joe Richey <joerichey@google.com>
Signed-off-by: Joe Richey <joerichey@google.com>
josephlr and others added 6 commits March 24, 2022 02:50
Copy link
Member

@Freax13 Freax13 left a comment

Choose a reason for hiding this comment

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

Other than the reverted change in tables.rs, this looks good to me!

src/instructions/tables.rs Outdated Show resolved Hide resolved
Signed-off-by: Joe Richey <joerichey@google.com>
Copy link
Member

@Freax13 Freax13 left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

Copy link
Member

@phil-opp phil-opp left a comment

Choose a reason for hiding this comment

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

I only had time for a quick look, but I did not see any problems. Thanks!

@josephlr josephlr merged commit 89662dc into next Mar 26, 2022
@josephlr josephlr deleted the new_next branch March 26, 2022 20:58
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.

5 participants