Skip to content

allocator: fix argument ordering bug. #23

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

Open
dancrossnyc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

allocator: fix argument ordering bug. #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 30 additions & 30 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2026-06-16"
channel = "nightly-2026-07-20"
components = [ "rustfmt", "rust-src", "llvm-tools", "clippy", "miri", "rust-analyzer" ]
8 changes: 4 additions & 4 deletions src/allocator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ impl BumpAlloc {
/// and the second is the requested block itself.
pub(crate) fn try_alloc(
&self,
align: usize,
size: usize,
align: usize,
) -> Option<(Block, Block)> {
let base = self.arena.as_ptr();
let mut first = ptr::null_mut();
let mut adjust = 0;
self.cursor
.fetch_update(Ordering::Relaxed, Ordering::Relaxed, |current| {
.try_update(Ordering::Relaxed, Ordering::Relaxed, |current| {
first = base.wrapping_add(current);
adjust = first.align_offset(align);
let offset =
Expand All @@ -118,10 +118,10 @@ impl BumpAlloc {
#[allow(clippy::mut_from_ref)]
pub(crate) fn alloc_bytes(
&self,
align: usize,
size: usize,
align: usize,
) -> Option<&mut [u8]> {
let (_, block) = self.try_alloc(align, size)?;
let (_, block) = self.try_alloc(size, align)?;
let ptr = block.as_ptr();
unsafe {
ptr::write_bytes(ptr, 0, size);
Expand Down
2 changes: 1 addition & 1 deletion src/mmu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,7 @@ mod arena {
assert_eq!(align, PAGE_SIZE);
assert_eq!(size, PAGE_SIZE);
let page_allocator = unsafe { &*PAGE_ALLOCATOR.get() };
let a = page_allocator.alloc_bytes(align, size);
let a = page_allocator.alloc_bytes(size, align);
let p = a.ok_or(AllocError)?;
Ok(p.into())
}
Expand Down
2 changes: 1 addition & 1 deletion x86_64-oxide-none-elf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"frame-pointer": "always",
"disable-redzone": true,
"features": "-avx,-avx2,-avx512bf16,-f16c,-fxsr,-mmx,-sse,-sse2,-sse3,-sse4.1,-sse4.2,-sse4a,-ssse3,-x87,+soft-float",
"rustc-abi": "x86-softfloat",
"rustc-abi": "softfloat",
"linker-flavor": "ld",
"linker": "ld.lld",
"no-default-libraries": true,
Expand Down
Loading