Skip to content

chore: merge master into next - #598

Merged
Freax13 merged 47 commits into
rust-osdev:nextfrom
Wasabi375:next
Jul 18, 2026
Merged

chore: merge master into next#598
Freax13 merged 47 commits into
rust-osdev:nextfrom
Wasabi375:next

Conversation

@Wasabi375

Copy link
Copy Markdown
Contributor

This merges master into next and handles the resulting conflicts.

The main conflict resulted from #574 specifically fc03c8f (refactor mapped_page_table.rs into directory). Luckily there was only 1 change I could find to mapped_page_table.rs which made it fairly easy to combine with the changes to the new directory in next.

The other change was to Changelog.md where I accepted both current and incoming changes.

mkroening and others added 30 commits January 14, 2026 09:54
fix(mapper): inline internal `map_to_*` functions
…ture

don't enable abi_x86_interrupt if not needed
Insert a NOP instruction after STI to make sure the interrupt shadow
doesn't extend past the enable function.

From the AMD64 APM, Volume 3:
> If STI sets the IF flag and IF was initially clear, then interrupts
> are not enabled until after the instruction following STI. Thus, if
> IF is 0, this code will not allow an INTR to happen:
>
> STI
> CLI
>
> In the following sequence, INTR will be allowed to happen only after the NOP.
>
> STI
> NOP
> CLI
PageRange::next and PageRangeInclusive::next should panic when the user
tries to jump the address range gap.
... except when jumping the address space gap.
The new implementations match <PageRangeInclusive.
Given that I messed up the implementation in the past, let's not assume
that the code is correct and test it instead.
Notably, kani also proves that there are no panics (which used to a
problem).
…d-iter

implement DoubleEndedIterator for ranges + implement more iterator methods
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…ctions/actions/checkout-7

Bump actions/checkout from 6 to 7
Freax13 and others added 17 commits July 10, 2026 19:21
add missing {forward,backward}_overflowing impls
- Added a fn in `PhysFrame` so that we can create a frame easily (instead of converting)
- Use `checked_mul` to ensure that the mul operation won't cause panick
 - Updated docs about `PhysAddrNotValid` to make it much clear

rust-osdev#523
- Slightly reword things
- Add more examples
InvalidPfn is more in line with the existing error names
(VirtAddrNotValid, PhysAddrNotValid).

Also move it down in the file. `PhysFrame` is arguably more important,
so let's make sure it's at the top of the file.
feat: Added the "from_pfn" in PhysFrame

@Freax13 Freax13 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@Freax13
Freax13 merged commit 6754112 into rust-osdev:next Jul 18, 2026
11 of 13 checks 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.

6 participants