Skip to content

Commit d9223dd

Browse files
committed
Remove wrong assumption of pte_addr and alloc_index
Signed-off-by: Yonghao Zou <zouyonghao@live.cn>
1 parent 93c4402 commit d9223dd

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

  • lock-protocol/src/mm/page_table/cursor

lock-protocol/src/mm/page_table/cursor/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ impl<'a, C: PageTableConfig, PTL: PageTableLockTrait<C>> Cursor<'a, C, PTL> {
300300
== child_pt.paddr() as int,
301301
{
302302
self.level = self.level - 1;
303-
// debug_assert_eq!(self.level, child_pt.level()); // TODO: assert
304303

305304
// let old = self.path[self.level as usize - 1].replace(child_pt);
306305
let old = self.path.set(self.level as usize - 1, Some(child_pt));
@@ -314,8 +313,6 @@ impl<'a, C: PageTableConfig, PTL: PageTableLockTrait<C>> Cursor<'a, C, PTL> {
314313
self.path.len() >= self.level as usize,
315314
self.path[self.level as usize - 1].is_some(),
316315
spt.wf(),
317-
// sub_page_table.frames@.value().contains_key(self.path[self.level as usize - 1].unwrap().paddr() as int),
318-
319316
ensures
320317
res.pte.pte_paddr() == self.path[self.level as usize - 1].unwrap().paddr() as usize
321318
+ pte_index(self.va, self.level) * exec::SIZEOF_PAGETABLEENTRY,
@@ -510,7 +507,6 @@ impl<'a, C: PageTableConfig, PTL: PageTableLockTrait<C>> CursorMut<'a, C, PTL> {
510507
mpt_and_tokens_wf_addrs(spt, unused_addrs, unused_pte_addrs),
511508
mpt_not_contains_not_allocated_frames(spt, *cur_alloc_index),
512509
unallocated_frames_are_unused(unused_addrs, *cur_alloc_index),
513-
unallocated_ptes_are_unused(unused_pte_addrs, *cur_alloc_index),
514510
tokens_wf(unused_addrs, unused_pte_addrs),
515511
// the post condition
516512
self.0.sub_page_table_valid_before_map_level(
@@ -587,7 +583,6 @@ impl<'a, C: PageTableConfig, PTL: PageTableLockTrait<C>> CursorMut<'a, C, PTL> {
587583
PTL::from_raw_paddr(paddr), root_level, spt);
588584

589585
*cur_alloc_index += 1; // TODO: do it inside the alloc function
590-
assume(unallocated_ptes_are_unused(unused_pte_addrs, *cur_alloc_index)); // TODO: P0
591586
assume(*cur_alloc_index < exec::MAX_FRAME_NUM - 4); // TODO
592587

593588
// TODO: P0 see @path_matchs_page_table

0 commit comments

Comments
 (0)