WIP: aarch64 rebase

src/syscall/driver.rs

@@ -18,6 +18,12 @@ fn enforce_root() -> Result<()> {
     }
 }
 
+#[cfg(target_arch = "aarch64")]
+pub fn iopl(level: usize, stack: &mut InterruptStack) -> Result<usize> {
+    Err(Error::new(syscall::error::ENOSYS))
+}
+
+#[cfg(target_arch = "x86_64")]
 pub fn iopl(level: usize, stack: &mut InterruptStack) -> Result<usize> {
     enforce_root()?;
 
@@ -88,6 +94,7 @@ pub fn inner_physmap(physical_address: usize, size: usize, flags: PhysmapFlags)
         if flags.contains(PHYSMAP_WRITE_COMBINE) {
             entry_flags |= EntryFlags::HUGE_PAGE;
         }
+        #[cfg(target_arch = "x86_64")] // TODO: AARCH64
         if flags.contains(PHYSMAP_NO_CACHE) {
             entry_flags |= EntryFlags::NO_CACHE;
         }

src/syscall/mod.rs

@@ -125,13 +125,23 @@ pub fn syscall(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, bp: u
                 SYS_GETPPID => getppid().map(ContextId::into),
                 SYS_CLONE => {
                     let b = CloneFlags::from_bits_truncate(b);
-                    let old_rsp = stack.iret.rsp;
-                    if b.contains(flag::CLONE_STACK) {
-                        stack.iret.rsp = c;
+
+                    #[cfg(target_arch = "aarch64")]
+                    {
+                        //TODO: CLONE_STACK
+                        clone(b, bp).map(ContextId::into)
+                    }
+
+                    #[cfg(target_arch = "x86_64")]
+                    {
+                        let old_rsp = stack.iret.rsp;
+                        if b.contains(flag::CLONE_STACK) {
+                            stack.iret.rsp = c;
+                        }
+                        let ret = clone(b, bp).map(ContextId::into);
+                        stack.iret.rsp = old_rsp;
+                        ret
                     }
-                    let ret = clone(b, bp).map(ContextId::into);
-                    stack.iret.rsp = old_rsp;
-                    ret
                 },
                 SYS_EXIT => exit((b & 0xFF) << 8),
                 SYS_KILL => kill(ContextId::from(b), c),

src/syscall/process.rs

@@ -106,6 +106,7 @@ pub fn clone(flags: CloneFlags, stack_base: usize) -> Result<ContextId> {
                     // Set clone's return value to zero. This is done because
                     // the clone won't return like normal, which means the value
                     // would otherwise never get set.
+                    #[cfg(target_arch = "x86_64")] // TODO
                     if let Some(regs) = ptrace::rebase_regs_ptr_mut(context.regs, Some(&mut new_stack)) {
                         (*regs).scratch.rax = 0;
                     }