userland: merge aero_rt into aero_std

Author: 48cf

userland/Cargo.lock

@@ -5,7 +5,6 @@ authors = ["czapek1337 <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-aero_rt = { path = "../aero_rt" }
 aero_syscall = { path = "../../src/aero_syscall" }
 linked_list_allocator = "0.9"
 spin = "0.9"

userland/aero_rt/Cargo.toml

@@ -17,15 +17,18 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#![feature(alloc_error_handler, prelude_import)]
+#![feature(alloc_error_handler, lang_items, never_type, prelude_import, start)]
 #![no_std]
 
-extern crate aero_rt;
 extern crate alloc;
 
 pub mod heap;
 pub mod io;
 pub mod prelude;
+pub mod process;
+
+use aero_syscall::*;
+use process::Termination;
 
 #[prelude_import]
 pub use prelude::rust_2021::*;
@@ -68,3 +71,32 @@ fn panic_handler(info: &core::panic::PanicInfo) -> ! {
 fn alloc_error_handler(layout: alloc::alloc::Layout) -> ! {
     panic!("Failed allocating memory with layout: {:?}", layout)
 }
+
+#[no_mangle]
+unsafe extern "C" fn _start(argc: isize, argv: *const *const u8) -> ! {
+    extern "C" {
+        fn main(_argc: isize, _argv: *const *const u8) -> isize;
+    }
+
+    sys_exit(main(argc, argv) as usize);
+}
+
+#[lang = "start"]
+fn lang_start<T: Termination + 'static>(
+    main: fn() -> T,
+    _argc: isize,
+    _argv: *const *const u8,
+) -> isize {
+    main().report() as _
+}
+
+#[lang = "eh_personality"]
+fn eh_personality() -> ! {
+    unreachable!();
+}
+
+#[no_mangle]
+#[allow(non_snake_case)]
+fn _Unwind_Resume() -> ! {
+    unreachable!();
+}

userland/aero_rt/src/lib.rs

@@ -0,0 +1,39 @@
+use core::fmt::Debug;
+
+#[lang = "termination"]
+pub trait Termination {
+    fn report(self) -> i32;
+}
+
+impl Termination for () {
+    fn report(self) -> i32 {
+        0
+    }
+}
+
+impl Termination for ! {
+    fn report(self) -> i32 {
+        unreachable!()
+    }
+}
+
+impl<E: Debug> Termination for Result<(), E> {
+    fn report(self) -> i32 {
+        match self {
+            Ok(()) => 0,
+            Err(err) => Err::<!, _>(err).report(),
+        }
+    }
+}
+
+impl<E: Debug> Termination for Result<!, E> {
+    fn report(self) -> i32 {
+        match self {
+            Ok(_) => unreachable!(),
+            Err(err) => {
+                println!("Error: {:?}", err);
+                1
+            }
+        }
+    }
+}