Update rust-sel4 commit from TS fork to mainline#531
Open
dreamliner787-9 wants to merge 4 commits into
Open
Conversation
Previously, the ELF code treats program headers = segments. While this worked originally, it broke for cases that requires >= 2 program headers to refer to the same segment. Now, when the ELF is parsed, the code will create a 1-1 mapping of segments to program headers like before. But the allow for additional program headers to be inserted. Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
Added `pub fn phdrs_table(&self) -> Vec<(ElfProgramHeader64, usize)>` to ELF code. Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
Modified `pub fn add_segment()` to allow for an additional program header in the ELF to describe the segment with a user defined type identifier. Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
Which also required changes to how the spec is packed into the intialiser. Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
dreamliner787-9
force-pushed
the
rust_sel4_update_to_main
branch
from
d5a8b1e to
d9b1e0a
Compare
Comment on lines
107
to
+109
| const PF_X: u32 = 0x1; | ||
| const PF_W: u32 = 0x2; | ||
| const PF_R: u32 = 0x4; | ||
| pub const PF_R: u32 = 0x4; |
Collaborator
There was a problem hiding this comment.
If you need to make it pub do it consistently
| #[derive(Eq, PartialEq, Clone)] | ||
| pub struct ProgramHeader { | ||
| pub segment_idx: usize, | ||
| pub type_: u32, |
Collaborator
There was a problem hiding this comment.
Use r#type. Not type_
| entry, | ||
| machine, | ||
| segments: [].into(), | ||
| program_headers: [].into(), |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This required a few changes to how the spec is packed into the initialiser ELF from seL4/rust-sel4#345.
Do not merge until: