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.

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

Jump to bottom

switch to Talc memory allocator #803

Merged
merged 6 commits into from
Aug 8, 2023
Merged

switch to Talc memory allocator #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb1692b
switch to Talc memory allocator
stlankes Aug 7, 2023
2917310
move constants to the allocator
stlankes Aug 8, 2023
5309327
start heap directly after the executable
stlankes Aug 8, 2023
779c03c
fix some unit tests
stlankes Aug 8, 2023
f8c4bb1
ignore virtual memory below the kernel
stlankes Aug 8, 2023
f649417
limit public function to the crate
stlankes Aug 8, 2023
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
137 changes: 56 additions & 81 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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ num = { version = "0.4", default-features = false }
num-traits = { version = "0.2", default-features = false }
num-derive = "0.4"
zerocopy = "0.6"
talc = { version = "2", default-features = false }
talc = { version = "2" }
time = { version = "0.3", default-features = false }
pci_types = { version = "0.5" }

Expand Down
2 changes: 2 additions & 0 deletions src/arch/aarch64/kernel/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pub mod pci;
pub mod processor;
pub mod scheduler;
pub mod serial;
#[cfg(target_os = "none")]
mod start;
pub mod switch;
pub mod systemtime;
Expand Down Expand Up @@ -187,6 +188,7 @@ pub fn output_message_buf(buf: &[u8]) {
}

/// Real Boot Processor initialization as soon as we have put the first Welcome message on the screen.
#[cfg(target_os = "none")]
pub fn boot_processor_init() {
processor::configure();

Expand Down
2 changes: 1 addition & 1 deletion src/arch/aarch64/kernel/start.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ unsafe extern "C" fn pre_init(boot_info: &'static RawBootInfo, cpu_id: u32) -> !
}
}
#[cfg(feature = "smp")]
crate::application_processor_main();
crate::application_processor_main()
}
}
Loading