From 67aa3a01450bc7282b1ad1cea84ae9bdfa9dcd8b Mon Sep 17 00:00:00 2001 From: WangRunji Date: Sun, 6 May 2018 11:49:45 +0800 Subject: [PATCH] Call ucore cprintf --- src/c_interface.rs | 10 ++++++++-- ucore.json | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/c_interface.rs b/src/c_interface.rs index f18553c..03b42cb 100644 --- a/src/c_interface.rs +++ b/src/c_interface.rs @@ -35,7 +35,8 @@ mod ucore { pub fn inode_init(inode: &mut INode, ops: &INodeOps, fs: &mut Fs); pub fn inode_kill(inode: &mut INode); pub fn __alloc_fs(type_: i32) -> *mut Fs; - pub fn __panic(file: *const u8, line: i32, fmt: *const u8); + pub fn __panic(file: *const u8, line: i32, fmt: *const u8, ...); + pub fn cprintf(fmt: *const u8, ...); fn cputchar(c: i32); } pub const SFS_TYPE: i32 = 0; // TODO @@ -46,6 +47,11 @@ mod ucore { } } +macro_rules! cprintf { + ($fmt:expr) => (unsafe{ ::c_interface::ucore::cprintf(concat!($fmt, "\0").as_ptr()); }); + ($fmt:expr, $($arg:tt)*) => (unsafe{ ::c_interface::ucore::cprintf(concat!($fmt, "\0").as_ptr(), $($arg)*); }); +} + // Exports for ucore static SFS_INODE_OPS: INodeOps = INodeOps::from_rust_inode::(); @@ -54,8 +60,8 @@ static SFS_INODE_OPS: INodeOps = INodeOps::from_rust_inode::(); #[no_mangle] pub extern fn sfs_do_mount(dev: *mut Device, fs_store: &mut *mut Fs) -> ErrorCode { use self::ucore::*; - panic!("sfs_do_mount"); let fs = unsafe{__alloc_fs(SFS_TYPE)}; + cprintf!("fs @ %x\n", fs); let device = unsafe{ Box::from_raw(dev) }; // TODO: fix unsafe unsafe{&mut (*fs)}.fs = sfs::SimpleFileSystem::open(device).unwrap(); *fs_store = fs; diff --git a/ucore.json b/ucore.json index 9fccee8..f3036d7 100644 --- a/ucore.json +++ b/ucore.json @@ -11,6 +11,7 @@ "linker-flavor": "ld", "pre-link-args": ["-m32"], "eliminate-frame-pointer": false, + "no-compiler-rt": true, "morestack": false, "panic-strategy": "abort" } \ No newline at end of file