From 2d63009ba416e11ebbabe1ec3a1e8a70d8e9f9e7 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 18 Jul 2020 13:40:12 +0200
Subject: [PATCH] Add debug entry for fmap2

---
 src/scheme/memory.rs |  5 +++--
 src/syscall/debug.rs | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/scheme/memory.rs b/src/scheme/memory.rs
index d652019..88f9db3 100644
--- a/src/scheme/memory.rs
+++ b/src/scheme/memory.rs
@@ -50,8 +50,9 @@ impl Scheme for MemoryScheme {
 
             let mut to_address = if map.address == 0 { crate::USER_GRANT_OFFSET } else {
                 if // map.address < crate::USER_GRANT_OFFSET || map.address + map.size > crate::USER_GRANT_OFFSET + crate::PML4_SIZE ||
-                    map.address % PAGE_SIZE != 0 {
-                        return Err(Error::new(EINVAL));
+                    map.address % PAGE_SIZE != 0
+                {
+                    return Err(Error::new(EINVAL));
                 }
                 map.address
             };
diff --git a/src/syscall/debug.rs b/src/syscall/debug.rs
index 8b42526..e883ca3 100644
--- a/src/syscall/debug.rs
+++ b/src/syscall/debug.rs
@@ -2,7 +2,7 @@ use core::{ascii, mem};
 use alloc::string::String;
 use alloc::vec::Vec;
 
-use super::data::{Map, Stat, TimeSpec};
+use super::data::{Map, Map2, Stat, TimeSpec};
 use super::flag::*;
 use super::number::*;
 use super::validate::*;
@@ -114,6 +114,14 @@ pub fn format_call(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize) -
                 d/mem::size_of::<Map>()
             ),
         ),
+        SYS_FMAP2 => format!(
+            "fmap2({}, {:?})",
+            b,
+            validate_slice(
+                c as *const Map2,
+                d/mem::size_of::<Map2>()
+            ),
+        ),
         SYS_FUNMAP => format!(
             "funmap({:#X})",
             b