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

Merge verified chunk into frame allocator #976

Draft
wants to merge 24 commits into
base: theseus_main
Choose a base branch
from
Draft

Merge verified chunk into frame allocator #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3950ab9
added trusted chunk submodule
Ramla-I Jun 9, 2023
57a5de7
compiles and runs with trusted chunk shim
Ramla-I Jun 9, 2023
461d9a4
updated trusted chunk submodule
Ramla-I Jun 13, 2023
bdcebdd
comments and naming
Ramla-I Jun 13, 2023
e0ca2c9
comments
Ramla-I Jun 13, 2023
1cc8999
Merge branch 'theseus_main' of https://github.com/theseus-os/Theseus …
Ramla-I Jun 13, 2023
3378834
removed unnecessary check in frame allocator init
Ramla-I Jun 13, 2023
228a169
allocated frames lib file matches latest theseus main, with only my o…
Ramla-I Jun 13, 2023
0d5dbb5
chunk, region and AF match latest main code, removed warnings
Ramla-I Jun 14, 2023
5d407bb
added typestate just for chunk type
Ramla-I Jun 14, 2023
2636dc3
allocated frames test module
Ramla-I Jun 14, 2023
90dba50
works with chunk as a type state, allocation error when AF is also th…
Ramla-I Jun 14, 2023
bfcc268
removed changes to other files
Ramla-I Jun 14, 2023
1977fc5
page allocator: support allocating pages within an address range (#970)
kevinaboos Jun 13, 2023
87afde2
should match with theseus_main now
Ramla-I Jun 14, 2023
4ac52ff
condensed files
Ramla-I Jun 14, 2023
b0fb296
formatting
Ramla-I Jun 14, 2023
b551c14
comments
Ramla-I Jun 14, 2023
82fd670
allow incomplete features
Ramla-I Jun 14, 2023
1fa390a
one commit from main wasn't merged in, strange
Ramla-I Jun 14, 2023
b32b88b
retain my changes to memory
Ramla-I Jun 14, 2023
a19984c
addressed clippy errors
Ramla-I Jun 14, 2023
1bd4fac
addressed clipp errors
Ramla-I Jun 14, 2023
14efde9
merged AllocatedFrames into Frames
Ramla-I Jun 20, 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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@
path = libs/core2
url = https://github.com/theseus-os/core2.git
shallow = true
[submodule "libs/trusted_chunk"]
path = libs/trusted_chunk
url = https://github.com/Ramla-I/trusted_chunk
49 changes: 49 additions & 0 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.

5 changes: 5 additions & 0 deletions kernel/frame_allocator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ version = "0.1.0"
spin = "0.9.4"
intrusive-collections = "0.9.0"
static_assertions = "1.1.0"
range_inclusive = {git = "https://github.com/Ramla-I/range_inclusive"}

[dependencies.log]
version = "0.4.8"
Expand All @@ -18,5 +19,9 @@ path = "../kernel_config"
[dependencies.memory_structs]
path = "../memory_structs"

[dependencies.trusted_chunk]
path = "../../libs/trusted_chunk"


[lib]
crate-type = ["rlib"]
Loading