tool: remove deprecated code patching child frame caps into parents

Signed-off-by: Krishnan Winter <krishnanwinter1@gmail.com>

Author: Kswin01

tool/microkit/src/main.rs

@@ -2027,6 +2027,8 @@ fn build_system(
         }
     }
 
+    let mut frame_cap = BASE_FRAME_CAP;
+
     for (pd_idx, _) in system.protection_domains.iter().enumerate() {
         for maybe_child_pd in system.protection_domains.iter() {
             if maybe_child_pd.parent.is_some_and(|x| x == pd_idx) {
@@ -2038,7 +2040,7 @@ fn build_system(
                             config,
                             InvocationArgs::CnodeMint {
                                 cnode: cnode_objs[pd_idx].cap_addr,
-                                dest_index: BASE_FRAME_CAP,
+                                dest_index: frame_cap,
                                 dest_depth: PD_CAP_BITS,
                                 src_root: root_cnode_cap,
                                 src_obj: mr_pages[mr][0].cap_addr,
@@ -2064,85 +2066,16 @@ fn build_system(
 
                         for mr_idx in 0..mr_pages[mr].len() {
                             let vaddr = mp.vaddr + mr.page_size_bytes() * mr_idx as u64;
-                            let minted_cap = BASE_FRAME_CAP + mr_idx as u64;
+                            let minted_cap = frame_cap + mr_idx as u64;
 
                             all_child_page_tables[pd_idx]
                             .as_mut()
                             .unwrap()[maybe_child_pd.id.unwrap() as usize]
                             .add_page_at_vaddr(vaddr, minted_cap, mr.page_size);
                         }
-                    }
-                }
-            }
-        }
-    }
 
-    let mut sorted_mp_mr_pairs: Vec<(&SysMap, &SysMemoryRegion, String)> = vec![];
-    for pd in system.protection_domains.iter() {
-        for map_set in [&pd.maps, &pd_extra_maps[pd]] {
-            for mp in map_set {
-                let mr = all_mr_by_name[mp.mr.as_str()];
-                let id = mr.name.clone() + " " + &pd.name;
-                sorted_mp_mr_pairs.push((mp, mr, id));
-            }
-        }
-    }
-    sorted_mp_mr_pairs.sort_by(|a, b| a.1.name.cmp(&b.1.name));
-    let mut frame_cap = BASE_FRAME_CAP;
-
-    // If a pd has a parent, we mint the child's frame caps into the parent's vspace
-    // We additionally place these frame caps into the corresponding page in our copy of the tables
-    for (pd_idx, parent) in system.protection_domains.iter().enumerate() {
-        for (_maybe_child_idx, maybe_child_pd) in system.protection_domains.iter().enumerate() {
-            if let Some(parent_idx) = maybe_child_pd.parent {
-                if parent_idx == pd_idx && parent.child_pts {
-                    for mp_mr_pair in &sorted_mp_mr_pairs {
-                        let child_mp = mp_mr_pair.0;
-                        let child_mr = mp_mr_pair.1;
-                        let name = &mp_mr_pair.2;
-                        if name.contains(&maybe_child_pd.name) {
-                            let mut invocation = Invocation::new(
-                                config,
-                                InvocationArgs::CnodeMint {
-                                    cnode: cnode_objs[pd_idx].cap_addr,
-                                    dest_index: frame_cap,
-                                    dest_depth: PD_CAP_BITS,
-                                    src_root: root_cnode_cap,
-                                    src_obj: mr_pages[child_mr][0].cap_addr,
-                                    src_depth: config.cap_address_bits,
-                                    rights: (Rights::Read as u64 | Rights::Write as u64),
-                                    badge: 0,
-                                },
-                            );
-
-                            invocation.repeat(
-                                mr_pages[child_mr].len() as u32,
-                                InvocationArgs::CnodeMint {
-                                    cnode: 0,
-                                    dest_index: 1,
-                                    dest_depth: 0,
-                                    src_root: 0,
-                                    src_obj: 1,
-                                    src_depth: 0,
-                                    rights: 0,
-                                    badge: 0,
-                                },
-                            );
-
-                            for mr_idx in 0..mr_pages[child_mr].len() {
-                                let vaddr = child_mp.vaddr + child_mr.page_size_bytes() * mr_idx as u64;
-                                let minted_cap = frame_cap + mr_idx as u64;
-
-                                // Check if we have a small or large page.
-                                all_child_page_tables[parent_idx]
-                                .as_mut()
-                                .unwrap()[maybe_child_pd.id.unwrap() as usize]
-                                .add_page_at_vaddr(vaddr, minted_cap, child_mr.page_size);
-                            }
-
-                            frame_cap += mr_pages[child_mr].len() as u64;
-                            system_invocations.push(invocation);
-                        }
+                        frame_cap += mr_pages[mr].len() as u64;
+                        system_invocations.push(invocation);
                     }
                 }
             }