Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

psx: Updates to panic info for 1.81.0 (~Jun 2024) #31

Merged
merged 3 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</p>

This is a basic SDK to run custom Rust code on a PlayStation 1. It works with
Rust nightly version equal to or later than `2022-11-04`. Use
Rust nightly version equal to or later than `2024-08-23`. Use
[`rustup`](https://www.rust-lang.org/) to install the rust toolchain as follows.

```
Expand Down
2 changes: 0 additions & 2 deletions psx/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
)]
// Used to implement `ImplsAsCStr` trait
#![feature(min_specialization)]
// For the panic handler
#![feature(panic_info_message)]
// For global_asm! on MIPS
#![feature(asm_experimental_arch)]
// For `__start`'s return type
Expand Down
8 changes: 2 additions & 6 deletions psx/src/panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ fn min_panic(info: &core::panic::PanicInfo) {
println!("Panicked at unknown location")
},
}
if let Some(msg) = info.message() {
println!("{}", msg)
}
println!("{}", info.message());
}

fn normal_panic(info: &core::panic::PanicInfo) {
Expand All @@ -70,9 +68,7 @@ fn normal_panic(info: &core::panic::PanicInfo) {
dprintln!(txt, "Panicked at unknown location");
},
}
if let Some(msg) = info.message() {
dprintln!(txt, "{}", msg);
}
dprintln!(txt, "{}", info.message());
fb.draw_sync();
fb.wait_vblank();
fb.swap();
Expand Down
Loading