All - Switch to panic_implementation

Kernel/Core/main.rs

@@ -23,6 +23,7 @@
 #![feature(integer_atomics)]	// AtomicU8
 #![feature(dropck_eyepatch)]
 #![feature(const_atomic_bool_new,const_atomic_ptr_new,const_atomic_usize_new,const_unsafe_cell_new,const_unique_new)]	// Various const fns
+#![feature(panic_implementation,panic_info_message)]
 
 #![no_std]
 

Kernel/Core/metadevs/video/mod.rs

@@ -93,7 +93,7 @@ fn init()
 // A picture of a sad ferris the crab
 // NOTE: Commented out, as uncompressed 32bpp is too large to fit in the image
 include!{"../../../../Graphics/.output/shared/panic.rs"}
-pub fn set_panic(file: &str, line: usize, message: ::core::fmt::Arguments)
+pub fn set_panic(file: &str, line: usize, message: &::core::fmt::Arguments)
 {
 	use core::sync::atomic::{AtomicBool, Ordering};
 	static LOOP_PREVENT: AtomicBool = AtomicBool::new(false);

Kernel/Core/unwind.rs

@@ -52,9 +52,27 @@ static EXCEPTION_CLASS : u64 = 0x544B3120_52757374;	// TK1 Rust (big endian)
 // */
 
 // Evil fail when doing unwind
-#[no_mangle] 
-#[lang = "panic_fmt"]
-pub extern "C" fn rust_begin_unwind(msg: ::core::fmt::Arguments, file: &'static str, line: usize) -> !
+#[panic_implementation]
+pub extern fn rust_begin_unwind(info: &::core::panic::PanicInfo) -> ! {
+	let file_line = match info.location()
+		{
+		Some(v) => (v.file(), v.line()),
+		None => ("", 0),
+		};
+	if let Some(m) = info.payload().downcast_ref::<::core::fmt::Arguments>() {
+		begin_panic_fmt(m, file_line)
+	}
+	else if let Some(m) = info.payload().downcast_ref::<&str>() {
+		begin_panic_fmt(&format_args!("{}", m), file_line)
+	}
+	else if let Some(m) = info.message() {
+		begin_panic_fmt(m, file_line)
+	}
+	else {
+		begin_panic_fmt(&format_args!("Unknown"), file_line)
+	}
+}
+fn begin_panic_fmt(msg: &::core::fmt::Arguments, (file, line): (&str, u32)) -> !
 {
 	static NESTED: ::core::sync::atomic::AtomicBool = ::core::sync::atomic::ATOMIC_BOOL_INIT;
 	::arch::puts("\nERROR: rust_begin_unwind: ");
@@ -68,7 +86,7 @@ pub extern "C" fn rust_begin_unwind(msg: ::core::fmt::Arguments, file: &'static
 	}
 	::arch::print_backtrace();
 	log_panic!("{}:{}: Panicked \"{:?}\"", file, line, msg);
-	::metadevs::video::set_panic(file, line, msg);
+	::metadevs::video::set_panic(file, line as usize, msg);
 	loop{}
 }
 #[lang="eh_personality"]

Usermode/libstd_rt/lib.rs

@@ -3,6 +3,7 @@
 //
 // Standard Library - Runtime support (aka unwind and panic)
 #![feature(lang_items)]	// Allow definition of lang_items
+#![feature(panic_implementation,panic_info_message)]
 #![feature(asm)]	// Used by backtrace code
 #![feature(const_fn)]	// HACK For debugging ARM unwind
 #![no_std]
@@ -45,10 +46,7 @@ mod arch;
 #[path="arch-armv8.rs"]
 mod arch;
 
-pub fn begin_panic<M: ::core::any::Any+Send+'static>(msg: M, file_line: &(&'static str, u32)) -> ! {
-	begin_unwind(msg, file_line)
-}
-pub fn begin_panic_fmt(msg: &::core::fmt::Arguments, file_line: &(&'static str, u32)) -> ! {
+fn begin_panic_fmt(msg: &::core::fmt::Arguments, file_line: (&str, u32)) -> ! {
 	// Spit out that log
 	kernel_log!("PANIC: {}:{}: {}", file_line.0, file_line.1, msg);
 	// - Backtrace
@@ -58,26 +56,26 @@ pub fn begin_panic_fmt(msg: &::core::fmt::Arguments, file_line: &(&'static str,
 	::syscalls::threads::exit(0xFFFF_FFFF);
 }
 
-pub fn begin_unwind<M: ::core::any::Any+Send+'static>(msg: M, file_line: &(&'static str, u32)) -> ! {
-	if let Some(m) = ::core::any::Any::downcast_ref::<::core::fmt::Arguments>(&msg) {
-		begin_panic_fmt(&format_args!("{}", m), file_line)
+#[panic_implementation]
+pub extern fn rust_begin_unwind(info: &::core::panic::PanicInfo) -> ! {
+	let file_line = match info.location()
+		{
+		Some(v) => (v.file(), v.line()),
+		None => ("", 0),
+		};
+	if let Some(m) = info.payload().downcast_ref::<::core::fmt::Arguments>() {
+		begin_panic_fmt(m, file_line)
 	}
-	else if let Some(m) = ::core::any::Any::downcast_ref::<&str>(&msg) {
+	else if let Some(m) = info.payload().downcast_ref::<&str>() {
 		begin_panic_fmt(&format_args!("{}", m), file_line)
 	}
+	else if let Some(m) = info.message() {
+		begin_panic_fmt(m, file_line)
+	}
 	else {
-		begin_panic_fmt(&format_args!("begin_unwind<{}>", type_name!(M)), file_line)
+		begin_panic_fmt(&format_args!("Unknown"), file_line)
 	}
 }
-pub fn begin_unwind_fmt(msg: ::core::fmt::Arguments, file_line: &(&'static str, u32)) -> ! {
-	begin_panic_fmt(&msg, file_line)
-}
-
-#[lang = "panic_fmt"]
-#[no_mangle]
-pub extern fn rust_begin_unwind(msg: ::core::fmt::Arguments, file: &'static str, line: usize) -> ! {
-	begin_panic_fmt(&msg, &(file, line as u32))
-}
 #[lang="eh_personality"]
 fn rust_eh_personality(
 	//version: isize, _actions: _Unwind_Action, _exception_class: u64,