11#![ no_std]
2+ #![ no_main]
23#![ feature( abi_x86_interrupt) ]
4+ #![ feature( custom_test_frameworks) ]
5+ #![ test_runner( crate :: test_runner) ]
6+ #![ reexport_test_harness_main="test_main" ]
37
48extern crate alloc;
59
610use alloc:: string:: String ;
7- use core:: arch:: asm;
11+ use core:: { arch:: asm, panic :: PanicInfo } ;
812
913pub mod boot;
1014pub mod devices;
@@ -26,11 +30,13 @@ pub fn init() {
2630
2731 let mut vfs = fs:: vfs:: VFS :: new ( None ) ;
2832 fs:: ramfs:: init ( & mut vfs) ;
33+
2934 print_startup_message ( & mut vfs) ;
3035
31- let mut executor = crate :: task:: executor:: Executor :: new ( ) ;
32- let _ = executor. spawn ( crate :: task:: Task :: new ( devices:: keyboard:: trace_keypresses ( ) ) ) ;
33- executor. run ( ) ;
36+ // Issue#30: Commented out for now as the code doesn't run past this section. Will return it back.
37+ // let mut executor = crate::task::executor::Executor::new();
38+ // let _ = executor.spawn(crate::task::Task::new(devices::keyboard::trace_keypresses()));
39+ // executor.run();
3440
3541 //vfs.unmount_fs();
3642}
@@ -42,16 +48,16 @@ fn print_startup_message(vfs: &mut fs::vfs::VFS) -> [u8; 128] {
4248 Ok ( vnode) => match vfs. read_file ( & vnode, & mut buffer, 0 ) {
4349 Ok ( _bytes_read) => { }
4450 Err ( err) => {
45- error ! ( "Error reading file: {}\n " , err) ;
51+ error ! ( "Error reading file: {}" , err) ;
4652 }
4753 } ,
4854 Err ( err) => {
49- error ! ( "File not found: {}\n " , err) ;
55+ error ! ( "File not found: {}" , err) ;
5056 }
5157 }
5258
5359 info ! (
54- "Hexium OS kernel v{} succesfully initialized at {}\n " ,
60+ "Hexium OS kernel v{} succesfully initialized at {}" ,
5561 env!( "CARGO_PKG_VERSION" ) ,
5662 unsafe { rtc:: read_rtc( ) }
5763 ) ;
@@ -72,3 +78,64 @@ pub fn hlt_loop() -> ! {
7278 }
7379 }
7480}
81+
82+ pub fn test_panic_handler ( info : & PanicInfo ) -> ! {
83+ serial_println ! ( "[failed]" ) ;
84+ serial_println ! ( "Error: {}" , info) ;
85+ exit_qemu ( QemuExitCode :: Failed ) ;
86+ loop { }
87+ }
88+
89+ pub fn test_runner ( tests : & [ & dyn Testable ] ) {
90+ serial_println ! ( "Running {} tests" , tests. len( ) ) ;
91+
92+ for test in tests {
93+ test. run ( ) ;
94+ }
95+
96+ exit_qemu ( QemuExitCode :: Success ) ;
97+ }
98+
99+
100+ #[ derive( Debug , Clone , Copy , PartialEq , Eq ) ]
101+ #[ repr( u32 ) ]
102+ pub enum QemuExitCode {
103+ Success = 0x10 ,
104+ Failed = 0x11 ,
105+ }
106+
107+ pub fn exit_qemu ( exit_code : QemuExitCode ) {
108+ use x86_64:: instructions:: port:: Port ;
109+
110+ unsafe {
111+ let mut port = Port :: new ( 0xf4 ) ;
112+ port. write ( exit_code as u32 ) ;
113+ }
114+ }
115+
116+ pub trait Testable {
117+ fn run ( & self ) ;
118+ }
119+
120+ impl < T > Testable for T
121+ where T : Fn ( ) ,
122+ {
123+ fn run ( & self ) {
124+ serial_print ! ( "{}...\t " , core:: any:: type_name:: <T >( ) ) ;
125+ self ( ) ;
126+ serial_println ! ( "[ok]" ) ;
127+ }
128+ }
129+
130+ #[ cfg( test) ]
131+ #[ unsafe( no_mangle) ]
132+ unsafe extern "C" fn kmain ( ) -> ! {
133+ test_main ( ) ;
134+ loop { }
135+ }
136+
137+ #[ cfg( test) ]
138+ #[ panic_handler]
139+ fn panic ( info : & PanicInfo ) -> ! {
140+ test_panic_handler ( info)
141+ }
0 commit comments