From 77c84eb66cefde656cc74865bee2e3bc7a24245a Mon Sep 17 00:00:00 2001 From: Valentin Date: Sun, 10 Jun 2018 14:01:36 +0200 Subject: [PATCH] Fixes according to Fenrir's review --- ctr-std/src/Cargo.toml | 51 ------------------ ctr-std/src/build.rs | 109 --------------------------------------- ctr-std/src/panicking.rs | 36 +++++++++---- ctr-std/src/path.rs | 3 ++ 4 files changed, 30 insertions(+), 169 deletions(-) delete mode 100644 ctr-std/src/Cargo.toml delete mode 100644 ctr-std/src/build.rs diff --git a/ctr-std/src/Cargo.toml b/ctr-std/src/Cargo.toml deleted file mode 100644 index 1201759..0000000 --- a/ctr-std/src/Cargo.toml +++ /dev/null @@ -1,51 +0,0 @@ -[package] -authors = ["The Rust Project Developers"] -name = "std" -version = "0.0.0" -build = "build.rs" -license = "MIT/Apache-2.0" -repository = "https://github.com/rust-lang/rust.git" -description = "The Rust Standard Library" - -[lib] -name = "std" -path = "lib.rs" -crate-type = ["dylib", "rlib"] - -[dependencies] -alloc = { path = "../liballoc" } -alloc_jemalloc = { path = "../liballoc_jemalloc", optional = true } -alloc_system = { path = "../liballoc_system" } -panic_unwind = { path = "../libpanic_unwind", optional = true } -panic_abort = { path = "../libpanic_abort" } -core = { path = "../libcore" } -libc = { path = "../rustc/libc_shim" } -compiler_builtins = { path = "../rustc/compiler_builtins_shim" } -profiler_builtins = { path = "../libprofiler_builtins", optional = true } -std_unicode = { path = "../libstd_unicode" } -unwind = { path = "../libunwind" } - -[dev-dependencies] -rand = "0.4" - -[target.x86_64-apple-darwin.dependencies] -rustc_asan = { path = "../librustc_asan" } -rustc_tsan = { path = "../librustc_tsan" } - -[target.x86_64-unknown-linux-gnu.dependencies] -rustc_asan = { path = "../librustc_asan" } -rustc_lsan = { path = "../librustc_lsan" } -rustc_msan = { path = "../librustc_msan" } -rustc_tsan = { path = "../librustc_tsan" } - -[build-dependencies] -build_helper = { path = "../build_helper" } - -[features] -backtrace = [] -debug-jemalloc = ["alloc_jemalloc/debug"] -jemalloc = ["alloc_jemalloc"] -force_alloc_system = [] -panic-unwind = ["panic_unwind"] -profiler = ["profiler_builtins"] -wasm_syscall = [] diff --git a/ctr-std/src/build.rs b/ctr-std/src/build.rs deleted file mode 100644 index 6652ff9..0000000 --- a/ctr-std/src/build.rs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright 2015 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#![deny(warnings)] - -extern crate build_helper; - -use std::env; -use std::process::Command; -use build_helper::{run, native_lib_boilerplate}; - -fn main() { - let target = env::var("TARGET").expect("TARGET was not set"); - let host = env::var("HOST").expect("HOST was not set"); - if cfg!(feature = "backtrace") && - !target.contains("cloudabi") && - !target.contains("emscripten") && - !target.contains("fuchsia") && - !target.contains("msvc") && - !target.contains("wasm32") - { - let _ = build_libbacktrace(&host, &target); - } - - if target.contains("linux") { - if target.contains("android") { - println!("cargo:rustc-link-lib=dl"); - println!("cargo:rustc-link-lib=log"); - println!("cargo:rustc-link-lib=gcc"); - } else if !target.contains("musl") { - println!("cargo:rustc-link-lib=dl"); - println!("cargo:rustc-link-lib=rt"); - println!("cargo:rustc-link-lib=pthread"); - } - } else if target.contains("freebsd") { - println!("cargo:rustc-link-lib=execinfo"); - println!("cargo:rustc-link-lib=pthread"); - } else if target.contains("dragonfly") || target.contains("bitrig") || - target.contains("netbsd") || target.contains("openbsd") { - println!("cargo:rustc-link-lib=pthread"); - } else if target.contains("solaris") { - println!("cargo:rustc-link-lib=socket"); - println!("cargo:rustc-link-lib=posix4"); - println!("cargo:rustc-link-lib=pthread"); - println!("cargo:rustc-link-lib=resolv"); - } else if target.contains("apple-darwin") { - println!("cargo:rustc-link-lib=System"); - - // res_init and friends require -lresolv on macOS/iOS. - // See #41582 and http://blog.achernya.com/2013/03/os-x-has-silly-libsystem.html - println!("cargo:rustc-link-lib=resolv"); - } else if target.contains("apple-ios") { - println!("cargo:rustc-link-lib=System"); - println!("cargo:rustc-link-lib=objc"); - println!("cargo:rustc-link-lib=framework=Security"); - println!("cargo:rustc-link-lib=framework=Foundation"); - println!("cargo:rustc-link-lib=resolv"); - } else if target.contains("windows") { - println!("cargo:rustc-link-lib=advapi32"); - println!("cargo:rustc-link-lib=ws2_32"); - println!("cargo:rustc-link-lib=userenv"); - println!("cargo:rustc-link-lib=shell32"); - } else if target.contains("fuchsia") { - // use system-provided libbacktrace - if cfg!(feature = "backtrace") { - println!("cargo:rustc-link-lib=backtrace"); - } - println!("cargo:rustc-link-lib=zircon"); - println!("cargo:rustc-link-lib=fdio"); - println!("cargo:rustc-link-lib=launchpad"); // for std::process - } else if target.contains("cloudabi") { - if cfg!(feature = "backtrace") { - println!("cargo:rustc-link-lib=unwind"); - } - println!("cargo:rustc-link-lib=c"); - println!("cargo:rustc-link-lib=compiler_rt"); - } -} - -fn build_libbacktrace(host: &str, target: &str) -> Result<(), ()> { - let native = native_lib_boilerplate("libbacktrace", "libbacktrace", "backtrace", ".libs")?; - let cflags = env::var("CFLAGS").unwrap_or_default() + " -fvisibility=hidden -O2"; - - run(Command::new("sh") - .current_dir(&native.out_dir) - .arg(native.src_dir.join("configure").to_str().unwrap() - .replace("C:\\", "/c/") - .replace("\\", "/")) - .arg("--with-pic") - .arg("--disable-multilib") - .arg("--disable-shared") - .arg("--disable-host-shared") - .arg(format!("--host={}", build_helper::gnu_target(target))) - .arg(format!("--build={}", build_helper::gnu_target(host))) - .env("CFLAGS", cflags)); - - run(Command::new(build_helper::make(host)) - .current_dir(&native.out_dir) - .arg(format!("INCDIR={}", native.src_dir.display())) - .arg("-j").arg(env::var("NUM_JOBS").expect("NUM_JOBS was not set"))); - Ok(()) -} diff --git a/ctr-std/src/panicking.rs b/ctr-std/src/panicking.rs index 4030562..ad0a337 100644 --- a/ctr-std/src/panicking.rs +++ b/ctr-std/src/panicking.rs @@ -76,9 +76,7 @@ static mut HOOK: Hook = Hook::Default; /// is invoked. As such, the hook will run with both the aborting and unwinding /// runtimes. The default hook prints a message to standard error and generates /// a backtrace if requested, but this behavior can be customized with the -/// `set_hook` and [`take_hook`] functions. -/// -/// [`take_hook`]: ./fn.take_hook.html +/// `set_hook` and `take_hook` functions. /// /// The hook is provided with a `PanicInfo` struct which contains information /// about the origin of the panic, including the payload passed to `panic!` and @@ -123,10 +121,6 @@ pub fn set_hook(hook: Box) { /// Unregisters the current panic hook, returning it. /// -/// *See also the function [`set_hook`].* -/// -/// [`set_hook`]: ./fn.set_hook.html -/// /// If no custom hook is registered, the default hook will be returned. /// /// # Panics @@ -197,9 +191,33 @@ fn default_hook(info: &PanicInfo) { let thread = thread_info::current_thread(); let name = thread.as_ref().and_then(|t| t.name()).unwrap_or(""); + // 3DS-specific code begins here to display panics via the Error applet + use libctru::{errorInit, errorText, errorDisp, errorConf, ERROR_TEXT_WORD_WRAP, + CFG_LANGUAGE_EN, consoleDebugInit, debugDevice_SVC}; + + let error_text = format!("thread '{}' panicked at '{}', {}", name, msg, location); + + unsafe { + // Prepare error message for display + let mut error_conf: errorConf = mem::uninitialized(); + errorInit(&mut error_conf, + ERROR_TEXT_WORD_WRAP, + CFG_LANGUAGE_EN); + errorText(&mut error_conf, error_text.as_ptr() as *const ::libc::c_char); + + // Display the error + errorDisp(&mut error_conf); + } + + // Let's also write to stderr using the debug console. The output will be + // visible in Citra if a custom logging filter such as `Debug.Emulated:Debug` + // is enabled in the logging section of `~/.config/citra-emu/sdl2-config.ini` + unsafe { + consoleDebugInit(debugDevice_SVC); + } + let write = |err: &mut ::io::Write| { - let _ = writeln!(err, "thread '{}' panicked at '{}', {}", - name, msg, location); + let _ = write!(err, "{}", error_text); #[cfg(feature = "backtrace")] { diff --git a/ctr-std/src/path.rs b/ctr-std/src/path.rs index 696711a..861c7dd 100644 --- a/ctr-std/src/path.rs +++ b/ctr-std/src/path.rs @@ -201,6 +201,9 @@ impl<'a> Prefix<'a> { os_str_as_u8_slice(s).len() } match *self { + #[cfg(target_os = "horizon")] + Verbatim(x) => 1 + os_str_len(x), + #[cfg(target_os = "windows")] Verbatim(x) => 4 + os_str_len(x), VerbatimUNC(x, y) => { 8 + os_str_len(x) +