Merge remote-tracking branch 'origin/aarch64-rebase' into riscv64

src/scheme/memory.rs

@@ -1,7 +1,7 @@
 use crate::context;
 use crate::context::memory::{page_flags, Grant};
 use crate::memory::{free_frames, used_frames, PAGE_SIZE};
-use crate::paging::{ActivePageTable, VirtualAddress};
+use crate::paging::{ActivePageTable, PageTableType, VirtualAddress, VirtualAddressType};
 use crate::syscall::data::{Map, OldMap, StatVfs};
 use crate::syscall::error::*;
 use crate::syscall::flag::MapFlags;
@@ -48,7 +48,10 @@ impl Scheme for MemoryScheme {
                 // Make sure it's *absolutely* not mapped already
                 // TODO: Keep track of all allocated memory so this isn't necessary
 
-                let active_table = unsafe { ActivePageTable::new() };
+                let active_table = match VirtualAddress::new(map.address).get_type() {
+                    VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+                    VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+                };
 
                 for page in region.pages() {
                     if active_table.translate_page(page).is_some() {

src/scheme/proc.rs

@@ -335,6 +335,13 @@ impl Scheme for ProcScheme {
         Ok(value)
     }
 
+    #[cfg(target_arch = "aarch64")]
+    fn read(&self, id: usize, buf: &mut [u8]) -> Result<usize> {
+        //TODO
+        Err(Error::new(EINVAL))
+    }
+
+    #[cfg(target_arch = "x86_64")]
     fn read(&self, id: usize, buf: &mut [u8]) -> Result<usize> {
         // Don't hold a global lock during the context switch later on
         let info = {
@@ -455,6 +462,13 @@ impl Scheme for ProcScheme {
         }
     }
 
+    #[cfg(target_arch = "aarch64")]
+    fn write(&self, id: usize, buf: &[u8]) -> Result<usize> {
+        //TODO
+        Err(Error::new(EINVAL))
+    }
+
+    #[cfg(target_arch = "x86_64")]
     fn write(&self, id: usize, buf: &[u8]) -> Result<usize> {
         // Don't hold a global lock during the context switch later on
         let info = {

src/scheme/sys/mod.rs

@@ -52,6 +52,7 @@ impl SysScheme {
         files.insert("scheme_num", Box::new(scheme_num::resource));
         files.insert("syscall", Box::new(syscall::resource));
         files.insert("uname", Box::new(uname::resource));
+        #[cfg(target_arch = "x86_64")]
         files.insert("spurious_irq", Box::new(irq::spurious_irq_resource));
 
         SysScheme {

src/scheme/user.rs

@@ -148,7 +148,7 @@ impl UserInner {
         let context_lock = context_weak.upgrade().ok_or(Error::new(ESRCH))?;
         let mut context = context_lock.write();
 
-        let mut new_table = unsafe { InactivePageTable::from_address(context.arch.get_page_table()) };
+        let mut new_table = unsafe { InactivePageTable::from_address(context.arch.get_page_utable()) };
         let mut temporary_page = TemporaryPage::new(Page::containing_address(VirtualAddress::new(crate::USER_TMP_GRANT_OFFSET)));
 
         let mut grants = context.grants.write();
@@ -179,7 +179,7 @@ impl UserInner {
             let context_lock = self.context.upgrade().ok_or(Error::new(ESRCH))?;
             let mut context = context_lock.write();
 
-            let mut new_table = unsafe { InactivePageTable::from_address(context.arch.get_page_table()) };
+            let mut new_table = unsafe { InactivePageTable::from_address(context.arch.get_page_utable()) };
             let mut temporary_page = TemporaryPage::new(Page::containing_address(VirtualAddress::new(crate::USER_TMP_GRANT_OFFSET)));
 
             let mut grants = context.grants.write();