Merge pull request #73 from YanQD/hypervisor

refactor(axklib-impl): replace wildcard import with explicit imports and update module paths

Author: ZR233

api/axfeat/src/lib.rs

@@ -41,4 +41,4 @@
 #![no_std]
 
 #[cfg(feature = "driver-dyn")]
-extern crate axklib_impl;
+extern crate axklib_impl;

modules/axklib-impl/src/lib.rs

@@ -2,31 +2,31 @@
 
 use core::time::Duration;
 
-use axklib::*;
+use axklib::{AxResult, IrqHandler, Klib, PhysAddr, VirtAddr, impl_trait};
 
 struct KlibImpl;
 
 impl_trait! {
     impl Klib for KlibImpl {
         fn mem_iomap(addr: PhysAddr, size: usize) -> AxResult<VirtAddr> {
-            mem::iomap(addr, size)
+            axmm::iomap(addr, size)
         }
 
         fn time_busy_wait(dur: Duration) {
-            time::busy_wait(dur);
+            axhal::time::busy_wait(dur);
         }
 
         fn irq_set_enable(_irq: usize, _enabled: bool) {
             #[cfg(feature = "irq")]
-            irq::set_enable(_irq, _enabled);
+            axhal::irq::set_enable(_irq, _enabled);
             #[cfg(not(feature = "irq"))]
             unimplemented!();
         }
 
         fn irq_register(_irq: usize, _handler: IrqHandler) -> bool {
             #[cfg(feature = "irq")]
             {
-                irq::register(_irq, _handler)
+                axhal::irq::register(_irq, _handler)
             }
             #[cfg(not(feature = "irq"))]
             {

modules/axruntime/src/lib.rs

@@ -222,12 +222,20 @@ fn init_allocator() {
 
     let mut max_region_size = 0;
     let mut max_region_paddr = 0.into();
+    let mut use_next_free = false;
+
     for r in memory_regions() {
-        if r.flags.contains(MemRegionFlags::FREE) && r.size > max_region_size {
-            max_region_size = r.size;
-            max_region_paddr = r.paddr;
-            // use lowest addr region
-            break;
+        if r.name == ".bss" {
+            use_next_free = true;
+        } else if r.flags.contains(MemRegionFlags::FREE) {
+            if use_next_free {
+                max_region_size = r.size;
+                max_region_paddr = r.paddr;
+                break;
+            } else if r.size > max_region_size {
+                max_region_size = r.size;
+                max_region_paddr = r.paddr;
+            }
         }
     }
     for r in memory_regions() {