From 5839641b414452fe789d85a2ec2670ca6c050dd6 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sun, 17 Sep 2017 09:40:29 -0600
Subject: [PATCH] Update debugging code
---
src/syscall/debug.rs | 375 ++++++++++++++++++++++++++++++++------
src/syscall/mod.rs | 26 +--
src/syscall/print_call.rs | 176 ------------------
3 files changed, 322 insertions(+), 255 deletions(-)
delete mode 100644 src/syscall/print_call.rs
diff --git a/src/syscall/debug.rs b/src/syscall/debug.rs
index fee98c06..fbb0a53d 100644
--- a/src/syscall/debug.rs
+++ b/src/syscall/debug.rs
@@ -1,66 +1,323 @@
+use core::mem;
+use core::ops::Range;
+use collections::Vec;
+
+use super::data::{Stat, TimeSpec};
+use super::error::Result;
+use super::flag::*;
use super::number::*;
+use super::validate::*;
+
+// Copied from std
+pub struct EscapeDefault {
+ range: Range<usize>,
+ data: [u8; 4],
+}
+
+pub fn escape_default(c: u8) -> EscapeDefault {
+ let (data, len) = match c {
+ b'\t' => ([b'\\', b't', 0, 0], 2),
+ b'\r' => ([b'\\', b'r', 0, 0], 2),
+ b'\n' => ([b'\\', b'n', 0, 0], 2),
+ b'\\' => ([b'\\', b'\\', 0, 0], 2),
+ b'\'' => ([b'\\', b'\'', 0, 0], 2),
+ b'"' => ([b'\\', b'"', 0, 0], 2),
+ b'\x20' ... b'\x7e' => ([c, 0, 0, 0], 1),
+ _ => ([b'\\', b'x', hexify(c >> 4), hexify(c & 0xf)], 4),
+ };
+
+ return EscapeDefault { range: (0.. len), data: data };
+
+ fn hexify(b: u8) -> u8 {
+ match b {
+ 0 ... 9 => b'0' + b,
+ _ => b'a' + b - 10,
+ }
+ }
+}
-pub fn name(call: usize) -> &'static str {
- match call {
- SYS_LINK => "LINK",
- SYS_OPEN => "OPEN",
- SYS_CHMOD => "CHMOD",
- SYS_RMDIR => "RMDIR",
- SYS_UNLINK => "UNLINK",
+impl Iterator for EscapeDefault {
+ type Item = u8;
+ fn next(&mut self) -> Option<u8> { self.range.next().map(|i| self.data[i]) }
+ fn size_hint(&self) -> (usize, Option<usize>) { self.range.size_hint() }
+}
- SYS_CLOSE => "CLOSE",
- SYS_DUP => "DUP",
- SYS_DUP2 => "DUP2",
- SYS_READ => "READ",
- SYS_WRITE => "WRITE",
- SYS_LSEEK => "LSEEK",
- SYS_FCNTL => "FCNTL",
- SYS_FEVENT => "FEVENT",
- SYS_FMAP => "FMAP",
- SYS_FUNMAP => "FUNMAP",
- SYS_FPATH => "FPATH",
- SYS_FSTAT => "FSTAT",
- SYS_FSTATVFS => "FSTATVFS",
- SYS_FSYNC => "FSYNC",
- SYS_FTRUNCATE => "FTRUNCATE",
- SYS_FUTIMENS => "FUTIMENS",
+struct ByteStr<'a>(&'a[u8]);
- SYS_BRK => "BRK",
- SYS_CHDIR => "CHDIR",
- SYS_CLOCK_GETTIME => "CLOCK_GETTIME",
- SYS_CLONE => "CLONE",
- SYS_EXECVE => "EXECVE",
- SYS_EXIT => "EXIT",
- SYS_FUTEX => "FUTEX",
- SYS_GETCWD => "GETCWD",
- SYS_GETEGID => "GETEGID",
- SYS_GETENS => "GETENS",
- SYS_GETEUID => "GETEUID",
- SYS_GETGID => "GETGID",
- SYS_GETNS => "GETNS",
- SYS_GETPID => "GETPID",
- SYS_GETPGID => "GETPGID",
- SYS_GETPPID => "GETPPID",
- SYS_GETUID => "GETUID",
- SYS_IOPL => "IOPL",
- SYS_KILL => "KILL",
- SYS_MKNS => "MKNS",
- SYS_NANOSLEEP => "NANOSLEEP",
- SYS_PHYSALLOC => "PHYSALLOC",
- SYS_PHYSFREE => "PHYSFREE",
- SYS_PHYSMAP => "PHYSMAP",
- SYS_PHYSUNMAP => "PHYSUNMAP",
- SYS_VIRTTOPHYS => "VIRTTOPHYS",
- SYS_PIPE2 => "PIPE2",
- SYS_SETPGID => "SETPGID",
- SYS_SETREGID => "SETREGID",
- SYS_SETRENS => "SETRENS",
- SYS_SETREUID => "SETREUID",
- SYS_SIGACTION => "SIGACTION",
- SYS_SIGRETURN => "SIGRETURN",
- SYS_WAITPID => "WAITPID",
- SYS_YIELD => "YIELD",
+impl<'a> ::core::fmt::Debug for ByteStr<'a> {
+ fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
+ write!(f, "\"")?;
+ for i in self.0 {
+ for ch in escape_default(*i) {
+ write!(f, "{}", ch as char)?;
+ }
+ }
+ write!(f, "\"")?;
+ Ok(())
+ }
+}
- _ => "?",
+
+pub fn print_call(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize) -> Result<()> {
+ match a {
+ SYS_OPEN => print!(
+ "open({:?}, {:#X})",
+ validate_slice(b as *const u8, c).map(ByteStr),
+ d
+ ),
+ SYS_CHMOD => print!(
+ "chmod({:?}, {:#o})",
+ validate_slice(b as *const u8, c).map(ByteStr),
+ d
+ ),
+ SYS_RMDIR => print!(
+ "rmdir({:?})",
+ validate_slice(b as *const u8, c).map(ByteStr)
+ ),
+ SYS_UNLINK => print!(
+ "unlink({:?})",
+ validate_slice(b as *const u8, c).map(ByteStr)
+ ),
+ SYS_CLOSE => print!(
+ "close({})", b
+ ),
+ SYS_DUP => print!(
+ "dup({}, {:?})",
+ b,
+ validate_slice(c as *const u8, d).map(ByteStr)
+ ),
+ SYS_DUP2 => print!(
+ "dup2({}, {}, {:?})",
+ b,
+ c,
+ validate_slice(d as *const u8, e).map(ByteStr)
+ ),
+ SYS_READ => print!(
+ "read({}, {:#X}, {})",
+ b,
+ c,
+ d
+ ),
+ SYS_WRITE => print!(
+ "write({}, {:#X}, {})",
+ b,
+ c,
+ d
+ ),
+ SYS_LSEEK => print!(
+ "lseek({}, {}, {} ({}))",
+ b,
+ c as isize,
+ match d {
+ SEEK_SET => "SEEK_SET",
+ SEEK_CUR => "SEEK_CUR",
+ SEEK_END => "SEEK_END",
+ _ => "UNKNOWN"
+ },
+ d
+ ),
+ SYS_FCNTL => print!(
+ "fcntl({}, {} ({}), {:#X})",
+ b,
+ match c {
+ F_DUPFD => "F_DUPFD",
+ F_GETFD => "F_GETFD",
+ F_SETFD => "F_SETFD",
+ F_SETFL => "F_SETFL",
+ F_GETFL => "F_GETFL",
+ _ => "UNKNOWN"
+ },
+ c,
+ d
+ ),
+ SYS_FEVENT => print!(
+ "fevent({}, {:#X})",
+ b,
+ c
+ ),
+ SYS_FMAP => print!(
+ "fmap({}, {:#X}, {})",
+ b,
+ c,
+ d
+ ),
+ SYS_FUNMAP => print!(
+ "funmap({:#X})",
+ b
+ ),
+ SYS_FPATH => print!(
+ "fpath({}, {:#X}, {})",
+ b,
+ c,
+ d
+ ),
+ SYS_FSTAT => print!(
+ "fstat({}, {:?})",
+ b,
+ validate_slice(
+ c as *const Stat,
+ d/mem::size_of::<Stat>()
+ ),
+ ),
+ SYS_FSTATVFS => print!(
+ "fstatvfs({}, {:#X}, {})",
+ b,
+ c,
+ d
+ ),
+ SYS_FSYNC => print!(
+ "fsync({})",
+ b
+ ),
+ SYS_FTRUNCATE => print!(
+ "ftruncate({}, {})",
+ b,
+ c
+ ),
+
+ SYS_BRK => print!(
+ "brk({:#X})",
+ b
+ ),
+ SYS_CHDIR => print!(
+ "chdir({:?})",
+ validate_slice(b as *const u8, c).map(ByteStr)
+ ),
+ SYS_CLOCK_GETTIME => print!(
+ "clock_gettime({}, {:?})",
+ b,
+ validate_slice_mut(c as *mut TimeSpec, 1)
+ ),
+ SYS_CLONE => print!(
+ "clone({})",
+ b
+ ),
+ //TODO: Cleanup, do not allocate
+ SYS_EXECVE => print!(
+ "execve({:?}, {:?})",
+ validate_slice(b as *const u8, c).map(ByteStr),
+ validate_slice(
+ d as *const [usize; 2],
+ e
+ )?
+ .iter()
+ .map(|a|
+ validate_slice(a[0] as *const u8, a[1]).ok()
+ .and_then(|s| ::core::str::from_utf8(s).ok())
+ ).collect::<Vec<Option<&str>>>()
+ ),
+ SYS_EXIT => print!(
+ "exit({})",
+ b
+ ),
+ SYS_FUTEX => print!(
+ "futex({:#X} [{:?}], {}, {}, {}, {})",
+ b,
+ validate_slice_mut(b as *mut i32, 1).map(|uaddr| &mut uaddr[0]),
+ c,
+ d,
+ e,
+ f
+ ),
+ SYS_GETCWD => print!(
+ "getcwd({:#X}, {})",
+ b,
+ c
+ ),
+ SYS_GETEGID => print!("getgid()"),
+ SYS_GETENS => print!("getens()"),
+ SYS_GETEUID => print!("geteuid()"),
+ SYS_GETGID => print!("getgid()"),
+ SYS_GETNS => print!("getns()"),
+ SYS_GETPID => print!("getpid()"),
+ SYS_GETUID => print!("getuid()"),
+ SYS_IOPL => print!(
+ "iopl({})",
+ b
+ ),
+ SYS_KILL => print!(
+ "kill({}, {})",
+ b,
+ c
+ ),
+ SYS_SIGRETURN => print!("sigreturn()"),
+ SYS_SIGACTION => print!(
+ "sigaction({}, {:#X}, {:#X}, {:#X})",
+ b,
+ c,
+ d,
+ e
+ ),
+ SYS_MKNS => print!(
+ "mkns({:?})",
+ validate_slice(b as *const [usize; 2], c)
+ ),
+ SYS_NANOSLEEP => print!(
+ "nanosleep({:?}, ({}, {}))",
+ validate_slice(b as *const TimeSpec, 1),
+ c,
+ d
+ ),
+ SYS_PHYSALLOC => print!(
+ "physalloc({})",
+ b
+ ),
+ SYS_PHYSFREE => print!(
+ "physfree({:#X}, {})",
+ b,
+ c
+ ),
+ SYS_PHYSMAP => print!(
+ "physmap({:#X}, {}, {:#X})",
+ b,
+ c,
+ d
+ ),
+ SYS_PHYSUNMAP => print!(
+ "physunmap({:#X})",
+ b
+ ),
+ SYS_VIRTTOPHYS => print!(
+ "virttophys({:#X})",
+ b
+ ),
+ SYS_PIPE2 => print!(
+ "pipe2({:?}, {})",
+ validate_slice_mut(b as *mut usize, 2),
+ c
+ ),
+ SYS_SETREGID => print!(
+ "setregid({}, {})",
+ b,
+ c
+ ),
+ SYS_SETRENS => print!(
+ "setrens({}, {})",
+ b,
+ c
+ ),
+ SYS_SETREUID => print!(
+ "setreuid({}, {})",
+ b,
+ c
+ ),
+ SYS_WAITPID => print!(
+ "waitpid({}, {}, {})",
+ b,
+ c,
+ d
+ ),
+ SYS_YIELD => print!("yield()"),
+ _ => print!(
+ "UNKNOWN{} {:#X}({:#X}, {:#X}, {:#X}, {:#X}, {:#X})",
+ a, a,
+ b,
+ c,
+ d,
+ e,
+ f
+ )
}
+
+ Ok(())
}
diff --git a/src/syscall/mod.rs b/src/syscall/mod.rs
index 73df4562..56029fe4 100644
--- a/src/syscall/mod.rs
+++ b/src/syscall/mod.rs
@@ -163,7 +163,8 @@ pub extern fn syscall(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize
print!("{} ({}): ", unsafe { ::core::str::from_utf8_unchecked(&context.name.lock()) }, context.id.into());
}
- println!("{} ({:X}), {:X}, {:X}, {:X}", debug::name(a), a, b, c, d);
+ let _ = debug::print_call(a, b, c, d, e, f);
+ println!("");
}
*/
@@ -177,33 +178,18 @@ pub extern fn syscall(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize
print!("{} ({}): ", unsafe { ::core::str::from_utf8_unchecked(&context.name.lock()) }, context.id.into());
}
+ let _ = debug::print_call(a, b, c, d, e, f);
+
match result {
Ok(ref ok) => {
- println!("{} ({:X}), {:X}, {:X}, {:X}: Ok({:X})", debug::name(a), a, b, c, d, ok);
+ println!(" = Ok({} ({:#X}))", ok, ok);
},
Err(ref err) => {
- println!("{} ({:X}), {:X}, {:X}, {:X}: Err({} ({:X}))", debug::name(a), a, b, c, d, err, err.errno);
+ println!(" = Err({} ({:#X}))", err, err.errno);
}
}
}
*/
- /*
- let result = inner(a, b, c, d, e, f, bp, stack);
- {
- let contexts = ::context::contexts();
- if let Some(context_lock) = contexts.current() {
- let context = context_lock.read();
- let context_name = context.name.lock();
- let name = unsafe { ::core::str::from_utf8_unchecked(&context_name) };
- if name == "file:/bin/rustc" {
- print!("{}: {:?}: ", name, context.id);
- let _ = print_call(a, b, c, d, e, f);
- println!(" = {:?}", result);
- }
- }
- }
- */
-
Error::mux(result)
}
diff --git a/src/syscall/print_call.rs b/src/syscall/print_call.rs
deleted file mode 100644
index 716ad66e..00000000
--- a/src/syscall/print_call.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-use core::ops::Range;
-use super::data::{Stat, TimeSpec};
-use super::error::Result;
-pub use super::validate::*;
-use collections::Vec;
-use super::syscall;
-
-
-// Coppied from std
-pub struct EscapeDefault {
- range: Range<usize>,
- data: [u8; 4],
-}
-
-
-pub fn escape_default(c: u8) -> EscapeDefault {
- let (data, len) = match c {
- b'\t' => ([b'\\', b't', 0, 0], 2),
- b'\r' => ([b'\\', b'r', 0, 0], 2),
- b'\n' => ([b'\\', b'n', 0, 0], 2),
- b'\\' => ([b'\\', b'\\', 0, 0], 2),
- b'\'' => ([b'\\', b'\'', 0, 0], 2),
- b'"' => ([b'\\', b'"', 0, 0], 2),
- b'\x20' ... b'\x7e' => ([c, 0, 0, 0], 1),
- _ => ([b'\\', b'x', hexify(c >> 4), hexify(c & 0xf)], 4),
- };
-
- return EscapeDefault { range: (0.. len), data: data };
-
- fn hexify(b: u8) -> u8 {
- match b {
- 0 ... 9 => b'0' + b,
- _ => b'a' + b - 10,
- }
- }
-}
-
-
-impl Iterator for EscapeDefault {
- type Item = u8;
- fn next(&mut self) -> Option<u8> { self.range.next().map(|i| self.data[i]) }
- fn size_hint(&self) -> (usize, Option<usize>) { self.range.size_hint() }
-}
-
-
-struct ByteStr<'a>(&'a[u8]);
-
-impl<'a> ::core::fmt::Debug for ByteStr<'a> {
- fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
- write!(f, "\"")?;
- for i in self.0 {
- for ch in escape_default(*i) {
- write!(f, "{}", ch as char)?;
- }
- }
- write!(f, "\"")?;
- Ok(())
- }
-}
-
-
-pub fn print_call(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize) -> Result<()> {
- match a {
- //syscall::SYS_LINK =>
- SYS_OPEN => print!("open({:?}, 0x{:x})",
- ByteStr(validate_slice(b as *const u8, c)?),
- d),
- SYS_CHMOD => print!("chmod({:?}, {})",
- ByteStr(validate_slice(b as *const u8, c)?),
- d),
- SYS_RMDIR => print!("rmdir({:?})",
- ByteStr(validate_slice(b as *const u8, c)?)),
- SYS_UNLINK => print!("unlink({:?})",
- ByteStr(validate_slice(b as *const u8, c)?)),
- SYS_CLOSE => print!("close({})", b),
- SYS_DUP => print!("dup({}, {:?})",
- b,
- ByteStr(validate_slice(c as *const u8, d)?)),
- SYS_DUP2 => print!("dup2({}, {}, {:?})",
- b,
- c,
- ByteStr(validate_slice(d as *const u8, e)?)),
- // How to format second argument?
- SYS_READ => print!("read({}, {:?})",
- b,
- (c, d)),
- SYS_WRITE => print!("write({}, {:?})",
- b,
- (c, d)),
- SYS_LSEEK => print!("lseek({}, {}, {})", b, c as isize,
- match d {
- syscall::SEEK_SET => "SEEK_SET",
- syscall::SEEK_CUR => "SEEK_CUR",
- syscall::SEEK_END => "SEEK_END",
- _ => "UNKNOWN"
- }
- ),
- SYS_FCNTL => print!("fcntl({}, {}, 0x{:x})", b,
- match c {
- syscall::F_DUPFD => "F_DUPFD",
- syscall::F_GETFD => "F_GETFD",
- syscall::F_SETFD => "F_SETFD",
- syscall::F_SETFL => "F_SETFL",
- syscall::F_GETFL => "F_GETFL",
- _ => "UNKNOWN"
- }
- , d),
- SYS_FEVENT => print!("fevent({}, {})", b, c),
- SYS_FMAP => print!("fmap({}, {}, {})", b, c, d),
- SYS_FUNMAP => print!("funmap({})", b),
- // How to format second argument?
- SYS_FPATH => print!("fpath({}, ({}, {}))", b, c, d),
- // How to format second argument?
- SYS_FSTAT => print!("fstat({}, {:?}, {})", b,
- validate_slice(c as *const Stat, 1).map(|st| &st[0])?, d),
- // How to format second argument?
- SYS_FSTATVFS => print!("fstatvfs({}, ({}, {}))", b, c, d),
- SYS_FSYNC => print!("fsync({})", b),
- SYS_FTRUNCATE => print!("ftruncate({}, {})", b, c),
-
- SYS_BRK => print!("brk({})", b),
- SYS_CHDIR => print!("chdir({:?})",
- ByteStr(validate_slice(b as *const u8, c)?)),
- SYS_CLOCK_GETTIME => print!("clock_gettime({}, {:?})",
- b,
- validate_slice_mut(c as *mut TimeSpec, 1).map(|time| &mut time[0])?),
- SYS_CLONE => print!("clone({})", b),
- SYS_EXECVE => print!("execve({:?}, {:?})",
- ByteStr(validate_slice(b as *const u8, c)?),
- validate_slice(
- d as *const [usize; 2],
- e)?
- .iter()
- .map(|a|
- validate_slice(a[0] as *const u8, a[1]).ok()
- .and_then(|s| ::core::str::from_utf8(s).ok()))
- .collect::<Vec<Option<&str>>>()),
- SYS_EXIT => print!("exit({})", b),
- SYS_FUTEX => print!("futex(0x{:x} [{}], {}, {}, {}, {})", b, validate_slice_mut(b as *mut i32, 1).map(|uaddr| &mut uaddr[0])?, c, d, e, f),
- // How to format argument?
- SYS_GETCWD => print!("getcwd({:?})", b),
- SYS_GETEGID => print!("getgid()"),
- SYS_GETENS => print!("getens()"),
- SYS_GETEUID => print!("geteuid()"),
- SYS_GETGID => print!("getgid()"),
- SYS_GETNS => print!("getns()"),
- SYS_GETPID => print!("getpid()"),
- SYS_GETUID => print!("getuid()"),
- SYS_IOPL => print!("iopl({})", b),
- SYS_KILL => print!("kill({}, {})", b, c),
- SYS_SIGRETURN => print!("sigreturn()"),
- SYS_SIGACTION => print!("sigaction({}, 0x{:x}, 0x{:x}, 0x{:x})", b, c, d, e),
- SYS_MKNS => print!("mkns({:?})",
- validate_slice(b as *const [usize; 2], c)?),
- SYS_NANOSLEEP => print!("nanosleep({:?}, ({}, {}))",
- validate_slice(b as *const TimeSpec, 1),
- c,
- d),
- SYS_PHYSALLOC => print!("physalloc({})", b),
- SYS_PHYSFREE => print!("physfree({}, {})", b, c),
- SYS_PHYSMAP => print!("physmap({}, {}, {})", b, c, d),
- SYS_PHYSUNMAP => print!("physunmap({})", b),
- SYS_VIRTTOPHYS => print!("virttophys({})", b),
- SYS_PIPE2 => print!("pipe2({:?}, {})",
- validate_slice_mut(b as *mut usize, 2)?,
- c),
- SYS_SETREGID => print!("setregid({}, {})", b, c),
- SYS_SETRENS => print!("setrens({}, {})", b, c),
- SYS_SETREUID => print!("setreuid({}, {})", b, c),
- SYS_WAITPID => print!("waitpid({}, {}, {})", b, c, d),
- SYS_YIELD => print!("yield()"),
- _ => print!("INVALID CALL")
- }
-
- Ok(())
-}
--
GitLab