Skip to content

Slight mods - strip some unneeded stuff #43

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

Merged
vrindisbacher merged 2 commits into from
Aug 21, 2025
Merged

Slight mods - strip some unneeded stuff #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6621c44
reviewer-fix
vrindisbacher Aug 20, 2025
dc6044e
remove lemmas
vrindisbacher Aug 21, 2025
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
12 changes: 3 additions & 9 deletions kernel/src/allocator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(crate) enum AllocateAppMemoryError {
flash_size: int
)]
#[flux_rs::invariant(memory_start + memory_size <= u32::MAX)]
#[flux_rs::invariant(kernel_break < memory_start + memory_size)]
#[flux_rs::invariant(kernel_break <= memory_start + memory_size)]
#[flux_rs::invariant(flash_start + flash_size < memory_start)]
#[flux_rs::invariant(app_break >= high_water_mark)]
#[flux_rs::invariant(app_break <= kernel_break)]
Expand Down Expand Up @@ -124,7 +124,7 @@ impl<R: RegionDescriptor + Display + Copy> AppMemoryAllocator<R> {
self.breaks.app_break
}

#[flux_rs::sig(fn (&Self[@b]) -> FluxPtrU8{p: p == b.breaks.kernel_break && p < b.breaks.memory_start + b.breaks.memory_size })]
#[flux_rs::sig(fn (&Self[@b]) -> FluxPtrU8{p: p == b.breaks.kernel_break && p <= b.breaks.memory_start + b.breaks.memory_size })]
pub(crate) fn kernel_break(&self) -> FluxPtrU8 {
self.breaks.kernel_break
}
Expand Down Expand Up @@ -256,7 +256,7 @@ impl<R: RegionDescriptor + Display + Copy> AppMemoryAllocator<R> {
let new_break = FluxPtrU8::from(new_break_unaligned & alignment_mask);

// Verify there is space for this allocation
if new_break < self.app_break() || new_break > self.kernel_break() {
if new_break < self.app_break() || new_break >= self.kernel_break() {
None
} else {
// Allocation is valid.
Expand Down Expand Up @@ -612,12 +612,6 @@ impl<R: RegionDescriptor + Display + Copy> AppMemoryAllocator<R> {
mpu::Permissions::ReadWriteOnly,
);
let memory_end = breaks.memory_start.wrapping_add(breaks.memory_size);
ram_regions
.fst
.lemma_no_overlap_le_addr_implies_no_overlap_addr(breaks.app_break, memory_end);
ram_regions
.snd
.lemma_no_overlap_le_addr_implies_no_overlap_addr(breaks.app_break, memory_end);

app_regions
.get(FLASH_REGION_NUMBER)
Expand Down
Loading