Skip to content

refactor remove_mapping #18

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
Louise-X10 wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

refactor remove_mapping #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f09222
clean up comments
Louise-X10 Feb 22, 2023
1201a73
distinguish remove_map_at and remove_map
Louise-X10 Feb 22, 2023
077fa26
add comment for remove_mapping
Louise-X10 Feb 22, 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
20 changes: 14 additions & 6 deletions src/address_space.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,20 @@ impl AddressSpace {
todo!()
}

/// Remove the mapping to `DataSource` from this `AddressSpace`
/// Figure out corresponding virtual address in body of this function
///
/// # Errors
/// If the mapping could not be removed.
pub fn remove_mapping<D: DataSource>(&self, source: &D) -> Result<(), &str> {
todo!()
}

/// Remove the mapping to `DataSource` that starts at the given address.
///
/// # Errors
/// If the mapping could not be removed.
pub fn remove_mapping<D: DataSource>(
pub fn remove_mapping_at<D: DataSource>(
&self,
source: &D,
start: VirtualAddress,
Expand All @@ -79,14 +88,14 @@ impl AddressSpace {

/// Look up the DataSource and offset within that DataSource for a
/// VirtualAddress / AccessType in this AddressSpace
///
///
/// # Errors
/// If this VirtualAddress does not have a valid mapping in &self,
/// or if this AccessType is not permitted by the mapping
pub fn get_source_for_addr<D: DataSource>(
&self,
addr: VirtualAddress,
access_type: FlagBuilder
access_type: FlagBuilder,
) -> Result<(&D, usize), &str> {
todo!();
}
Expand All @@ -96,7 +105,7 @@ impl AddressSpace {
///
/// We recommend using this builder type as follows:
/// ```
/// # use reedos_address_space::FlagBuilder;
///
/// let flags = FlagBuilder::new()
/// .toggle_read()
/// .toggle_write();
Expand Down Expand Up @@ -194,7 +203,7 @@ impl FlagBuilder {
/// You can think of this as `self &! other` on each field.
///
/// ```
/// # use reedos_address_space::FlagBuilder;
///
/// let read_execute = FlagBuilder::read().toggle_execute();
/// let execute = FlagBuilder::execute();
/// let new = read_execute.but_not(execute);
Expand All @@ -218,4 +227,3 @@ impl FlagBuilder {
}
}
}