vm_arm: inline memory initializtion module

Signed-off-by: Axel Heider <[email protected]>
seL4 · Mar 10, 2023 · 3f866b9 · 3f866b9
1 parent 0be86c6
commit 3f866b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git a/arm_vm_helpers.cmake b/arm_vm_helpers.cmake
@@ -49,7 +49,6 @@ function(DeclareCAmkESARMVM init_component)
     )
 
     list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/map_frame_hack.c)
-    list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/init_ram.c)
 
     if(VmVirtUart)
         list(APPEND vm_src ${ARM_VM_PROJECT_DIR}/components/VM_Arm/src/modules/vuart_init.c)

diff --git a/components/VM_Arm/src/main.c b/components/VM_Arm/src/main.c
@@ -1175,6 +1175,10 @@ int main_continued(void)
         return -1;
     }
 
+    /* Install and initialize guest memory. */
+    err = vm_ram_register_at(&vm, ram_base, ram_size, vm.mem.map_one_to_one);
+    assert(!err);
+
     /* Load system images */
     err = load_vm(&vm, _kernel_name, _dtb_name, _initrd_name);
     if (err) {

diff --git a/components/VM_Arm/src/modules/init_ram.c b/components/VM_Arm/src/modules/init_ram.c