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 latest changes from master into next and migrate code #338

Merged
merged 76 commits into from
Feb 3, 2022

Conversation

phil-opp
Copy link
Member

@phil-opp phil-opp commented Feb 3, 2022

The commits starting from Feb 3 do some code adjustments to make the changes from master and next work together. Everything before was a git merge with a bit of manual conflict resolution. I hope I resolved everything in the right way. Unfortunately, the GitHub UI doesn't seem to handle this well...

I think a good way to check the correctness of this PR is to compare the next-with-master branch against master: rust-osdev:e730686...rust-osdev:b820a2e . The list of changes should only contain changes made in the next branch, plus the fixups from this PR (commits from Feb 3).

phil-opp and others added 30 commits August 18, 2021 02:07
* ci: Use choco to install qemu
* Version 6.0.0 corresponds to release on 2021.5.5

Co-authored-by: Joe Richey <joerichey@google.com>
The documentation can also be built locally using `cargo doc --open`. Doc links should be working there as well.
Signed-off-by: Joe Richey <joerichey@google.com>
Signed-off-by: Joe Richey <joerichey@google.com>
Use `#[cfg(doc)]` instead of docs.rs-specific cfg flag
This method never panics.
It looks like there is no way to create an instance of these types.

Fixes: #295
feat(mapper): expose `MapperFlush(All)?::new`
…references-in-gdt-load-docs

docs: Update segment register references in GDT::load* method to non-deprecated methods
We also fix the formating slightly for consistancy with the rest of the
codebase.

Signed-off-by: Joe Richey <joerichey@google.com>
docs(idt): remove a panic note
Signed-off-by: Joe Richey <joerichey@google.com>
Signed-off-by: Joe Richey <joerichey@google.com>
The segment types themselves do not require the `instructions` feature, so it makes sense to move them to the top-level `registers` module. The `instructions::segmentation` module still re-exports all the types, so this change should not break any code.

Fixes #307
Move segment types into a new `registers::segmentation` module
Signed-off-by: Joe Richey <joerichey@google.com>
Signed-off-by: Joe Richey <joerichey@google.com>
Freax13 and others added 23 commits December 2, 2021 21:54
remove `const_assert!` in favor of std's `assert!`
`asm!` is excluded from Prelude.
We should not make this test part of the manditory test suite because the bootloader crate depends on x86_64 itself. Thus, some breaking changes require a two-phase update.
fix: build error on the latest nightly
Based on GitHub's autogenerated release notes
enable `unsafe_block_in_unsafe_fn` lint
Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
Add MxCsr register derived from MxCsr type in enarx/xsave.

Provide two unit tests:
- mxcsr_default(): Check that the constant matches the value read from
  the CPU when the process has not yet written anything else to it.
- mxcsr_write(): Check that the write operation does not corrupt values.

Co-authored-by: Tom Dohrmann <Erbse.13@gmx.de>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
There were multiple changes to use proper field types.
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!

@phil-opp
Copy link
Member Author

phil-opp commented Feb 3, 2022

Thanks a lot for the quick review!

@phil-opp phil-opp merged commit 64a7ca7 into next Feb 3, 2022
@phil-opp phil-opp deleted the next-with-master branch February 3, 2022 18:57
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.

9 participants