Merge pull request #1 from rust-console/0.2

Updates to dependencies and Rust nightly

Author: parasyte

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rrt0"
-version = "0.1.3"
+version = "0.2.0"
 authors = ["Jay Oster <[email protected]>"]
 repository = "https://github.com/rust-console/rrt0"
 description = "Simple cross-platform runtime / startup (like crt0)"
@@ -11,4 +11,4 @@ keywords = ["crt0", "runtime", "startup", "nintendo", "n64"]
 edition = "2018"
 
 [dependencies]
-libm = "0.1"
+libm = "0.2"

src/lib.rs

@@ -1,3 +1,4 @@
+#![feature(core_intrinsics)]
 #![feature(global_asm)]
 #![feature(lang_items)]
 #![warn(rust_2018_idioms)]
@@ -7,16 +8,17 @@
 mod math;
 mod platforms;
 
-use core::panic::PanicInfo;
 pub use crate::platforms::*;
+use core::panic::PanicInfo;
 
 /// This is the executable start function, which directly follows the entry point.
 #[cfg_attr(not(test), lang = "start")]
 #[cfg(not(test))]
-extern "C" fn start<T>(user_main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize
+extern "C" fn start<T>(user_main: *const (), _argc: isize, _argv: *const *const u8) -> isize
 where
     T: Termination,
 {
+    let user_main: fn() -> T = unsafe { core::mem::transmute(user_main) };
     user_main().report() as isize
 }
 
@@ -37,11 +39,10 @@ impl Termination for () {
 #[cfg_attr(not(test), panic_handler)]
 #[no_mangle]
 fn panic(_info: &PanicInfo<'_>) -> ! {
-    #[allow(clippy::empty_loop)]
-    loop {}
+    core::intrinsics::abort();
 }
 
 /// Error handler personality language item (current no-op, to satisfy clippy).
 #[cfg_attr(not(test), lang = "eh_personality")]
 #[no_mangle]
-extern fn rust_eh_personality() {}
+extern "C" fn rust_eh_personality() {}

src/platforms.rs

@@ -1,8 +1,5 @@
 #[cfg(any(unix, windows, target_vendor = "nintendo64"))]
 pub use crate::math::*;
 
-#[cfg(any(unix, windows, target_vendor = "nintendo64"))]
-pub use libm::{F32Ext, F64Ext};
-
 #[cfg(target_vendor = "nintendo64")]
 global_asm!(include_str!("platforms/n64/entrypoint.s"));

src/platforms/n64/entrypoint.s

@@ -19,7 +19,8 @@
 
 _start:
     // Initialize stack
-    lw $t0, OS_MEM_SIZE
+    li $t0, OS_MEM_SIZE
+    lw $t0, 0($t0)
     li $t1, 0x7FFFFFF0
     addu $sp, $t0, $t1
 
@@ -46,7 +47,8 @@ _start:
 
     // Store the FS location for the OS
     la $t0, __rom_end
-    sw $t0, FS_START
+    li $t1, FS_START
+    sw $t0, 0($t1)
 
     // So if we want to get fancy, we can load a second stage here.
     // The second stage should contain an ELF parser and TLB Initialization.