Merge changes I7175d7c1,I401ac4af
* changes:
pvmfw: helpers: Introduce SIZE_2MB
vmbase: Export linker-defined MemoryRegions & VAs
diff --git a/vmbase/example/src/main.rs b/vmbase/example/src/main.rs
index d6a966c..03f0603 100644
--- a/vmbase/example/src/main.rs
+++ b/vmbase/example/src/main.rs
@@ -59,7 +59,7 @@
check_stack_guard();
unsafe {
- HEAP_ALLOCATOR.lock().init(&mut HEAP as *mut u8 as usize, HEAP.len());
+ HEAP_ALLOCATOR.lock().init(HEAP.as_mut_ptr() as usize, HEAP.len());
}
check_alloc();
@@ -105,11 +105,11 @@
}
fn check_data() {
- info!("INITIALISED_DATA: {:#010x}", &INITIALISED_DATA as *const u32 as usize);
+ info!("INITIALISED_DATA: {:?}", INITIALISED_DATA.as_ptr());
unsafe {
- info!("ZEROED_DATA: {:#010x}", &ZEROED_DATA as *const u32 as usize);
- info!("MUTABLE_DATA: {:#010x}", &MUTABLE_DATA as *const u32 as usize);
- info!("HEAP: {:#010x}", &HEAP as *const u8 as usize);
+ info!("ZEROED_DATA: {:?}", ZEROED_DATA.as_ptr());
+ info!("MUTABLE_DATA: {:?}", MUTABLE_DATA.as_ptr());
+ info!("HEAP: {:?}", HEAP.as_ptr());
}
assert_eq!(INITIALISED_DATA[0], 1);