From 0eab94872833e68521ba28392bebe5172ad64036 Mon Sep 17 00:00:00 2001 From: wwylele Date: Fri, 29 Jun 2018 16:56:12 +0300 Subject: [PATCH] reformat all files with clang-format --- src/audio_core/hle/hle.cpp | 9 +- src/audio_core/hle/mixers.cpp | 2 +- src/audio_core/hle/source.cpp | 24 +- src/audio_core/sdl2_sink.cpp | 2 +- src/citra/citra.cpp | 12 +- src/citra/emu_window/emu_window_sdl2.cpp | 4 +- src/citra_qt/main.cpp | 4 +- src/citra_qt/updater/updater.cpp | 2 +- src/common/assert.h | 5 +- src/common/chunk_file.h | 8 +- src/common/file_util.cpp | 12 +- src/common/logging/filter.cpp | 2 +- src/common/logging/log.h | 14 +- .../arm/dyncom/arm_dyncom_interpreter.cpp | 20 +- src/core/arm/skyeye_common/armstate.cpp | 2 +- src/core/arm/skyeye_common/vfp/vfp.cpp | 2 +- src/core/arm/skyeye_common/vfp/vfpdouble.cpp | 16 +- src/core/arm/skyeye_common/vfp/vfpsingle.cpp | 10 +- src/core/core.cpp | 4 +- src/core/file_sys/archive_ncch.cpp | 19 +- src/core/file_sys/archive_sdmc.cpp | 2 +- src/core/file_sys/archive_selfncch.cpp | 6 +- src/core/file_sys/ivfc_archive.cpp | 13 +- src/core/file_sys/ncch_container.cpp | 17 +- src/core/file_sys/savedata_archive.cpp | 2 +- src/core/file_sys/title_metadata.cpp | 10 +- src/core/gdbstub/gdbstub.cpp | 8 +- src/core/hle/kernel/memory.cpp | 10 +- src/core/hle/kernel/shared_memory.cpp | 8 +- src/core/hle/kernel/svc.cpp | 43 ++- src/core/hle/kernel/thread.cpp | 4 +- src/core/hle/kernel/vm_manager.cpp | 10 +- src/core/hle/service/ac/ac.cpp | 4 +- src/core/hle/service/am/am.cpp | 16 +- src/core/hle/service/apt/applet_manager.cpp | 8 +- src/core/hle/service/apt/apt.cpp | 67 +++-- src/core/hle/service/boss/boss.cpp | 257 +++++++++--------- src/core/hle/service/cam/cam.cpp | 56 ++-- src/core/hle/service/cfg/cfg.cpp | 10 +- src/core/hle/service/dsp_dsp.cpp | 28 +- src/core/hle/service/err_f.cpp | 25 +- src/core/hle/service/fs/archive.cpp | 21 +- src/core/hle/service/fs/fs_user.cpp | 78 +++--- src/core/hle/service/gsp/gsp_gpu.cpp | 28 +- src/core/hle/service/ir/extra_hid.cpp | 8 +- src/core/hle/service/ir/ir_user.cpp | 13 +- src/core/hle/service/ldr_ro/cro_helper.cpp | 35 ++- src/core/hle/service/ldr_ro/ldr_ro.cpp | 25 +- src/core/hle/service/mic_u.cpp | 13 +- src/core/hle/service/ndm/ndm_u.cpp | 2 +- src/core/hle/service/nwm/nwm_uds.cpp | 18 +- src/core/hle/service/ptm/ptm.cpp | 10 +- src/core/hle/service/service.cpp | 5 +- src/core/hle/service/sm/srv.cpp | 10 +- src/core/hle/service/y2r_u.cpp | 62 ++--- src/core/hw/gpu.cpp | 39 ++- src/core/hw/hw.cpp | 2 +- src/core/hw/lcd.cpp | 3 +- src/core/loader/3dsx.cpp | 6 +- src/core/loader/elf.cpp | 10 +- src/core/memory.cpp | 24 +- src/core/movie.cpp | 26 +- src/network/room.cpp | 8 +- src/video_core/command_processor.cpp | 14 +- src/video_core/debug_utils/debug_utils.cpp | 10 +- .../renderer_opengl/gl_rasterizer.cpp | 7 +- .../renderer_opengl/gl_rasterizer_cache.cpp | 2 +- .../renderer_opengl/gl_shader_decompiler.cpp | 12 +- .../renderer_opengl/gl_shader_gen.cpp | 8 +- .../renderer_opengl/gl_shader_util.cpp | 2 +- .../renderer_opengl/renderer_opengl.cpp | 8 +- src/video_core/shader/shader.cpp | 16 +- src/video_core/shader/shader_interpreter.cpp | 12 +- .../shader/shader_jit_x64_compiler.cpp | 2 +- src/video_core/swrasterizer/framebuffer.cpp | 10 +- src/video_core/swrasterizer/lighting.cpp | 2 +- src/video_core/swrasterizer/rasterizer.cpp | 6 +- src/video_core/vertex_loader.cpp | 19 +- src/web_service/web_backend.cpp | 13 +- 79 files changed, 659 insertions(+), 707 deletions(-) diff --git a/src/audio_core/hle/hle.cpp b/src/audio_core/hle/hle.cpp index 476980668..5d39d7b43 100644 --- a/src/audio_core/hle/hle.cpp +++ b/src/audio_core/hle/hle.cpp @@ -127,7 +127,7 @@ void DspHle::Impl::PipeWrite(DspPipe pipe_number, const std::vector& buffer) case DspPipe::Audio: { if (buffer.size() != 4) { LOG_ERROR(Audio_DSP, "DspPipe::Audio: Unexpected buffer length {} was written", - buffer.size()); + buffer.size()); return; } @@ -168,8 +168,8 @@ void DspHle::Impl::PipeWrite(DspPipe pipe_number, const std::vector& buffer) break; default: LOG_ERROR(Audio_DSP, - "Application has requested unknown state transition of DSP hardware {}", - buffer[0]); + "Application has requested unknown state transition of DSP hardware {}", + buffer[0]); dsp_state = DspState::Off; break; } @@ -177,8 +177,7 @@ void DspHle::Impl::PipeWrite(DspPipe pipe_number, const std::vector& buffer) return; } default: - LOG_CRITICAL(Audio_DSP, "pipe_number = {} unimplemented", - static_cast(pipe_number)); + LOG_CRITICAL(Audio_DSP, "pipe_number = {} unimplemented", static_cast(pipe_number)); UNIMPLEMENTED(); return; } diff --git a/src/audio_core/hle/mixers.cpp b/src/audio_core/hle/mixers.cpp index c8175d58e..1f1f23364 100644 --- a/src/audio_core/hle/mixers.cpp +++ b/src/audio_core/hle/mixers.cpp @@ -69,7 +69,7 @@ void Mixers::ParseConfig(DspConfiguration& config) { config.output_format_dirty.Assign(0); state.output_format = config.output_format; LOG_TRACE(Audio_DSP, "mixers output_format = {}", - static_cast(config.output_format)); + static_cast(config.output_format)); } if (config.headphones_connected_dirty) { diff --git a/src/audio_core/hle/source.cpp b/src/audio_core/hle/source.cpp index 0930230e8..d2ef898b6 100644 --- a/src/audio_core/hle/source.cpp +++ b/src/audio_core/hle/source.cpp @@ -82,7 +82,7 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config, if (state.rate_multiplier <= 0) { LOG_ERROR(Audio_DSP, "Was given an invalid rate multiplier: source_id={} rate={}", - source_id, state.rate_multiplier); + source_id, state.rate_multiplier); state.rate_multiplier = 1.0f; // Note: Actual firmware starts producing garbage if this occurs. } @@ -122,7 +122,7 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config, state.filters.Enable(config.simple_filter_enabled.ToBool(), config.biquad_filter_enabled.ToBool()); LOG_TRACE(Audio_DSP, "source_id={} enable_simple={} enable_biquad={}", source_id, - config.simple_filter_enabled.Value(), config.biquad_filter_enabled.Value()); + config.simple_filter_enabled.Value(), config.biquad_filter_enabled.Value()); } if (config.simple_filter_dirty) { @@ -141,21 +141,21 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config, config.interpolation_dirty.Assign(0); state.interpolation_mode = config.interpolation_mode; LOG_TRACE(Audio_DSP, "source_id={} interpolation_mode={}", source_id, - static_cast(state.interpolation_mode)); + static_cast(state.interpolation_mode)); } if (config.format_dirty || config.embedded_buffer_dirty) { config.format_dirty.Assign(0); state.format = config.format; LOG_TRACE(Audio_DSP, "source_id={} format={}", source_id, - static_cast(state.format)); + static_cast(state.format)); } if (config.mono_or_stereo_dirty || config.embedded_buffer_dirty) { config.mono_or_stereo_dirty.Assign(0); state.mono_or_stereo = config.mono_or_stereo; LOG_TRACE(Audio_DSP, "source_id={} mono_or_stereo={}", source_id, - static_cast(state.mono_or_stereo)); + static_cast(state.mono_or_stereo)); } u32_dsp play_position = {}; @@ -183,14 +183,14 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config, false, }); LOG_TRACE(Audio_DSP, "enqueuing embedded addr={:#010x} len={} id={} start={}", - config.physical_address, config.length, config.buffer_id, - static_cast(config.play_position)); + config.physical_address, config.length, config.buffer_id, + static_cast(config.play_position)); } if (config.loop_related_dirty && config.loop_related != 0) { config.loop_related_dirty.Assign(0); LOG_WARNING(Audio_DSP, "Unhandled complex loop with loop_related={:#010x}", - static_cast(config.loop_related)); + static_cast(config.loop_related)); } if (config.buffer_queue_dirty) { @@ -213,7 +213,7 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config, false, }); LOG_TRACE(Audio_DSP, "enqueuing queued {} addr={:#010x} len={} id={}", i, - b.physical_address, b.length, b.buffer_id); + b.physical_address, b.length, b.buffer_id); } } config.buffers_dirty = 0; @@ -305,8 +305,8 @@ bool Source::DequeueBuffer() { } } else { LOG_WARNING(Audio_DSP, - "source_id={} buffer_id={} length={}: Invalid physical address {:#010x}", - source_id, buf.buffer_id, buf.length, buf.physical_address); + "source_id={} buffer_id={} length={}: Invalid physical address {:#010x}", + source_id, buf.buffer_id, buf.length, buf.physical_address); state.current_buffer.clear(); return true; } @@ -323,7 +323,7 @@ bool Source::DequeueBuffer() { } LOG_TRACE(Audio_DSP, "source_id={} buffer_id={} from_queue={} current_buffer.size()={}", - source_id, buf.buffer_id, buf.from_queue, state.current_buffer.size()); + source_id, buf.buffer_id, buf.from_queue, state.current_buffer.size()); return true; } diff --git a/src/audio_core/sdl2_sink.cpp b/src/audio_core/sdl2_sink.cpp index 383dbe00b..c3fba3b84 100644 --- a/src/audio_core/sdl2_sink.cpp +++ b/src/audio_core/sdl2_sink.cpp @@ -59,7 +59,7 @@ SDL2Sink::SDL2Sink() : impl(std::make_unique()) { device, false, &desired_audiospec, &obtained_audiospec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE); if (impl->audio_device_id <= 0) { LOG_CRITICAL(Audio_Sink, "SDL_OpenAudioDevice failed with code {} for device \"{}\"", - impl->audio_device_id, Settings::values.audio_device_id); + impl->audio_device_id, Settings::values.audio_device_id); return; } diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index fb6171765..08a05c558 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -92,7 +92,7 @@ static void OnStateChanged(const Network::RoomMember::State& state) { break; case Network::RoomMember::State::MacCollision: LOG_ERROR(Network, "You tried to use the same MAC-Address then another user that is " - "connected to the Room"); + "connected to the Room"); exit(1); break; case Network::RoomMember::State::WrongPassword: @@ -101,7 +101,7 @@ static void OnStateChanged(const Network::RoomMember::State& state) { break; case Network::RoomMember::State::WrongVersion: LOG_ERROR(Network, - "You are using a different version then the room you are trying to connect to"); + "You are using a different version then the room you are trying to connect to"); exit(1); break; default: @@ -288,9 +288,9 @@ int main(int argc, char** argv) { return -1; case Core::System::ResultStatus::ErrorLoader_ErrorEncrypted: LOG_CRITICAL(Frontend, "The game that you are trying to load must be decrypted before " - "being used with Citra. \n\n For more information on dumping and " - "decrypting games, please refer to: " - "https://citra-emu.org/wiki/dumping-game-cartridges/"); + "being used with Citra. \n\n For more information on dumping and " + "decrypting games, please refer to: " + "https://citra-emu.org/wiki/dumping-game-cartridges/"); return -1; case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported."); @@ -315,7 +315,7 @@ int main(int argc, char** argv) { member->BindOnChatMessageRecieved(OnMessageReceived); member->BindOnStateChanged(OnStateChanged); LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port, - nickname); + nickname); member->Join(nickname, address.c_str(), port, 0, Network::NoPreferredMac, password); } else { LOG_ERROR(Network, "Could not access RoomMember"); diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 60063b6be..651f290a4 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -134,8 +134,8 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) { OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); SDL_PumpEvents(); SDL_GL_SetSwapInterval(Settings::values.use_vsync); - LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, - Common::g_scm_branch, Common::g_scm_desc); + LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + Common::g_scm_desc); DoneCurrent(); } diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 7c3c37e12..ff16a0006 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -137,8 +137,8 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { ConnectWidgetEvents(); SetupUIStrings(); - LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, - Common::g_scm_branch, Common::g_scm_desc); + LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + Common::g_scm_desc); show(); diff --git a/src/citra_qt/updater/updater.cpp b/src/citra_qt/updater/updater.cpp index 53c81a613..73579b9d5 100644 --- a/src/citra_qt/updater/updater.cpp +++ b/src/citra_qt/updater/updater.cpp @@ -276,7 +276,7 @@ void UpdaterPrivate::LaunchWithArguments(const QStringList& args) { if (!QProcess::startDetached(tool_info.absoluteFilePath(), args, tool_info.absolutePath())) { LOG_WARNING(Frontend, "Unable to start program {}", - tool_info.absoluteFilePath().toStdString()); + tool_info.absoluteFilePath().toStdString()); } } diff --git a/src/common/assert.h b/src/common/assert.h index 252a4dfbe..5c479f501 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -30,15 +30,14 @@ __declspec(noinline, noreturn) #define ASSERT(_a_) \ do \ if (!(_a_)) { \ - assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); }); \ + assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); }); \ } \ while (0) #define ASSERT_MSG(_a_, ...) \ do \ if (!(_a_)) { \ - assert_noinline_call( \ - [&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ + assert_noinline_call([&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ } \ while (0) diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index a7bbe9f8a..2793edbbe 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -160,7 +160,7 @@ public: if (error == ERROR_FAILURE || foundVersion < minVer || foundVersion > ver) { LOG_ERROR(Common, "Savestate failure: wrong version {} found for {}", foundVersion, - title); + title); SetError(ERROR_FAILURE); return PointerWrapSection(*this, -1, title); } @@ -608,9 +608,9 @@ public: Do(cookie); if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) { LOG_ERROR(Common, - "After \"{}\", found {} ({:#X}) instead of save marker {} ({:#X}). " - "Aborting savestate load...", - prevName, cookie, cookie, arbitraryNumber, arbitraryNumber); + "After \"{}\", found {} ({:#X}) instead of save marker {} ({:#X}). " + "Aborting savestate load...", + prevName, cookie, cookie, arbitraryNumber, arbitraryNumber); SetError(ERROR_FAILURE); } } diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index f2b967e03..ac32a1fc6 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -257,7 +257,7 @@ bool Rename(const std::string& srcFilename, const std::string& destFilename) { return true; #endif LOG_ERROR(Common_Filesystem, "failed {} --> {}: {}", srcFilename, destFilename, - GetLastErrorMsg()); + GetLastErrorMsg()); return false; } @@ -270,7 +270,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename) { return true; LOG_ERROR(Common_Filesystem, "failed {} --> {}: {}", srcFilename, destFilename, - GetLastErrorMsg()); + GetLastErrorMsg()); return false; #else @@ -283,7 +283,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename) { FILE* input = fopen(srcFilename.c_str(), "rb"); if (!input) { LOG_ERROR(Common_Filesystem, "opening input failed {} --> {}: {}", srcFilename, - destFilename, GetLastErrorMsg()); + destFilename, GetLastErrorMsg()); return false; } @@ -292,7 +292,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename) { if (!output) { fclose(input); LOG_ERROR(Common_Filesystem, "opening output failed {} --> {}: {}", srcFilename, - destFilename, GetLastErrorMsg()); + destFilename, GetLastErrorMsg()); return false; } @@ -303,7 +303,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename) { if (rnum != BSIZE) { if (ferror(input) != 0) { LOG_ERROR(Common_Filesystem, "failed reading from source, {} --> {}: {}", - srcFilename, destFilename, GetLastErrorMsg()); + srcFilename, destFilename, GetLastErrorMsg()); goto bail; } } @@ -312,7 +312,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename) { size_t wnum = fwrite(buffer, sizeof(char), rnum, output); if (wnum != rnum) { LOG_ERROR(Common_Filesystem, "failed writing to output, {} --> {}: {}", srcFilename, - destFilename, GetLastErrorMsg()); + destFilename, GetLastErrorMsg()); goto bail; } } diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp index 47bd3a01d..4e783a577 100644 --- a/src/common/logging/filter.cpp +++ b/src/common/logging/filter.cpp @@ -66,7 +66,7 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin, auto level_separator = std::find(begin, end, ':'); if (level_separator == end) { LOG_ERROR(Log, "Invalid log filter. Must specify a log level after `:`: {}", - std::string(begin, end)); + std::string(begin, end)); return false; } diff --git a/src/common/logging/log.h b/src/common/logging/log.h index 4910f5fed..31ba5beae 100644 --- a/src/common/logging/log.h +++ b/src/common/logging/log.h @@ -113,29 +113,29 @@ void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsig } // namespace Log // Define the fmt lib macros -#define LOG_GENERIC(log_class, log_level, ...) \ +#define LOG_GENERIC(log_class, log_level, ...) \ ::Log::FmtLogMessage(log_class, log_level, __FILE__, __LINE__, __func__, __VA_ARGS__) #ifdef _DEBUG -#define LOG_TRACE(log_class, ...) \ +#define LOG_TRACE(log_class, ...) \ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Trace, __FILE__, __LINE__, \ __func__, __VA_ARGS__) #else #define LOG_TRACE(log_class, fmt, ...) (void(0)) #endif -#define LOG_DEBUG(log_class, ...) \ +#define LOG_DEBUG(log_class, ...) \ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Debug, __FILE__, __LINE__, \ __func__, __VA_ARGS__) -#define LOG_INFO(log_class, ...) \ +#define LOG_INFO(log_class, ...) \ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Info, __FILE__, __LINE__, \ __func__, __VA_ARGS__) -#define LOG_WARNING(log_class, ...) \ +#define LOG_WARNING(log_class, ...) \ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Warning, __FILE__, __LINE__, \ __func__, __VA_ARGS__) -#define LOG_ERROR(log_class, ...) \ +#define LOG_ERROR(log_class, ...) \ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Error, __FILE__, __LINE__, \ __func__, __VA_ARGS__) -#define LOG_CRITICAL(log_class, ...) \ +#define LOG_CRITICAL(log_class, ...) \ ::Log::FmtLogMessage(::Log::Class::log_class, ::Log::Level::Critical, __FILE__, __LINE__, \ __func__, __VA_ARGS__) diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 6b0125292..0fa392b4b 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -231,7 +231,7 @@ static unsigned int DPO(RotateRightByRegister)(ARMul_State* cpu, unsigned int sh } #define DEBUG_MSG \ - LOG_DEBUG(Core_ARM11, "inst is {:x}", inst); \ + LOG_DEBUG(Core_ARM11, "inst is {:x}", inst); \ CITRA_IGNORE_EXIT(0) #define LnSWoUB(s) glue(LnSWoUB, s) @@ -829,9 +829,9 @@ static unsigned int InterpreterTranslateInstruction(const ARMul_State* cpu, cons int idx; if (DecodeARMInstruction(inst, &idx) == ARMDecodeStatus::FAILURE) { LOG_ERROR(Core_ARM11, "Decode failure.\tPC: [{:#010X}]\tInstruction: {:08X}", phys_addr, - inst); + inst); LOG_ERROR(Core_ARM11, "cpsr={:#X}, cpu->TFlag={}, r15={:#010X}", cpu->Cpsr, cpu->TFlag, - cpu->Reg[15]); + cpu->Reg[15]); CITRA_IGNORE_EXIT(-1); } inst_base = arm_instruction_trans[idx](inst, idx); @@ -2368,10 +2368,9 @@ MCRR_INST : { if (inst_base->cond == ConditionCode::AL || CondPassed(cpu, inst_base->cond)) { mcrr_inst* const inst_cream = (mcrr_inst*)inst_base->component; - LOG_ERROR(Core_ARM11, - "MCRR executed | Coprocessor: {}, CRm {}, opc1: {}, Rt: {}, Rt2: {}", - inst_cream->cp_num, inst_cream->crm, inst_cream->opcode_1, inst_cream->rt, - inst_cream->rt2); + LOG_ERROR(Core_ARM11, "MCRR executed | Coprocessor: {}, CRm {}, opc1: {}, Rt: {}, Rt2: {}", + inst_cream->cp_num, inst_cream->crm, inst_cream->opcode_1, inst_cream->rt, + inst_cream->rt2); } cpu->Reg[15] += cpu->GetInstructionSize(); @@ -2452,10 +2451,9 @@ MRRC_INST : { if (inst_base->cond == ConditionCode::AL || CondPassed(cpu, inst_base->cond)) { mcrr_inst* const inst_cream = (mcrr_inst*)inst_base->component; - LOG_ERROR(Core_ARM11, - "MRRC executed | Coprocessor: {}, CRm {}, opc1: {}, Rt: {}, Rt2: {}", - inst_cream->cp_num, inst_cream->crm, inst_cream->opcode_1, inst_cream->rt, - inst_cream->rt2); + LOG_ERROR(Core_ARM11, "MRRC executed | Coprocessor: {}, CRm {}, opc1: {}, Rt: {}, Rt2: {}", + inst_cream->cp_num, inst_cream->crm, inst_cream->opcode_1, inst_cream->rt, + inst_cream->rt2); } cpu->Reg[15] += cpu->GetInstructionSize(); diff --git a/src/core/arm/skyeye_common/armstate.cpp b/src/core/arm/skyeye_common/armstate.cpp index 2283dc4a1..dd388d38a 100644 --- a/src/core/arm/skyeye_common/armstate.cpp +++ b/src/core/arm/skyeye_common/armstate.cpp @@ -429,7 +429,7 @@ u32 ARMul_State::ReadCP15Register(u32 crn, u32 opcode_1, u32 crm, u32 opcode_2) } LOG_ERROR(Core_ARM11, "MRC CRn={}, CRm={}, OP1={} OP2={} is not implemented. Returning zero.", - crn, crm, opcode_1, opcode_2); + crn, crm, opcode_1, opcode_2); return 0; } diff --git a/src/core/arm/skyeye_common/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp index 4ce6cd806..7f942bc75 100644 --- a/src/core/arm/skyeye_common/vfp/vfp.cpp +++ b/src/core/arm/skyeye_common/vfp/vfp.cpp @@ -107,7 +107,7 @@ u64 vfp_get_double(ARMul_State* state, unsigned int reg) { void vfp_put_double(ARMul_State* state, u64 val, unsigned int reg) { LOG_TRACE(Core_ARM11, "VFP put double: s[{}-{}] <= [{:08x}-{:08x}]", reg * 2 + 1, reg * 2, - (u32)(val >> 32), (u32)(val & 0xffffffff)); + (u32)(val >> 32), (u32)(val & 0xffffffff)); state->ExtReg[reg * 2] = (u32)(val & 0xffffffff); state->ExtReg[reg * 2 + 1] = (u32)(val >> 32); } diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp index 305c7401b..f0f60a34a 100644 --- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp @@ -65,7 +65,7 @@ static struct vfp_double vfp_double_default_qnan = { static void vfp_double_dump(const char* str, struct vfp_double* d) { LOG_TRACE(Core_ARM11, "VFP: {}: sign={} exponent={} significand={:016llx}", str, d->sign != 0, - d->exponent, d->significand); + d->exponent, d->significand); } static void vfp_double_normalise_denormal(struct vfp_double* vd) { @@ -222,7 +222,7 @@ pack: { s64 d = vfp_double_pack(vd); LOG_TRACE(Core_ARM11, "VFP: {}: d(d{})={:016llx} exceptions={:08x}", func, dd, d, - exceptions); + exceptions); vfp_put_double(state, d, dd); } return exceptions; @@ -390,8 +390,7 @@ static u32 vfp_compare(ARMul_State* state, int dd, int signal_on_qnan, s64 m, u3 s64 d; u32 ret = 0; - LOG_TRACE(Core_ARM11, "In {}, state=0x{}, fpscr=0x{:x}", __FUNCTION__, fmt::ptr(state), - fpscr); + LOG_TRACE(Core_ARM11, "In {}, state=0x{}, fpscr=0x{:x}", __FUNCTION__, fmt::ptr(state), fpscr); if (vfp_double_packed_exponent(m) == 2047 && vfp_double_packed_mantissa(m)) { ret |= FPSCR_CFLAG | FPSCR_VFLAG; if (signal_on_qnan || @@ -1210,7 +1209,7 @@ u32 vfp_double_cpdo(ARMul_State* state, u32 inst, u32 fpscr) { veclen = fpscr & FPSCR_LENGTH_MASK; LOG_TRACE(Core_ARM11, "VFP: vecstride={} veclen={}", vecstride, - (veclen >> FPSCR_LENGTH_BIT) + 1); + (veclen >> FPSCR_LENGTH_BIT) + 1); if (!fop->fn) { LOG_TRACE(Core_ARM11, "VFP: could not find double op {}", FEXT_TO_IDX(inst)); @@ -1224,14 +1223,13 @@ u32 vfp_double_cpdo(ARMul_State* state, u32 inst, u32 fpscr) { type = (fop->flags & OP_SD) ? 's' : 'd'; if (op == FOP_EXT) LOG_TRACE(Core_ARM11, "VFP: itr{} ({}{}) = op[{}] (d{})", vecitr >> FPSCR_LENGTH_BIT, - type, dest, dn, dm); + type, dest, dn, dm); else LOG_TRACE(Core_ARM11, "VFP: itr{} ({}{}) = (d{}) op[{}] (d{})", - vecitr >> FPSCR_LENGTH_BIT, type, dest, dn, FOP_TO_IDX(op), dm); + vecitr >> FPSCR_LENGTH_BIT, type, dest, dn, FOP_TO_IDX(op), dm); except = fop->fn(state, dest, dn, dm, fpscr); - LOG_TRACE(Core_ARM11, "VFP: itr{}: exceptions={:08x}", vecitr >> FPSCR_LENGTH_BIT, - except); + LOG_TRACE(Core_ARM11, "VFP: itr{}: exceptions={:08x}", vecitr >> FPSCR_LENGTH_BIT, except); exceptions |= except & ~VFP_NAN_FLAG; diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp index abbb0771e..6536bf03d 100644 --- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp @@ -67,7 +67,7 @@ static struct vfp_single vfp_single_default_qnan = { static void vfp_single_dump(const char* str, struct vfp_single* s) { LOG_TRACE(Core_ARM11, "{}: sign={} exponent={} significand={:08x}", str, s->sign != 0, - s->exponent, s->significand); + s->exponent, s->significand); } static void vfp_single_normalise_denormal(struct vfp_single* vs) { @@ -1234,7 +1234,7 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr) { if (!fop->fn) { LOG_CRITICAL(Core_ARM11, "could not find single op {}, inst=0x{:x}@0x{:x}", - FEXT_TO_IDX(inst), inst, state->Reg[15]); + FEXT_TO_IDX(inst), inst, state->Reg[15]); Crash(); goto invalid; } @@ -1246,11 +1246,11 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr) { type = (fop->flags & OP_DD) ? 'd' : 's'; if (op == FOP_EXT) - LOG_TRACE(Core_ARM11, "itr{} ({}{}) = op[{}] (s{}={:08x})", - vecitr >> FPSCR_LENGTH_BIT, type, dest, sn, sm, m); + LOG_TRACE(Core_ARM11, "itr{} ({}{}) = op[{}] (s{}={:08x})", vecitr >> FPSCR_LENGTH_BIT, + type, dest, sn, sm, m); else LOG_TRACE(Core_ARM11, "itr{} ({}{}) = (s{}) op[{}] (s{}={:08x})", - vecitr >> FPSCR_LENGTH_BIT, type, dest, sn, FOP_TO_IDX(op), sm, m); + vecitr >> FPSCR_LENGTH_BIT, type, dest, sn, FOP_TO_IDX(op), sm, m); except = fop->fn(state, dest, sn, m, fpscr); LOG_TRACE(Core_ARM11, "itr{}: exceptions={:08x}", vecitr >> FPSCR_LENGTH_BIT, except); diff --git a/src/core/core.cpp b/src/core/core.cpp index bfe15f443..287014c4c 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -92,7 +92,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file if (system_mode.second != Loader::ResultStatus::Success) { LOG_CRITICAL(Core, "Failed to determine system mode (Error {})!", - static_cast(system_mode.second)); + static_cast(system_mode.second)); switch (system_mode.second) { case Loader::ResultStatus::ErrorEncrypted: @@ -107,7 +107,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file ResultStatus init_result{Init(emu_window, system_mode.first.get())}; if (init_result != ResultStatus::Success) { LOG_CRITICAL(Core, "Failed to initialize system (Error {})!", - static_cast(init_result)); + static_cast(init_result)); System::Shutdown(); return init_result; } diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp index c8e6e7ca2..10a344366 100644 --- a/src/core/file_sys/archive_ncch.cpp +++ b/src/core/file_sys/archive_ncch.cpp @@ -107,7 +107,7 @@ ResultVal> NCCHArchive::OpenFile(const Path& path, u32 low = static_cast(title_id & 0xFFFFFFFF); LOG_DEBUG(Service_FS, "Full Path: {}. Category: 0x{:X}. Path: 0x{:X}.", path.DebugStr(), - high, low); + high, low); std::string archive_name; if (high == shared_data_archive) { @@ -122,7 +122,7 @@ ResultVal> NCCHArchive::OpenFile(const Path& path, if (!archive_name.empty()) { LOG_ERROR(Service_FS, "Failed to get a handle for shared data archive: {}. ", - archive_name); + archive_name); Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles, archive_name.c_str()); } @@ -140,22 +140,21 @@ ResultCode NCCHArchive::DeleteFile(const Path& path) const { } ResultCode NCCHArchive::RenameFile(const Path& src_path, const Path& dest_path) const { - LOG_CRITICAL(Service_FS, "Attempted to rename a file within an NCCH archive ({}).", - GetName()); + LOG_CRITICAL(Service_FS, "Attempted to rename a file within an NCCH archive ({}).", GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultCode NCCHArchive::DeleteDirectory(const Path& path) const { LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an NCCH archive ({}).", - GetName()); + GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultCode NCCHArchive::DeleteDirectoryRecursively(const Path& path) const { LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an NCCH archive ({}).", - GetName()); + GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } @@ -168,22 +167,20 @@ ResultCode NCCHArchive::CreateFile(const Path& path, u64 size) const { } ResultCode NCCHArchive::CreateDirectory(const Path& path) const { - LOG_CRITICAL(Service_FS, "Attempted to create a directory in an NCCH archive ({}).", - GetName()); + LOG_CRITICAL(Service_FS, "Attempted to create a directory in an NCCH archive ({}).", GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultCode NCCHArchive::RenameDirectory(const Path& src_path, const Path& dest_path) const { - LOG_CRITICAL(Service_FS, "Attempted to rename a file within an NCCH archive ({}).", - GetName()); + LOG_CRITICAL(Service_FS, "Attempted to rename a file within an NCCH archive ({}).", GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultVal> NCCHArchive::OpenDirectory(const Path& path) const { LOG_CRITICAL(Service_FS, "Attempted to open a directory within an NCCH archive ({}).", - GetName().c_str()); + GetName().c_str()); // TODO(shinyquagsire23): Use correct error code return ResultCode(-1); } diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp index 638ccf2d5..d826e0f8d 100644 --- a/src/core/file_sys/archive_sdmc.cpp +++ b/src/core/file_sys/archive_sdmc.cpp @@ -79,7 +79,7 @@ ResultVal> SDMCArchive::OpenFileBase(const Path& pa case PathParser::NotFound: if (!mode.create_flag) { LOG_ERROR(Service_FS, "Non-existing file {} can't be open without mode create.", - full_path); + full_path); return ERROR_NOT_FOUND; } else { // Create the file diff --git a/src/core/file_sys/archive_selfncch.cpp b/src/core/file_sys/archive_selfncch.cpp index f62b69bb7..c0d5dac0b 100644 --- a/src/core/file_sys/archive_selfncch.cpp +++ b/src/core/file_sys/archive_selfncch.cpp @@ -242,12 +242,12 @@ void ArchiveFactory_SelfNCCH::Register(Loader::AppLoader& app_loader) { } LOG_DEBUG(Service_FS, "Registering program {:016X} with the SelfNCCH archive factory", - program_id); + program_id); if (ncch_data.find(program_id) != ncch_data.end()) { LOG_WARNING(Service_FS, - "Registering program {:016X} with SelfNCCH will override existing mapping", - program_id); + "Registering program {:016X} with SelfNCCH will override existing mapping", + program_id); } NCCHData& data = ncch_data[program_id]; diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp index a82c18618..cbe3ac188 100644 --- a/src/core/file_sys/ivfc_archive.cpp +++ b/src/core/file_sys/ivfc_archive.cpp @@ -36,22 +36,21 @@ ResultCode IVFCArchive::DeleteFile(const Path& path) const { } ResultCode IVFCArchive::RenameFile(const Path& src_path, const Path& dest_path) const { - LOG_CRITICAL(Service_FS, "Attempted to rename a file within an IVFC archive ({}).", - GetName()); + LOG_CRITICAL(Service_FS, "Attempted to rename a file within an IVFC archive ({}).", GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultCode IVFCArchive::DeleteDirectory(const Path& path) const { LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an IVFC archive ({}).", - GetName()); + GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultCode IVFCArchive::DeleteDirectoryRecursively(const Path& path) const { LOG_CRITICAL(Service_FS, "Attempted to delete a directory from an IVFC archive ({}).", - GetName()); + GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } @@ -64,15 +63,13 @@ ResultCode IVFCArchive::CreateFile(const Path& path, u64 size) const { } ResultCode IVFCArchive::CreateDirectory(const Path& path) const { - LOG_CRITICAL(Service_FS, "Attempted to create a directory in an IVFC archive ({}).", - GetName()); + LOG_CRITICAL(Service_FS, "Attempted to create a directory in an IVFC archive ({}).", GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } ResultCode IVFCArchive::RenameDirectory(const Path& src_path, const Path& dest_path) const { - LOG_CRITICAL(Service_FS, "Attempted to rename a file within an IVFC archive ({}).", - GetName()); + LOG_CRITICAL(Service_FS, "Attempted to rename a file within an IVFC archive ({}).", GetName()); // TODO(wwylele): Use correct error code return ResultCode(-1); } diff --git a/src/core/file_sys/ncch_container.cpp b/src/core/file_sys/ncch_container.cpp index d3c07568b..e9739a586 100644 --- a/src/core/file_sys/ncch_container.cpp +++ b/src/core/file_sys/ncch_container.cpp @@ -160,10 +160,9 @@ Loader::ResultStatus NCCHContainer::Load() { exheader_header.arm11_system_local_caps.resource_limit_category; LOG_DEBUG(Service_FS, "Name: {}", - exheader_header.codeset_info.name); + exheader_header.codeset_info.name); LOG_DEBUG(Service_FS, "Program ID: {:016X}", ncch_header.program_id); - LOG_DEBUG(Service_FS, "Code compressed: {}", - is_compressed ? "yes" : "no"); + LOG_DEBUG(Service_FS, "Code compressed: {}", is_compressed ? "yes" : "no"); LOG_DEBUG(Service_FS, "Entry point: 0x{:08X}", entry_point); LOG_DEBUG(Service_FS, "Code size: 0x{:08X}", code_size); LOG_DEBUG(Service_FS, "Stack size: 0x{:08X}", stack_size); @@ -172,11 +171,11 @@ Loader::ResultStatus NCCHContainer::Load() { LOG_DEBUG(Service_FS, "Thread priority: 0x{:X}", priority); LOG_DEBUG(Service_FS, "Resource limit category: {}", resource_limit_category); LOG_DEBUG(Service_FS, "System Mode: {}", - static_cast(exheader_header.arm11_system_local_caps.system_mode)); + static_cast(exheader_header.arm11_system_local_caps.system_mode)); if (exheader_header.system_info.jump_id != ncch_header.program_id) { LOG_ERROR(Service_FS, - "ExHeader Program ID mismatch: the ROM is probably encrypted."); + "ExHeader Program ID mismatch: the ROM is probably encrypted."); return Loader::ResultStatus::ErrorEncrypted; } @@ -240,8 +239,8 @@ Loader::ResultStatus NCCHContainer::LoadOverrides() { if (is_tainted) LOG_WARNING(Service_FS, - "Loaded NCCH {} is tainted, application behavior may not be as expected!", - filepath); + "Loaded NCCH {} is tainted, application behavior may not be as expected!", + filepath); return Loader::ResultStatus::Success; } @@ -287,8 +286,8 @@ Loader::ResultStatus NCCHContainer::LoadSectionExeFS(const char* name, std::vect // Load the specified section... if (strcmp(section.name, name) == 0) { - LOG_DEBUG(Service_FS, "{} - offset: 0x{:08X}, size: 0x{:08X}, name: {}", - section_number, section.offset, section.size, section.name); + LOG_DEBUG(Service_FS, "{} - offset: 0x{:08X}, size: 0x{:08X}, name: {}", section_number, + section.offset, section.size, section.name); s64 section_offset = (section.offset + exefs_offset + sizeof(ExeFs_Header) + ncch_offset); diff --git a/src/core/file_sys/savedata_archive.cpp b/src/core/file_sys/savedata_archive.cpp index 2367b15ce..7892a9d08 100644 --- a/src/core/file_sys/savedata_archive.cpp +++ b/src/core/file_sys/savedata_archive.cpp @@ -64,7 +64,7 @@ ResultVal> SaveDataArchive::OpenFile(const Path& pa case PathParser::NotFound: if (!mode.create_flag) { LOG_ERROR(Service_FS, "Non-existing file {} can't be open without mode create.", - full_path); + full_path); return ERROR_FILE_NOT_FOUND; } else { // Create the file diff --git a/src/core/file_sys/title_metadata.cpp b/src/core/file_sys/title_metadata.cpp index 77a693734..8e0b6b30f 100644 --- a/src/core/file_sys/title_metadata.cpp +++ b/src/core/file_sys/title_metadata.cpp @@ -76,7 +76,7 @@ Loader::ResultStatus TitleMetadata::Load(const std::vector file_data, size_t body_start + sizeof(Body) + tmd_body.content_count * sizeof(ContentChunk); if (total_size < expected_size) { LOG_ERROR(Service_FS, "Malformed TMD, expected size 0x{:x}, got 0x{:x}!", expected_size, - total_size); + total_size); return Loader::ResultStatus::ErrorInvalidFormat; } @@ -218,8 +218,8 @@ void TitleMetadata::Print() const { break; LOG_DEBUG(Service_FS, " Index {:04X}, Command Count {:04X}", - static_cast(tmd_body.contentinfo[i].index), - static_cast(tmd_body.contentinfo[i].command_count)); + static_cast(tmd_body.contentinfo[i].index), + static_cast(tmd_body.contentinfo[i].command_count)); } // For each content info, print their content chunk range @@ -238,8 +238,8 @@ void TitleMetadata::Print() const { const ContentChunk& chunk = tmd_chunks[j]; LOG_DEBUG(Service_FS, " ID {:08X}, Index {:04X}, Type {:04x}, Size {:016X}", - static_cast(chunk.id), static_cast(chunk.index), - static_cast(chunk.type), static_cast(chunk.size)); + static_cast(chunk.id), static_cast(chunk.index), + static_cast(chunk.type), static_cast(chunk.size)); } } } diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 0872ffab0..5d4e94f0a 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -302,7 +302,7 @@ static void RemoveBreakpoint(BreakpointType type, PAddr addr) { auto bp = p.find(addr); if (bp != p.end()) { LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:08x} bytes at {:08x} of type {}\n", - bp->second.len, bp->second.addr, static_cast(type)); + bp->second.len, bp->second.addr, static_cast(type)); p.erase(addr); } } @@ -348,8 +348,8 @@ bool CheckBreakpoint(PAddr addr, BreakpointType type) { if (bp->second.active && (addr >= bp->second.addr && addr < bp->second.addr + len)) { LOG_DEBUG(Debug_GDBStub, - "Found breakpoint type {} @ {:08x}, range: {:08x} - {:08x} ({} bytes)\n", - static_cast(type), addr, bp->second.addr, bp->second.addr + len, len); + "Found breakpoint type {} @ {:08x}, range: {:08x} - {:08x} ({} bytes)\n", + static_cast(type), addr, bp->second.addr, bp->second.addr + len, len); return true; } } @@ -740,7 +740,7 @@ static bool CommitBreakpoint(BreakpointType type, PAddr addr, u32 len) { p.insert({addr, breakpoint}); LOG_DEBUG(Debug_GDBStub, "gdb: added {} breakpoint: {:08x} bytes at {:08x}\n", - static_cast(type), breakpoint.len, breakpoint.addr); + static_cast(type), breakpoint.len, breakpoint.addr); return true; } diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index 65f995218..a998a87e2 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp @@ -116,7 +116,7 @@ void HandleSpecialMapping(VMManager& address_space, const AddressMapping& mappin VAddr mapping_limit = mapping.address + mapping.size; if (mapping_limit < mapping.address) { LOG_CRITICAL(Loader, "Mapping size overflowed: address=0x{:08X} size=0x{:X}", - mapping.address, mapping.size); + mapping.address, mapping.size); return; } @@ -127,16 +127,16 @@ void HandleSpecialMapping(VMManager& address_space, const AddressMapping& mappin }); if (area == std::end(memory_areas)) { LOG_ERROR(Loader, - "Unhandled special mapping: address=0x{:08X} size=0x{:X}" - " read_only={} unk_flag={}", - mapping.address, mapping.size, mapping.read_only, mapping.unk_flag); + "Unhandled special mapping: address=0x{:08X} size=0x{:X}" + " read_only={} unk_flag={}", + mapping.address, mapping.size, mapping.read_only, mapping.unk_flag); return; } u32 offset_into_region = mapping.address - area->vaddr_base; if (area->paddr_base == IO_AREA_PADDR) { LOG_ERROR(Loader, "MMIO mappings are not supported yet. phys_addr=0x{:08X}", - area->paddr_base + offset_into_region); + area->paddr_base + offset_into_region); return; } diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 5deef1c79..59c7e39dd 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp @@ -107,14 +107,14 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi // Error out if the requested permissions don't match what the creator process allows. if (static_cast(permissions) & ~static_cast(own_other_permissions)) { LOG_ERROR(Kernel, "cannot map id={}, address=0x{:08X} name={}, permissions don't match", - GetObjectId(), address, name); + GetObjectId(), address, name); return ERR_INVALID_COMBINATION; } // Heap-backed memory blocks can not be mapped with other_permissions = DontCare if (base_address != 0 && other_permissions == MemoryPermission::DontCare) { LOG_ERROR(Kernel, "cannot map id={}, address=0x{08X} name={}, permissions don't match", - GetObjectId(), address, name); + GetObjectId(), address, name); return ERR_INVALID_COMBINATION; } @@ -122,7 +122,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi if (other_permissions != MemoryPermission::DontCare && static_cast(this->permissions) & ~static_cast(other_permissions)) { LOG_ERROR(Kernel, "cannot map id={}, address=0x{:08X} name={}, permissions don't match", - GetObjectId(), address, name); + GetObjectId(), address, name); return ERR_WRONG_PERMISSION; } @@ -138,7 +138,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi if (address != 0) { if (address < Memory::HEAP_VADDR || address + size >= Memory::SHARED_MEMORY_VADDR_END) { LOG_ERROR(Kernel, "cannot map id={}, address=0x{:08X} name={}, invalid address", - GetObjectId(), address, name); + GetObjectId(), address, name); return ERR_INVALID_ADDRESS; } } diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 0843b5f58..6e30bb0a6 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -59,9 +59,9 @@ enum ControlMemoryOperation { static ResultCode ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 size, u32 permissions) { LOG_DEBUG(Kernel_SVC, - "called operation=0x{:08X}, addr0=0x{:08X}, addr1=0x{:08X}, " - "size=0x{:X}, permissions=0x{:08X}", - operation, addr0, addr1, size, permissions); + "called operation=0x{:08X}, addr0=0x{:08X}, addr1=0x{:08X}, " + "size=0x{:X}, permissions=0x{:08X}", + operation, addr0, addr1, size, permissions); if ((addr0 & Memory::PAGE_MASK) != 0 || (addr1 & Memory::PAGE_MASK) != 0) { return ERR_MISALIGNED_ADDRESS; @@ -75,7 +75,7 @@ static ResultCode ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 add if (region != 0) { LOG_WARNING(Kernel_SVC, "ControlMemory with specified region not supported, region={:X}", - region); + region); } if ((permissions & (u32)MemoryPermission::ReadWrite) != permissions) { @@ -177,9 +177,9 @@ static void ExitProcess() { /// Maps a memory block to specified address static ResultCode MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permissions) { LOG_TRACE(Kernel_SVC, - "called memblock=0x{:08X}, addr=0x{:08X}, mypermissions=0x{:08X}, " - "otherpermission={}", - handle, addr, permissions, other_permissions); + "called memblock=0x{:08X}, addr=0x{:08X}, mypermissions=0x{:08X}, " + "otherpermission={}", + handle, addr, permissions, other_permissions); SharedPtr shared_memory = g_handle_table.Get(handle); if (shared_memory == nullptr) @@ -274,7 +274,7 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) { return ERR_INVALID_HANDLE; LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}({}:{}), nanoseconds={}", handle, - object->GetTypeName(), object->GetName(), nano_seconds); + object->GetTypeName(), object->GetName(), nano_seconds); if (object->ShouldWait(thread)) { @@ -624,9 +624,8 @@ static ResultCode CreateAddressArbiter(Handle* out_handle) { /// Arbitrate address static ResultCode ArbitrateAddress(Handle handle, u32 address, u32 type, u32 value, s64 nanoseconds) { - LOG_TRACE(Kernel_SVC, - "called handle=0x{:08X}, address=0x{:08X}, type=0x{:08X}, value=0x{:08X}", handle, - address, type, value); + LOG_TRACE(Kernel_SVC, "called handle=0x{:08X}, address=0x{:08X}, type=0x{:08X}, value=0x{:08X}", + handle, address, type, value); SharedPtr arbiter = g_handle_table.Get(handle); if (arbiter == nullptr) @@ -685,7 +684,7 @@ static ResultCode GetResourceLimit(Handle* resource_limit, Handle process_handle static ResultCode GetResourceLimitCurrentValues(VAddr values, Handle resource_limit_handle, VAddr names, u32 name_count) { LOG_TRACE(Kernel_SVC, "called resource_limit={:08X}, names={:08X}, name_count={}", - resource_limit_handle, names, name_count); + resource_limit_handle, names, name_count); SharedPtr resource_limit = g_handle_table.Get(resource_limit_handle); @@ -705,7 +704,7 @@ static ResultCode GetResourceLimitCurrentValues(VAddr values, Handle resource_li static ResultCode GetResourceLimitLimitValues(VAddr values, Handle resource_limit_handle, VAddr names, u32 name_count) { LOG_TRACE(Kernel_SVC, "called resource_limit={:08X}, names={:08X}, name_count={}", - resource_limit_handle, names, name_count); + resource_limit_handle, names, name_count); SharedPtr resource_limit = g_handle_table.Get(resource_limit_handle); @@ -746,11 +745,11 @@ static ResultCode CreateThread(Handle* out_handle, u32 priority, u32 entry_point break; case THREADPROCESSORID_ALL: LOG_INFO(Kernel_SVC, - "Newly created thread is allowed to be run in any Core, unimplemented."); + "Newly created thread is allowed to be run in any Core, unimplemented."); break; case THREADPROCESSORID_1: LOG_ERROR(Kernel_SVC, - "Newly created thread must run in the SysCore (Core1), unimplemented."); + "Newly created thread must run in the SysCore (Core1), unimplemented."); break; default: // TODO(bunnei): Implement support for other processor IDs @@ -770,9 +769,9 @@ static ResultCode CreateThread(Handle* out_handle, u32 priority, u32 entry_point Core::System::GetInstance().PrepareReschedule(); LOG_TRACE(Kernel_SVC, - "called entrypoint=0x{:08X} ({}), arg=0x{:08X}, stacktop=0x{:08X}, " - "threadpriority=0x{:08X}, processorid=0x{:08X} : created handle=0x{:08X}", - entry_point, name, arg, stack_top, priority, processor_id, *out_handle); + "called entrypoint=0x{:08X} ({}), arg=0x{:08X}, stacktop=0x{:08X}, " + "threadpriority=0x{:08X}, processorid=0x{:08X} : created handle=0x{:08X}", + entry_point, name, arg, stack_top, priority, processor_id, *out_handle); return RESULT_SUCCESS; } @@ -830,7 +829,7 @@ static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); LOG_TRACE(Kernel_SVC, "called initial_locked={} : created handle=0x{:08X}", - initial_locked ? "true" : "false", *out_handle); + initial_locked ? "true" : "false", *out_handle); return RESULT_SUCCESS; } @@ -893,7 +892,7 @@ static ResultCode CreateSemaphore(Handle* out_handle, s32 initial_count, s32 max CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(semaphore))); LOG_TRACE(Kernel_SVC, "called initial_count={}, max_count={}, created handle=0x{:08X}", - initial_count, max_count, *out_handle); + initial_count, max_count, *out_handle); return RESULT_SUCCESS; } @@ -944,7 +943,7 @@ static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(evt))); LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, - *out_handle); + *out_handle); return RESULT_SUCCESS; } @@ -987,7 +986,7 @@ static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(timer))); LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, - *out_handle); + *out_handle); return RESULT_SUCCESS; } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 7154a1876..ebff4d18e 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -267,7 +267,7 @@ static void DebugThreadQueue() { LOG_DEBUG(Kernel, "Current: NO CURRENT THREAD"); } else { LOG_DEBUG(Kernel, "0x{:02X} {} (current)", thread->current_priority, - GetCurrentThread()->GetObjectId()); + GetCurrentThread()->GetObjectId()); } for (auto& t : thread_list) { @@ -376,7 +376,7 @@ ResultVal> Thread::Create(std::string name, VAddr entry_point, if (linheap_memory->size() + Memory::PAGE_SIZE > memory_region->size) { LOG_ERROR(Kernel_SVC, - "Not enough space in region to allocate a new TLS page for thread"); + "Not enough space in region to allocate a new TLS page for thread"); return ERR_OUT_OF_MEMORY; } diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 24301f53c..8c86b94a1 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -261,11 +261,11 @@ void VMManager::LogLayout(Log::Level log_level) const { for (const auto& p : vma_map) { const VirtualMemoryArea& vma = p.second; LOG_GENERIC(::Log::Class::Kernel, log_level, "{:08X} - {:08X} size: {:8X} {}{}{} {}", - vma.base, vma.base + vma.size, vma.size, - (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-', - (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-', - (u8)vma.permissions & (u8)VMAPermission::Execute ? 'X' : '-', - GetMemoryStateName(vma.meminfo_state)); + vma.base, vma.base + vma.size, vma.size, + (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-', + (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-', + (u8)vma.permissions & (u8)VMAPermission::Execute ? 'X' : '-', + GetMemoryStateName(vma.meminfo_state)); } } diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp index d616135ee..d158e9822 100644 --- a/src/core/hle/service/ac/ac.cpp +++ b/src/core/hle/service/ac/ac.cpp @@ -153,8 +153,8 @@ void Module::Interface::IsConnected(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(ac->ac_connected); - LOG_WARNING(Service_AC, "(STUBBED) called unk=0x{:08X} descriptor=0x{:08X} param=0x{:08X}", - unk, unk_descriptor, unk_param); + LOG_WARNING(Service_AC, "(STUBBED) called unk=0x{:08X} descriptor=0x{:08X} param=0x{:08X}", unk, + unk_descriptor, unk_param); } void Module::Interface::SetClientVersion(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 520628a92..66a38544b 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -144,7 +144,7 @@ ResultVal CIAFile::WriteContentData(u64 offset, size_t length, const u8* // values can be calculated. content_written[i] += available_to_write; LOG_DEBUG(Service_AM, "Wrote {:x} to content {}, total {:x}", available_to_write, i, - content_written[i]); + content_written[i]); } } @@ -312,7 +312,7 @@ InstallStatus InstallCIA(const std::string& path, update_callback(total_bytes_read, file.GetSize()); if (result.Failed()) { LOG_ERROR(Service_AM, "CIA file installation aborted with error code {:08x}", - result.Code().raw); + result.Code().raw); return InstallStatus::ErrorAborted; } total_bytes_read += bytes_read; @@ -386,7 +386,7 @@ std::string GetTitleContentPath(Service::FS::MediaType media_type, u64 tid, u16 if (media_type == Service::FS::MediaType::GameCard) { // TODO(shinyquagsire23): get current app file if TID matches? LOG_ERROR(Service_AM, "Request for gamecard partition {} content path unimplemented!", - static_cast(index)); + static_cast(index)); return ""; } @@ -608,7 +608,7 @@ void Module::Interface::DeleteContents(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.PushMappedBuffer(content_ids_in); LOG_WARNING(Service_AM, "(STUBBED) media_type={}, title_id=0x{:016x}, content_count={}", - media_type, title_id, content_count); + media_type, title_id, content_count); } void Module::Interface::GetProgramList(Kernel::HLERequestContext& ctx) { @@ -828,8 +828,8 @@ void Module::Interface::ListDataTitleTicketInfos(Kernel::HLERequestContext& ctx) rb.PushMappedBuffer(ticket_info_out); LOG_WARNING(Service_AM, - "(STUBBED) ticket_count=0x{:08X}, title_id=0x{:016x}, start_index=0x{:08X}", - ticket_count, title_id, start_index); + "(STUBBED) ticket_count=0x{:08X}, title_id=0x{:016x}, start_index=0x{:08X}", + ticket_count, title_id, start_index); } void Module::Interface::GetDLCContentInfoCount(Kernel::HLERequestContext& ctx) { @@ -858,7 +858,7 @@ void Module::Interface::GetDLCContentInfoCount(Kernel::HLERequestContext& ctx) { } else { rb.Push(1); // Number of content infos plus one LOG_WARNING(Service_AM, "(STUBBED) called media_type={}, title_id=0x{:016x}", - static_cast(media_type), title_id); + static_cast(media_type), title_id); } } @@ -892,7 +892,7 @@ void Module::Interface::GetTicketList(Kernel::HLERequestContext& ctx) { rb.Push(ticket_list_count); rb.PushMappedBuffer(ticket_tids_out); LOG_WARNING(Service_AM, "(STUBBED) ticket_list_count=0x{:08x}, ticket_index=0x{:08x}", - ticket_list_count, ticket_index); + ticket_list_count, ticket_index); } void Module::Interface::QueryAvailableTitleDatabase(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/apt/applet_manager.cpp b/src/core/hle/service/apt/applet_manager.cpp index 06d2fd44f..5d30309ca 100644 --- a/src/core/hle/service/apt/applet_manager.cpp +++ b/src/core/hle/service/apt/applet_manager.cpp @@ -171,7 +171,7 @@ void AppletManager::CancelAndSendParameter(const MessageParameter& parameter) { auto* const slot_data = GetAppletSlotData(static_cast(parameter.destination_id)); if (slot_data == nullptr) { LOG_DEBUG(Service_APT, "No applet was registered with the id {:03X}", - static_cast(parameter.destination_id)); + static_cast(parameter.destination_id)); return; } @@ -330,7 +330,7 @@ ResultCode AppletManager::PrepareToStartLibraryApplet(AppletId applet_id) { auto applet = HLE::Applets::Applet::Get(applet_id); if (applet) { LOG_WARNING(Service_APT, "applet has already been started id={:08X}", - static_cast(applet_id)); + static_cast(applet_id)); return RESULT_SUCCESS; } else { return HLE::Applets::Applet::Create(applet_id, shared_from_this()); @@ -354,7 +354,7 @@ ResultCode AppletManager::PreloadLibraryApplet(AppletId applet_id) { auto applet = HLE::Applets::Applet::Get(applet_id); if (applet) { LOG_WARNING(Service_APT, "applet has already been started id={:08X}", - static_cast(applet_id)); + static_cast(applet_id)); return RESULT_SUCCESS; } else { return HLE::Applets::Applet::Create(applet_id, shared_from_this()); @@ -401,7 +401,7 @@ ResultVal AppletManager::GetAppletInfo(AppletId app_i ErrorSummary::NotFound, ErrorLevel::Status); } LOG_WARNING(Service_APT, "Using HLE applet info for applet {:03X}", - static_cast(app_id)); + static_cast(app_id)); // TODO(Subv): Get the title id for the current applet and write it in the response[2-3] return MakeResult({0, Service::FS::MediaType::NAND, true, true, 0}); } diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index e80aac8b7..5efd2dd20 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -32,8 +32,8 @@ void Module::Interface::Initialize(Kernel::HLERequestContext& ctx) { AppletId app_id = rp.PopEnum(); u32 attributes = rp.Pop(); - LOG_DEBUG(Service_APT, "called app_id={:#010X}, attributes={:#010X}", - static_cast(app_id), attributes); + LOG_DEBUG(Service_APT, "called app_id={:#010X}, attributes={:#010X}", static_cast(app_id), + attributes); auto result = apt->applet_manager->Initialize(app_id, attributes); if (result.Failed()) { @@ -307,10 +307,10 @@ void Module::Interface::SendParameter(Kernel::HLERequestContext& ctx) { std::vector buffer = rp.PopStaticBuffer(); LOG_DEBUG(Service_APT, - "called src_app_id={:#010X}, dst_app_id={:#010X}, signal_type={:#010X}," - "buffer_size={:#010X}", - static_cast(src_app_id), static_cast(dst_app_id), - static_cast(signal_type), buffer_size); + "called src_app_id={:#010X}, dst_app_id={:#010X}, signal_type={:#010X}," + "buffer_size={:#010X}", + static_cast(src_app_id), static_cast(dst_app_id), + static_cast(signal_type), buffer_size); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); @@ -329,8 +329,8 @@ void Module::Interface::ReceiveParameter(Kernel::HLERequestContext& ctx) { AppletId app_id = rp.PopEnum(); u32 buffer_size = rp.Pop(); - LOG_DEBUG(Service_APT, "called app_id={:#010X}, buffer_size={:#010X}", - static_cast(app_id), buffer_size); + LOG_DEBUG(Service_APT, "called app_id={:#010X}, buffer_size={:#010X}", static_cast(app_id), + buffer_size); auto next_parameter = apt->applet_manager->ReceiveParameter(app_id); @@ -357,8 +357,8 @@ void Module::Interface::GlanceParameter(Kernel::HLERequestContext& ctx) { AppletId app_id = rp.PopEnum(); u32 buffer_size = rp.Pop(); - LOG_DEBUG(Service_APT, "called app_id={:#010X}, buffer_size={:#010X}", - static_cast(app_id), buffer_size); + LOG_DEBUG(Service_APT, "called app_id={:#010X}, buffer_size={:#010X}", static_cast(app_id), + buffer_size); auto next_parameter = apt->applet_manager->GlanceParameter(app_id); @@ -394,10 +394,10 @@ void Module::Interface::CancelParameter(Kernel::HLERequestContext& ctx) { receiver_appid)); LOG_DEBUG(Service_APT, - "called check_sender={}, sender_appid={:#010X}, " - "check_receiver={}, receiver_appid={:#010X}", - check_sender, static_cast(sender_appid), check_receiver, - static_cast(receiver_appid)); + "called check_sender={}, sender_appid={:#010X}, " + "check_receiver={}, receiver_appid={:#010X}", + check_sender, static_cast(sender_appid), check_receiver, + static_cast(receiver_appid)); } void Module::Interface::PrepareToStartApplication(Kernel::HLERequestContext& ctx) { @@ -415,11 +415,10 @@ void Module::Interface::PrepareToStartApplication(Kernel::HLERequestContext& ctx IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); // No error - LOG_WARNING( - Service_APT, - "(STUBBED) called title_info1={:#010X}, title_info2={:#010X}, title_info3={:#010X}," - "title_info4={:#010X}, flags={:#010X}", - title_info1, title_info2, title_info3, title_info4, flags); + LOG_WARNING(Service_APT, + "(STUBBED) called title_info1={:#010X}, title_info2={:#010X}, title_info3={:#010X}," + "title_info4={:#010X}, flags={:#010X}", + title_info1, title_info2, title_info3, title_info4, flags); } void Module::Interface::StartApplication(Kernel::HLERequestContext& ctx) { @@ -434,8 +433,8 @@ void Module::Interface::StartApplication(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); // No error LOG_WARNING(Service_APT, - "(STUBBED) called buffer1_size={:#010X}, buffer2_size={:#010X}, flag={:#010X}", - buffer1_size, buffer2_size, flag); + "(STUBBED) called buffer1_size={:#010X}, buffer2_size={:#010X}, flag={:#010X}", + buffer1_size, buffer2_size, flag); } void Module::Interface::AppletUtility(Kernel::HLERequestContext& ctx) { @@ -451,8 +450,8 @@ void Module::Interface::AppletUtility(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); // No error LOG_WARNING(Service_APT, - "(STUBBED) called command={:#010X}, input_size={:#010X}, output_size={:#010X}", - utility_command, input_size, output_size); + "(STUBBED) called command={:#010X}, input_size={:#010X}, output_size={:#010X}", + utility_command, input_size, output_size); } void Module::Interface::SetAppCpuTimeLimit(Kernel::HLERequestContext& ctx) { @@ -467,8 +466,7 @@ void Module::Interface::SetAppCpuTimeLimit(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); // No error - LOG_WARNING(Service_APT, "(STUBBED) called, cpu_percent={}, value={}", apt->cpu_percent, - value); + LOG_WARNING(Service_APT, "(STUBBED) called, cpu_percent={}, value={}", apt->cpu_percent, value); } void Module::Interface::GetAppCpuTimeLimit(Kernel::HLERequestContext& ctx) { @@ -583,7 +581,7 @@ void Module::Interface::SetScreenCapPostPermission(Kernel::HLERequestContext& ct IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); // No error LOG_WARNING(Service_APT, "(STUBBED) called, screen_capture_post_permission={}", - static_cast(apt->screen_capture_post_permission)); + static_cast(apt->screen_capture_post_permission)); } void Module::Interface::GetScreenCapPostPermission(Kernel::HLERequestContext& ctx) { @@ -593,7 +591,7 @@ void Module::Interface::GetScreenCapPostPermission(Kernel::HLERequestContext& ct rb.Push(RESULT_SUCCESS); // No error rb.Push(static_cast(apt->screen_capture_post_permission)); LOG_WARNING(Service_APT, "(STUBBED) called, screen_capture_post_permission={}", - static_cast(apt->screen_capture_post_permission)); + static_cast(apt->screen_capture_post_permission)); } void Module::Interface::GetAppletInfo(Kernel::HLERequestContext& ctx) { @@ -632,9 +630,8 @@ void Module::Interface::GetStartupArgument(Kernel::HLERequestContext& ctx) { std::vector parameter(parameter_size, 0); - LOG_WARNING(Service_APT, - "(STUBBED) called, startup_argument_type={}, parameter_size={:#010X}", - static_cast(startup_argument_type), parameter_size); + LOG_WARNING(Service_APT, "(STUBBED) called, startup_argument_type={}, parameter_size={:#010X}", + static_cast(startup_argument_type), parameter_size); IPC::RequestBuilder rb = rp.MakeBuilder(2, 2); rb.Push(RESULT_SUCCESS); @@ -658,9 +655,8 @@ void Module::Interface::Wrap(Kernel::HLERequestContext& ctx) { ASSERT_MSG(output_size == input_size + HW::AES::CCM_MAC_SIZE, "input_size ({}) doesn't match to output_size ({})", input_size, output_size); - LOG_DEBUG(Service_APT, - "called, output_size={}, input_size={}, nonce_offset={}, nonce_size={}", - output_size, input_size, nonce_offset, nonce_size); + LOG_DEBUG(Service_APT, "called, output_size={}, input_size={}, nonce_offset={}, nonce_size={}", + output_size, input_size, nonce_offset, nonce_size); // Note: This weird nonce size modification is verified against real 3DS nonce_size = std::min(nonce_size & ~3, HW::AES::CCM_NONCE_SIZE); @@ -704,9 +700,8 @@ void Module::Interface::Unwrap(Kernel::HLERequestContext& ctx) { ASSERT_MSG(output_size == input_size - HW::AES::CCM_MAC_SIZE, "input_size ({}) doesn't match to output_size ({})", input_size, output_size); - LOG_DEBUG(Service_APT, - "called, output_size={}, input_size={}, nonce_offset={}, nonce_size={}", - output_size, input_size, nonce_offset, nonce_size); + LOG_DEBUG(Service_APT, "called, output_size={}, input_size={}, nonce_offset={}, nonce_size={}", + output_size, input_size, nonce_offset, nonce_size); // Note: This weird nonce size modification is verified against real 3DS nonce_size = std::min(nonce_size & ~3, HW::AES::CCM_NONCE_SIZE); diff --git a/src/core/hle/service/boss/boss.cpp b/src/core/hle/service/boss/boss.cpp index eba337f75..0c2b3141e 100644 --- a/src/core/hle/service/boss/boss.cpp +++ b/src/core/hle/service/boss/boss.cpp @@ -36,8 +36,8 @@ void InitializeSession(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param={:#018X}, translation={:#010X}, unk_param4={:#010X}", - unk_param, translation, unk_param4); + "(STUBBED) unk_param={:#018X}, translation={:#010X}, unk_param4={:#010X}", + unk_param, translation, unk_param4); } void RegisterStorage(Service::Interface* self) { @@ -52,9 +52,9 @@ void RegisterStorage(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_flag={:#010X}", - unk_param1, unk_param2, unk_param3, unk_flag); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_flag={:#010X}", + unk_param1, unk_param2, unk_param3, unk_flag); } void UnregisterStorage(Service::Interface* self) { @@ -89,8 +89,8 @@ void RegisterPrivateRootCa(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) translation={:#010X}, buff_addr{:#010X}, buff_size={:#010X}", - translation, buff_addr, buff_size); + "(STUBBED) translation={:#010X}, buff_addr{:#010X}, buff_size={:#010X}", + translation, buff_addr, buff_size); } void RegisterPrivateClientCert(Service::Interface* self) { @@ -113,11 +113,11 @@ void RegisterPrivateClientCert(Service::Interface* self) { cmd_buff[3] = buff2_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " - "translation1={:#010X}, buff1_addr={:#010X}, buff1_size={:#010X}, " - "translation2={:#010X}, buff2_addr={:#010X}, buff2_size={:#010X}", - unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, - buff2_addr, buff2_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " + "translation1={:#010X}, buff1_addr={:#010X}, buff1_size={:#010X}, " + "translation2={:#010X}, buff2_addr={:#010X}, buff2_size={:#010X}", + unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, + buff2_addr, buff2_size); } void GetNewArrivalFlag(Service::Interface* self) { @@ -140,7 +140,7 @@ void RegisterNewArrivalEvent(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}", unk_param1, - unk_param2); + unk_param2); } void SetOptoutFlag(Service::Interface* self) { @@ -180,9 +180,9 @@ void RegisterTask(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } void UnregisterTask(Service::Interface* self) { @@ -200,9 +200,9 @@ void UnregisterTask(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, translation, buff_addr, buff_size); } void ReconfigureTask(Service::Interface* self) { @@ -220,9 +220,9 @@ void ReconfigureTask(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, translation, buff_addr, buff_size); } void GetTaskIdList(Service::Interface* self) { @@ -247,8 +247,8 @@ void GetStepIdList(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", - translation, buff_addr, buff_size); + "(STUBBED) translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", + translation, buff_addr, buff_size); } void GetNsDataIdList(Service::Interface* self) { @@ -270,11 +270,10 @@ void GetNsDataIdList(Service::Interface* self) { cmd_buff[5] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_param4={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, - buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_param4={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } void GetOwnNsDataIdList(Service::Interface* self) { @@ -296,11 +295,10 @@ void GetOwnNsDataIdList(Service::Interface* self) { cmd_buff[5] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_param4={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, - buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_param4={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } void GetNewDataNsDataIdList(Service::Interface* self) { @@ -322,11 +320,10 @@ void GetNewDataNsDataIdList(Service::Interface* self) { cmd_buff[5] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_param4={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, - buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_param4={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } void GetOwnNewDataNsDataIdList(Service::Interface* self) { @@ -348,11 +345,10 @@ void GetOwnNewDataNsDataIdList(Service::Interface* self) { cmd_buff[5] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_param4={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, - buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_param4={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } void SendProperty(Service::Interface* self) { @@ -370,9 +366,9 @@ void SendProperty(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, translation, buff_addr, buff_size); } void SendPropertyHandle(Service::Interface* self) { @@ -389,9 +385,9 @@ void SendPropertyHandle(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void ReceiveProperty(Service::Interface* self) { @@ -409,9 +405,9 @@ void ReceiveProperty(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, buff_size={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}", - unk_param1, buff_size, translation, buff_addr); + "(STUBBED) unk_param1={:#010X}, buff_size={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}", + unk_param1, buff_size, translation, buff_addr); } void UpdateTaskInterval(Service::Interface* self) { @@ -429,9 +425,9 @@ void UpdateTaskInterval(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, translation, buff_addr, buff_size); } void UpdateTaskCount(Service::Interface* self) { @@ -448,9 +444,9 @@ void UpdateTaskCount(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}", - buff_size, unk_param2, translation, buff_addr); + "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}", + buff_size, unk_param2, translation, buff_addr); } void GetTaskInterval(Service::Interface* self) { @@ -468,9 +464,9 @@ void GetTaskInterval(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void GetTaskCount(Service::Interface* self) { @@ -488,9 +484,9 @@ void GetTaskCount(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void GetTaskServiceStatus(Service::Interface* self) { @@ -508,9 +504,9 @@ void GetTaskServiceStatus(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void StartTask(Service::Interface* self) { @@ -527,9 +523,9 @@ void StartTask(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void StartTaskImmediate(Service::Interface* self) { @@ -546,9 +542,9 @@ void StartTaskImmediate(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void CancelTask(Service::Interface* self) { @@ -565,9 +561,9 @@ void CancelTask(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void GetTaskFinishHandle(Service::Interface* self) { @@ -598,9 +594,9 @@ void GetTaskState(Service::Interface* self) { cmd_buff[6] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}", - buff_size, unk_param2, translation, buff_addr); + "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}", + buff_size, unk_param2, translation, buff_addr); } void GetTaskResult(Service::Interface* self) { @@ -620,9 +616,9 @@ void GetTaskResult(Service::Interface* self) { cmd_buff[6] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void GetTaskCommErrorCode(Service::Interface* self) { @@ -642,9 +638,9 @@ void GetTaskCommErrorCode(Service::Interface* self) { cmd_buff[6] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void GetTaskStatus(Service::Interface* self) { @@ -664,9 +660,9 @@ void GetTaskStatus(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } void GetTaskError(Service::Interface* self) { @@ -685,9 +681,9 @@ void GetTaskError(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, translation, buff_addr, buff_size); } void GetTaskInfo(Service::Interface* self) { @@ -705,9 +701,9 @@ void GetTaskInfo(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, translation, buff_addr, buff_size); } void DeleteNsData(Service::Interface* self) { @@ -737,9 +733,9 @@ void GetNsDataHeaderInfo(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } void ReadNsData(Service::Interface* self) { @@ -761,11 +757,10 @@ void ReadNsData(Service::Interface* self) { cmd_buff[5] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_param4={:#010X}, translation={:#010X}, " - "buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, - buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_param4={:#010X}, translation={:#010X}, " + "buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } void SetNsDataAdditionalInfo(Service::Interface* self) { @@ -778,7 +773,7 @@ void SetNsDataAdditionalInfo(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}", unk_param1, - unk_param2); + unk_param2); } void GetNsDataAdditionalInfo(Service::Interface* self) { @@ -803,7 +798,7 @@ void SetNsDataNewFlag(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1={:#010X}, ns_data_new_flag={:#010X}", - unk_param1, ns_data_new_flag); + unk_param1, ns_data_new_flag); } void GetNsDataNewFlag(Service::Interface* self) { @@ -816,7 +811,7 @@ void GetNsDataNewFlag(Service::Interface* self) { cmd_buff[2] = ns_data_new_flag; LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1={:#010X}, ns_data_new_flag={:#010X}", - unk_param1, ns_data_new_flag); + unk_param1, ns_data_new_flag); } void GetNsDataLastUpdate(Service::Interface* self) { @@ -857,9 +852,9 @@ void RegisterStorageEntry(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "unk_param4={:#010X}, unk_param5={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4, unk_param5); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "unk_param4={:#010X}, unk_param5={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4, unk_param5); } void GetStorageEntryInfo(Service::Interface* self) { @@ -885,9 +880,9 @@ void SetStorageOption(Service::Interface* self) { cmd_buff[1] = RESULT_SUCCESS.raw; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " - "unk_param3={:#010X}, unk_param4={:#010X}", - unk_param1, unk_param2, unk_param3, unk_param4); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " + "unk_param3={:#010X}, unk_param4={:#010X}", + unk_param1, unk_param2, unk_param3, unk_param4); } void GetStorageOption(Service::Interface* self) { @@ -917,9 +912,9 @@ void StartBgImmediate(Service::Interface* self) { cmd_buff[3] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void GetTaskActivePriority(Service::Interface* self) { @@ -937,9 +932,9 @@ void GetTaskActivePriority(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}", - unk_param1, translation, buff_addr, buff_size); + "(STUBBED) buff_size={:#010X}, unk_param2={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}", + unk_param1, translation, buff_addr, buff_size); } void RegisterImmediateTask(Service::Interface* self) { @@ -958,9 +953,9 @@ void RegisterImmediateTask(Service::Interface* self) { cmd_buff[4] = buff_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " - "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", - unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, unk_param3={:#010X}, " + "translation={:#010X}, buff_addr={:#010X}, buff_size={:#010X}", + unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } void SetTaskQuery(Service::Interface* self) { @@ -983,11 +978,11 @@ void SetTaskQuery(Service::Interface* self) { cmd_buff[3] = buff2_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " - "translation1={:#010X}, buff1_addr={:#010X}, buff1_size={:#010X}, " - "translation2={:#010X}, buff2_addr={:#010X}, buff2_size={:#010X}", - unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, - buff2_addr, buff2_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " + "translation1={:#010X}, buff1_addr={:#010X}, buff1_size={:#010X}, " + "translation2={:#010X}, buff2_addr={:#010X}, buff2_size={:#010X}", + unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, + buff2_addr, buff2_size); } void GetTaskQuery(Service::Interface* self) { @@ -1010,11 +1005,11 @@ void GetTaskQuery(Service::Interface* self) { cmd_buff[3] = buff2_addr; LOG_WARNING(Service_BOSS, - "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " - "translation1={:#010X}, buff1_addr={:#010X}, buff1_size={:#010X}, " - "translation2={:#010X}, buff2_addr={:#010X}, buff2_size={:#010X}", - unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, - buff2_addr, buff2_size); + "(STUBBED) unk_param1={:#010X}, unk_param2={:#010X}, " + "translation1={:#010X}, buff1_addr={:#010X}, buff1_size={:#010X}, " + "translation2={:#010X}, buff2_addr={:#010X}, buff2_size={:#010X}", + unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, + buff2_addr, buff2_size); } void Init() { diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp index c0c8f78d8..aad4756a3 100644 --- a/src/core/hle/service/cam/cam.cpp +++ b/src/core/hle/service/cam/cam.cpp @@ -87,7 +87,7 @@ void Module::CompletionEventCallBack(u64 port_id, int) { if (port.x1 <= port.x0 || port.y1 <= port.y0 || port.x1 > original_width || port.y1 > original_height) { LOG_ERROR(Service_CAM, "Invalid trimming coordinates x0={}, y0={}, x1={}, y1={}", - port.x0, port.y0, port.x1, port.y1); + port.x0, port.y0, port.x1, port.y1); trim_width = 0; trim_height = 0; } else { @@ -98,7 +98,7 @@ void Module::CompletionEventCallBack(u64 port_id, int) { u32 trim_size = (port.x1 - port.x0) * (port.y1 - port.y0) * 2; if (port.dest_size != trim_size) { LOG_ERROR(Service_CAM, "The destination size ({}) doesn't match the source ({})!", - port.dest_size, trim_size); + port.dest_size, trim_size); } const u32 src_offset = port.y0 * original_width + port.x0; @@ -125,7 +125,7 @@ void Module::CompletionEventCallBack(u64 port_id, int) { std::size_t buffer_size = buffer.size() * sizeof(u16); if (port.dest_size != buffer_size) { LOG_ERROR(Service_CAM, "The destination size ({}) doesn't match the source ({})!", - port.dest_size, buffer_size); + port.dest_size, buffer_size); } Memory::WriteBlock(*port.dest_process, port.dest, buffer.data(), std::min(port.dest_size, buffer_size)); @@ -361,7 +361,7 @@ void Module::Interface::SetReceiving(Kernel::HLERequestContext& ctx) { } LOG_DEBUG(Service_CAM, "called, addr=0x{:X}, port_select={}, image_size={}, trans_unit={}", - dest, port_select.m_val, image_size, trans_unit); + dest, port_select.m_val, image_size, trans_unit); } void Module::Interface::IsFinishedReceiving(Kernel::HLERequestContext& ctx) { @@ -402,7 +402,7 @@ void Module::Interface::SetTransferLines(Kernel::HLERequestContext& ctx) { } LOG_WARNING(Service_CAM, "(STUBBED) called, port_select={}, lines={}, width={}, height={}", - port_select.m_val, transfer_lines, width, height); + port_select.m_val, transfer_lines, width, height); } void Module::Interface::GetMaxLines(Kernel::HLERequestContext& ctx) { @@ -457,7 +457,7 @@ void Module::Interface::SetTransferBytes(Kernel::HLERequestContext& ctx) { } LOG_WARNING(Service_CAM, "(STUBBED)called, port_select={}, bytes={}, width={}, height={}", - port_select.m_val, transfer_bytes, width, height); + port_select.m_val, transfer_bytes, width, height); } void Module::Interface::GetTransferBytes(Kernel::HLERequestContext& ctx) { @@ -564,8 +564,8 @@ void Module::Interface::SetTrimmingParams(Kernel::HLERequestContext& ctx) { rb.Push(ERROR_INVALID_ENUM_VALUE); } - LOG_DEBUG(Service_CAM, "called, port_select={}, x0={}, y0={}, x1={}, y1={}", - port_select.m_val, x0, y0, x1, y1); + LOG_DEBUG(Service_CAM, "called, port_select={}, x0={}, y0={}, x1={}, y1={}", port_select.m_val, + x0, y0, x1, y1); } void Module::Interface::GetTrimmingParams(Kernel::HLERequestContext& ctx) { @@ -612,7 +612,7 @@ void Module::Interface::SetTrimmingParamsCenter(Kernel::HLERequestContext& ctx) } LOG_DEBUG(Service_CAM, "called, port_select={}, trim_w={}, trim_h={}, cam_w={}, cam_h={}", - port_select.m_val, trim_w, trim_h, cam_w, cam_h); + port_select.m_val, trim_w, trim_h, cam_w, cam_h); } void Module::Interface::Activate(Kernel::HLERequestContext& ctx) { @@ -673,12 +673,12 @@ void Module::Interface::SwitchContext(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } else { LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); } LOG_DEBUG(Service_CAM, "called, camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); } void Module::Interface::FlipImage(Kernel::HLERequestContext& ctx) { @@ -700,12 +700,12 @@ void Module::Interface::FlipImage(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } else { LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); } LOG_DEBUG(Service_CAM, "called, camera_select={}, flip={}, context_select={}", - camera_select.m_val, static_cast(flip), context_select.m_val); + camera_select.m_val, static_cast(flip), context_select.m_val); } void Module::Interface::SetDetailSize(Kernel::HLERequestContext& ctx) { @@ -733,15 +733,15 @@ void Module::Interface::SetDetailSize(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } else { LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); } LOG_DEBUG(Service_CAM, - "called, camera_select={}, width={}, height={}, crop_x0={}, crop_y0={}, " - "crop_x1={}, crop_y1={}, context_select={}", - camera_select.m_val, resolution.width, resolution.height, resolution.crop_x0, - resolution.crop_y0, resolution.crop_x1, resolution.crop_y1, context_select.m_val); + "called, camera_select={}, width={}, height={}, crop_x0={}, crop_y0={}, " + "crop_x1={}, crop_y1={}, context_select={}", + camera_select.m_val, resolution.width, resolution.height, resolution.crop_x0, + resolution.crop_y0, resolution.crop_x1, resolution.crop_y1, context_select.m_val); } void Module::Interface::SetSize(Kernel::HLERequestContext& ctx) { @@ -763,12 +763,12 @@ void Module::Interface::SetSize(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } else { LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); } LOG_DEBUG(Service_CAM, "called, camera_select={}, size={}, context_select={}", - camera_select.m_val, size, context_select.m_val); + camera_select.m_val, size, context_select.m_val); } void Module::Interface::SetFrameRate(Kernel::HLERequestContext& ctx) { @@ -789,7 +789,7 @@ void Module::Interface::SetFrameRate(Kernel::HLERequestContext& ctx) { } LOG_WARNING(Service_CAM, "(STUBBED) called, camera_select={}, frame_rate={}", - camera_select.m_val, static_cast(frame_rate)); + camera_select.m_val, static_cast(frame_rate)); } void Module::Interface::SetEffect(Kernel::HLERequestContext& ctx) { @@ -811,12 +811,12 @@ void Module::Interface::SetEffect(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } else { LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); } LOG_DEBUG(Service_CAM, "called, camera_select={}, effect={}, context_select={}", - camera_select.m_val, static_cast(effect), context_select.m_val); + camera_select.m_val, static_cast(effect), context_select.m_val); } void Module::Interface::SetOutputFormat(Kernel::HLERequestContext& ctx) { @@ -838,12 +838,12 @@ void Module::Interface::SetOutputFormat(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } else { LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", camera_select.m_val, - context_select.m_val); + context_select.m_val); rb.Push(ERROR_INVALID_ENUM_VALUE); } LOG_DEBUG(Service_CAM, "called, camera_select={}, format={}, context_select={}", - camera_select.m_val, static_cast(format), context_select.m_val); + camera_select.m_val, static_cast(format), context_select.m_val); } void Module::Interface::SynchronizeVsyncTiming(Kernel::HLERequestContext& ctx) { @@ -855,7 +855,7 @@ void Module::Interface::SynchronizeVsyncTiming(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_WARNING(Service_CAM, "(STUBBED) called, camera_select1={}, camera_select2={}", - camera_select1, camera_select2); + camera_select1, camera_select2); } void Module::Interface::GetStereoCameraCalibrationData(Kernel::HLERequestContext& ctx) { @@ -918,8 +918,8 @@ ResultCode Module::SetPackageParameter(const PackageParameterType& package) { } return RESULT_SUCCESS; } else { - LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", - package.camera_select, package.context_select); + LOG_ERROR(Service_CAM, "invalid camera_select={}, context_select={}", package.camera_select, + package.context_select); return ERROR_INVALID_ENUM_VALUE; } } diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index 9b7278a48..7395399c4 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp @@ -161,7 +161,7 @@ void Module::Interface::GetCountryCodeID(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(2, 0); if (0 == country_code_id) { LOG_ERROR(Service_CFG, "requested country code name={}{} is invalid", - static_cast(country_code & 0xff), static_cast(country_code >> 8)); + static_cast(country_code & 0xff), static_cast(country_code >> 8)); rb.Push(ResultCode(ErrorDescription::NotFound, ErrorModule::Config, ErrorSummary::WrongArgument, ErrorLevel::Permanent)); rb.Push(0x00FF); @@ -310,21 +310,21 @@ ResultVal Module::GetConfigInfoBlockPointer(u32 block_id, u32 size, u32 f if (itr == std::end(config->block_entries)) { LOG_ERROR(Service_CFG, "Config block 0x{:X} with flags {} and size {} was not found", - block_id, flag, size); + block_id, flag, size); return ResultCode(ErrorDescription::NotFound, ErrorModule::Config, ErrorSummary::WrongArgument, ErrorLevel::Permanent); } if ((itr->flags & flag) == 0) { LOG_ERROR(Service_CFG, "Invalid flag {} for config block 0x{:X} with size {}", flag, - block_id, size); + block_id, size); return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::Config, ErrorSummary::WrongArgument, ErrorLevel::Permanent); } if (itr->size != size) { LOG_ERROR(Service_CFG, "Invalid size {} for config block 0x{:X} with flags {}", size, - block_id, flag); + block_id, flag); return ResultCode(ErrorDescription::InvalidSize, ErrorModule::Config, ErrorSummary::WrongArgument, ErrorLevel::Permanent); } @@ -607,7 +607,7 @@ void Module::SetPreferredRegionCode(u32 region_code) { AdjustLanguageInfoBlock(region_code, current_language); if (current_language != adjusted_language) { LOG_WARNING(Service_CFG, "System language {} does not fit the region. Adjusted to {}", - static_cast(current_language), static_cast(adjusted_language)); + static_cast(current_language), static_cast(adjusted_language)); SetSystemLanguage(adjusted_language); } } diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp index 53e59d5d7..0a5f7fecf 100644 --- a/src/core/hle/service/dsp_dsp.cpp +++ b/src/core/hle/service/dsp_dsp.cpp @@ -147,11 +147,11 @@ static void LoadComponent(Service::Interface* self) { Memory::ReadBlock(buffer, component_data.data(), component_data.size()); LOG_INFO(Service_DSP, "Firmware hash: {:#018x}", - Common::ComputeHash64(component_data.data(), component_data.size())); + Common::ComputeHash64(component_data.data(), component_data.size())); // Some versions of the firmware have the location of DSP structures listed here. if (size > 0x37C) { LOG_INFO(Service_DSP, "Structures hash: {:#018x}", - Common::ComputeHash64(component_data.data() + 0x340, 60)); + Common::ComputeHash64(component_data.data() + 0x340, 60)); } LOG_WARNING( Service_DSP, @@ -198,8 +198,8 @@ static void FlushDataCache(Service::Interface* self) { cmd_buff[0] = IPC::MakeHeader(0x13, 1, 0); cmd_buff[1] = RESULT_SUCCESS.raw; // No error - LOG_TRACE(Service_DSP, "called address=0x{:08X}, size=0x{:X}, process=0x{:08X}", address, - size, process); + LOG_TRACE(Service_DSP, "called address=0x{:08X}, size=0x{:X}, process=0x{:08X}", address, size, + process); } /** @@ -231,15 +231,15 @@ static void RegisterInterruptEvents(Service::Interface* self) { if (!evt) { LOG_INFO(Service_DSP, "Invalid event handle! type={}, pipe={}, event_handle=0x{:08X}", - type_index, pipe_index, event_handle); + type_index, pipe_index, event_handle); ASSERT(false); // TODO: This should really be handled at an IPC translation layer. } if (interrupt_events.HasTooManyEventsRegistered()) { LOG_INFO(Service_DSP, - "Ran out of space to register interrupts (Attempted to register " - "type={}, pipe={}, event_handle=0x{:08X})", - type_index, pipe_index, event_handle); + "Ran out of space to register interrupts (Attempted to register " + "type={}, pipe={}, event_handle=0x{:08X})", + type_index, pipe_index, event_handle); cmd_buff[1] = ResultCode(ErrorDescription::InvalidResultValue, ErrorModule::DSP, ErrorSummary::OutOfResource, ErrorLevel::Status) .raw; @@ -248,12 +248,12 @@ static void RegisterInterruptEvents(Service::Interface* self) { interrupt_events.Get(type, pipe) = evt; LOG_INFO(Service_DSP, "Registered type={}, pipe={}, event_handle=0x{:08X}", type_index, - pipe_index, event_handle); + pipe_index, event_handle); cmd_buff[1] = RESULT_SUCCESS.raw; } else { interrupt_events.Get(type, pipe) = nullptr; LOG_INFO(Service_DSP, "Unregistered interrupt={}, channel={}, event_handle=0x{:08X}", - type_index, pipe_index, event_handle); + type_index, pipe_index, event_handle); cmd_buff[1] = RESULT_SUCCESS.raw; } } @@ -296,9 +296,9 @@ static void WriteProcessPipe(Service::Interface* self) { if (IPC::StaticBufferDesc(size, 1) != cmd_buff[3]) { LOG_ERROR(Service_DSP, - "IPC static buffer descriptor failed validation (0x{:X}). pipe={}, " - "size=0x{:X}, buffer=0x{:08X}", - cmd_buff[3], pipe_index, size, buffer); + "IPC static buffer descriptor failed validation (0x{:X}). pipe={}, " + "size=0x{:X}, buffer=0x{:08X}", + cmd_buff[3], pipe_index, size, buffer); cmd_buff[0] = IPC::MakeHeader(0, 1, 0); cmd_buff[1] = IPC::ERR_INVALID_BUFFER_DESCRIPTOR.raw; return; @@ -454,7 +454,7 @@ static void GetPipeReadableSize(Service::Interface* self) { cmd_buff[2] = static_cast(Core::DSP().GetPipeReadableSize(pipe)); LOG_DEBUG(Service_DSP, "pipe={}, unknown=0x{:08X}, return cmd_buff[2]=0x{:08X}", pipe_index, - unknown, cmd_buff[2]); + unknown, cmd_buff[2]); } /** diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp index 51348d261..de45db0f6 100644 --- a/src/core/hle/service/err_f.cpp +++ b/src/core/hle/service/err_f.cpp @@ -134,11 +134,11 @@ static std::string GetCurrentSystemTime() { static void LogGenericInfo(const ErrInfo::ErrInfoCommon& errinfo_common) { LOG_CRITICAL(Service_ERR, "PID: 0x{:08X}", errinfo_common.pid); LOG_CRITICAL(Service_ERR, "REV: 0x{:08X}_0x{:08X}", errinfo_common.rev_high, - errinfo_common.rev_low); + errinfo_common.rev_low); LOG_CRITICAL(Service_ERR, "TID: 0x{:08X}_0x{:08X}", errinfo_common.title_id_high, - errinfo_common.title_id_low); + errinfo_common.title_id_low); LOG_CRITICAL(Service_ERR, "AID: 0x{:08X}_0x{:08X}", errinfo_common.app_title_id_high, - errinfo_common.app_title_id_low); + errinfo_common.app_title_id_low); LOG_CRITICAL(Service_ERR, "ADR: 0x{:08X}", errinfo_common.pc_address); ResultCode result_code{errinfo_common.result_code}; @@ -154,8 +154,7 @@ void ERR_F::ThrowFatalError(Kernel::HLERequestContext& ctx) { LOG_CRITICAL(Service_ERR, "Fatal error"); const ErrInfo errinfo = rp.PopRaw(); - LOG_CRITICAL(Service_ERR, "Fatal error type: {}", - GetErrType(errinfo.errinfo_common.specifier)); + LOG_CRITICAL(Service_ERR, "Fatal error type: {}", GetErrType(errinfo.errinfo_common.specifier)); Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorUnknown); // Generic Info @@ -178,23 +177,23 @@ void ERR_F::ThrowFatalError(Kernel::HLERequestContext& ctx) { ++index) { if (index < 13) { LOG_DEBUG(Service_ERR, "r{}=0x{:08X}", index, - errtype.exception_data.exception_context.arm_regs.at(index)); + errtype.exception_data.exception_context.arm_regs.at(index)); } else if (index == 13) { LOG_CRITICAL(Service_ERR, "SP=0x{:08X}", - errtype.exception_data.exception_context.arm_regs.at(index)); + errtype.exception_data.exception_context.arm_regs.at(index)); } else if (index == 14) { LOG_CRITICAL(Service_ERR, "LR=0x{:08X}", - errtype.exception_data.exception_context.arm_regs.at(index)); + errtype.exception_data.exception_context.arm_regs.at(index)); } else if (index == 15) { LOG_CRITICAL(Service_ERR, "PC=0x{:08X}", - errtype.exception_data.exception_context.arm_regs.at(index)); + errtype.exception_data.exception_context.arm_regs.at(index)); } } LOG_CRITICAL(Service_ERR, "CPSR=0x{:08X}", errtype.exception_data.exception_context.cpsr); // Exception Info LOG_CRITICAL(Service_ERR, "EXCEPTION TYPE: {}", - GetExceptionType(errtype.exception_data.exception_info.exception_type)); + GetExceptionType(errtype.exception_data.exception_info.exception_type)); switch (static_cast(errtype.exception_data.exception_info.exception_type)) { case ExceptionType::PrefetchAbort: LOG_CRITICAL(Service_ERR, "IFSR: 0x{:08X}", errtype.exception_data.exception_info.sr); @@ -206,11 +205,11 @@ void ERR_F::ThrowFatalError(Kernel::HLERequestContext& ctx) { break; case ExceptionType::VectorFP: LOG_CRITICAL(Service_ERR, "FPEXC: 0x{:08X}", - errtype.exception_data.exception_info.fpinst); + errtype.exception_data.exception_info.fpinst); LOG_CRITICAL(Service_ERR, "FINST: 0x{:08X}", - errtype.exception_data.exception_info.fpinst); + errtype.exception_data.exception_info.fpinst); LOG_CRITICAL(Service_ERR, "FINST2: 0x{:08X}", - errtype.exception_data.exception_info.fpinst2); + errtype.exception_data.exception_info.fpinst2); break; case ExceptionType::Undefined: break; // Not logging exception_info for this case diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index af8400087..22b338212 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -87,8 +87,8 @@ void File::Read(Kernel::HLERequestContext& ctx) { if (offset + length > backend->GetSize()) { LOG_ERROR(Service_FS, - "Reading from out of bounds offset=0x{:x} length=0x{:08X} file_size=0x{:x}", - offset, length, backend->GetSize()); + "Reading from out of bounds offset=0x{:x} length=0x{:08X} file_size=0x{:x}", + offset, length, backend->GetSize()); } IPC::RequestBuilder rb = rp.MakeBuilder(2, 2); @@ -120,7 +120,7 @@ void File::Write(Kernel::HLERequestContext& ctx) { u32 flush = rp.Pop(); auto& buffer = rp.PopMappedBuffer(); LOG_TRACE(Service_FS, "Write {}: offset=0x{:x} length={}, flush=0x{:x}", GetName(), offset, - length, flush); + length, flush); IPC::RequestBuilder rb = rp.MakeBuilder(2, 2); @@ -182,7 +182,7 @@ void File::Close(Kernel::HLERequestContext& ctx) { // TODO(Subv): Only close the backend if this client is the only one left. if (connected_sessions.size() > 1) LOG_WARNING(Service_FS, "Closing File backend but {} clients still connected", - connected_sessions.size()); + connected_sessions.size()); backend->Close(); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); @@ -405,7 +405,7 @@ ResultCode RegisterArchiveType(std::unique_ptr&& factor auto& archive = result.first->second; LOG_DEBUG(Service_FS, "Registered archive {} with id code 0x{:08X}", archive->GetName(), - static_cast(id_code)); + static_cast(id_code)); return RESULT_SUCCESS; } @@ -630,7 +630,7 @@ void RegisterArchiveTypes() { RegisterArchiveType(std::move(sdmcwo_factory), ArchiveIdCode::SDMCWriteOnly); else LOG_ERROR(Service_FS, "Can't instantiate SDMCWriteOnly archive with path {}", - sdmc_directory); + sdmc_directory); // Create the SaveData archive auto sd_savedata_source = std::make_shared(sdmc_directory); @@ -651,7 +651,7 @@ void RegisterArchiveTypes() { RegisterArchiveType(std::move(extsavedata_factory), ArchiveIdCode::ExtSaveData); else LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path {}", - extsavedata_factory->GetMountPoint()); + extsavedata_factory->GetMountPoint()); auto sharedextsavedata_factory = std::make_unique(nand_directory, true); @@ -659,7 +659,7 @@ void RegisterArchiveTypes() { RegisterArchiveType(std::move(sharedextsavedata_factory), ArchiveIdCode::SharedExtSaveData); else LOG_ERROR(Service_FS, "Can't instantiate SharedExtSaveData archive with path {}", - sharedextsavedata_factory->GetMountPoint()); + sharedextsavedata_factory->GetMountPoint()); // Create the NCCH archive, basically a small variation of the RomFS archive auto savedatacheck_factory = std::make_unique(); @@ -676,9 +676,8 @@ void RegisterArchiveTypes() { void RegisterSelfNCCH(Loader::AppLoader& app_loader) { auto itr = id_code_map.find(ArchiveIdCode::SelfNCCH); if (itr == id_code_map.end()) { - LOG_ERROR( - Service_FS, - "Could not register a new NCCH because the SelfNCCH archive hasn't been created"); + LOG_ERROR(Service_FS, + "Could not register a new NCCH because the SelfNCCH archive hasn't been created"); return; } diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index 1b48685fc..674db8e3b 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp @@ -54,8 +54,7 @@ void FS_USER::OpenFile(Kernel::HLERequestContext& ctx) { ASSERT(filename.size() == filename_size); FileSys::Path file_path(filename_type, filename); - LOG_DEBUG(Service_FS, "path={}, mode={} attrs={}", file_path.DebugStr(), mode.hex, - attributes); + LOG_DEBUG(Service_FS, "path={}, mode={} attrs={}", file_path.DebugStr(), mode.hex, attributes); ResultVal> file_res = OpenFileFromArchive(archive_handle, file_path, mode); @@ -88,18 +87,17 @@ void FS_USER::OpenFileDirectly(Kernel::HLERequestContext& ctx) { FileSys::Path archive_path(archivename_type, archivename); FileSys::Path file_path(filename_type, filename); - LOG_DEBUG(Service_FS, - "archive_id=0x{:08X} archive_path={} file_path={}, mode={} attributes={}", - static_cast(archive_id), archive_path.DebugStr(), file_path.DebugStr(), - mode.hex, attributes); + LOG_DEBUG(Service_FS, "archive_id=0x{:08X} archive_path={} file_path={}, mode={} attributes={}", + static_cast(archive_id), archive_path.DebugStr(), file_path.DebugStr(), mode.hex, + attributes); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); ResultVal archive_handle = Service::FS::OpenArchive(archive_id, archive_path); if (archive_handle.Failed()) { LOG_ERROR(Service_FS, - "Failed to get a handle for archive archive_id=0x{:08X} archive_path={}", - static_cast(archive_id), archive_path.DebugStr()); + "Failed to get a handle for archive archive_id=0x{:08X} archive_path={}", + static_cast(archive_id), archive_path.DebugStr()); rb.Push(archive_handle.Code()); rb.PushMoveObjects(nullptr); return; @@ -115,7 +113,7 @@ void FS_USER::OpenFileDirectly(Kernel::HLERequestContext& ctx) { } else { rb.PushMoveObjects(nullptr); LOG_ERROR(Service_FS, "failed to get a handle for file {} mode={} attributes={}", - file_path.DebugStr(), mode.hex, attributes); + file_path.DebugStr(), mode.hex, attributes); } } @@ -130,8 +128,8 @@ void FS_USER::DeleteFile(Kernel::HLERequestContext& ctx) { FileSys::Path file_path(filename_type, filename); - LOG_DEBUG(Service_FS, "type={} size={} data={}", static_cast(filename_type), - filename_size, file_path.DebugStr()); + LOG_DEBUG(Service_FS, "type={} size={} data={}", static_cast(filename_type), filename_size, + file_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(DeleteFileFromArchive(archive_handle, file_path)); @@ -155,10 +153,10 @@ void FS_USER::RenameFile(Kernel::HLERequestContext& ctx) { FileSys::Path src_file_path(src_filename_type, src_filename); FileSys::Path dest_file_path(dest_filename_type, dest_filename); - LOG_DEBUG( - Service_FS, "src_type={} src_size={} src_data={} dest_type={} dest_size={} dest_data={}", - static_cast(src_filename_type), src_filename_size, src_file_path.DebugStr(), - static_cast(dest_filename_type), dest_filename_size, dest_file_path.DebugStr()); + LOG_DEBUG(Service_FS, + "src_type={} src_size={} src_data={} dest_type={} dest_size={} dest_data={}", + static_cast(src_filename_type), src_filename_size, src_file_path.DebugStr(), + static_cast(dest_filename_type), dest_filename_size, dest_file_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RenameFileBetweenArchives(src_archive_handle, src_file_path, dest_archive_handle, @@ -178,7 +176,7 @@ void FS_USER::DeleteDirectory(Kernel::HLERequestContext& ctx) { FileSys::Path dir_path(dirname_type, dirname); LOG_DEBUG(Service_FS, "type={} size={} data={}", static_cast(dirname_type), dirname_size, - dir_path.DebugStr()); + dir_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(DeleteDirectoryFromArchive(archive_handle, dir_path)); @@ -197,7 +195,7 @@ void FS_USER::DeleteDirectoryRecursively(Kernel::HLERequestContext& ctx) { FileSys::Path dir_path(dirname_type, dirname); LOG_DEBUG(Service_FS, "type={} size={} data={}", static_cast(dirname_type), dirname_size, - dir_path.DebugStr()); + dir_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(DeleteDirectoryRecursivelyFromArchive(archive_handle, dir_path)); @@ -218,7 +216,7 @@ void FS_USER::CreateFile(Kernel::HLERequestContext& ctx) { FileSys::Path file_path(filename_type, filename); LOG_DEBUG(Service_FS, "type={} attributes={} size={:x} data={}", - static_cast(filename_type), attributes, file_size, file_path.DebugStr()); + static_cast(filename_type), attributes, file_size, file_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(CreateFileInArchive(archive_handle, file_path, file_size)); @@ -236,7 +234,7 @@ void FS_USER::CreateDirectory(Kernel::HLERequestContext& ctx) { FileSys::Path dir_path(dirname_type, dirname); LOG_DEBUG(Service_FS, "type={} size={} data={}", static_cast(dirname_type), dirname_size, - dir_path.DebugStr()); + dir_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(CreateDirectoryFromArchive(archive_handle, dir_path)); @@ -260,9 +258,9 @@ void FS_USER::RenameDirectory(Kernel::HLERequestContext& ctx) { FileSys::Path dest_dir_path(dest_dirname_type, dest_dirname); LOG_DEBUG(Service_FS, - "src_type={} src_size={} src_data={} dest_type={} dest_size={} dest_data={}", - static_cast(src_dirname_type), src_dirname_size, src_dir_path.DebugStr(), - static_cast(dest_dirname_type), dest_dirname_size, dest_dir_path.DebugStr()); + "src_type={} src_size={} src_data={} dest_type={} dest_size={} dest_data={}", + static_cast(src_dirname_type), src_dirname_size, src_dir_path.DebugStr(), + static_cast(dest_dirname_type), dest_dirname_size, dest_dir_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RenameDirectoryBetweenArchives(src_archive_handle, src_dir_path, dest_archive_handle, @@ -280,7 +278,7 @@ void FS_USER::OpenDirectory(Kernel::HLERequestContext& ctx) { FileSys::Path dir_path(dirname_type, dirname); LOG_DEBUG(Service_FS, "type={} size={} data={}", static_cast(dirname_type), dirname_size, - dir_path.DebugStr()); + dir_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); ResultVal> dir_res = @@ -293,7 +291,7 @@ void FS_USER::OpenDirectory(Kernel::HLERequestContext& ctx) { rb.PushMoveObjects(std::get>(sessions)); } else { LOG_ERROR(Service_FS, "failed to get a handle for directory type={} size={} data={}", - static_cast(dirname_type), dirname_size, dir_path.DebugStr()); + static_cast(dirname_type), dirname_size, dir_path.DebugStr()); rb.PushMoveObjects(nullptr); } } @@ -308,7 +306,7 @@ void FS_USER::OpenArchive(Kernel::HLERequestContext& ctx) { FileSys::Path archive_path(archivename_type, archivename); LOG_DEBUG(Service_FS, "archive_id=0x{:08X} archive_path={}", static_cast(archive_id), - archive_path.DebugStr()); + archive_path.DebugStr()); IPC::RequestBuilder rb = rp.MakeBuilder(3, 0); ResultVal handle = Service::FS::OpenArchive(archive_id, archive_path); @@ -318,8 +316,8 @@ void FS_USER::OpenArchive(Kernel::HLERequestContext& ctx) { } else { rb.Push(0); LOG_ERROR(Service_FS, - "failed to get a handle for archive archive_id=0x{:08X} archive_path={}", - static_cast(archive_id), archive_path.DebugStr()); + "failed to get a handle for archive archive_id=0x{:08X} archive_path={}", + static_cast(archive_id), archive_path.DebugStr()); } } @@ -369,7 +367,7 @@ void FS_USER::FormatSaveData(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); if (archive_id != FS::ArchiveIdCode::SaveData) { LOG_ERROR(Service_FS, "tried to format an archive different than SaveData, {}", - static_cast(archive_id)); + static_cast(archive_id)); rb.Push(FileSys::ERROR_INVALID_PATH); return; } @@ -439,9 +437,9 @@ void FS_USER::CreateExtSaveData(Kernel::HLERequestContext& ctx) { auto icon_buffer = rp.PopMappedBuffer(); LOG_WARNING(Service_FS, - "(STUBBED) savedata_high={:08X} savedata_low={:08X} unknown={:08X} " - "files={:08X} directories={:08X} size_limit={:016x} icon_size={:08X}", - save_high, save_low, unknown, directories, files, size_limit, icon_size); + "(STUBBED) savedata_high={:08X} savedata_low={:08X} unknown={:08X} " + "files={:08X} directories={:08X} size_limit={:016x} icon_size={:08X}", + save_high, save_low, unknown, directories, files, size_limit, icon_size); std::vector icon(icon_size); icon_buffer.Read(icon.data(), 0, icon_size); @@ -465,8 +463,8 @@ void FS_USER::DeleteExtSaveData(Kernel::HLERequestContext& ctx) { u32 unknown = rp.Pop(); // TODO(Subv): Figure out what this is LOG_WARNING(Service_FS, - "(STUBBED) save_low={:08X} save_high={:08X} media_type={:08X} unknown={:08X}", - save_low, save_high, static_cast(media_type), unknown); + "(STUBBED) save_low={:08X} save_high={:08X} media_type={:08X} unknown={:08X}", + save_low, save_high, static_cast(media_type), unknown); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(Service::FS::DeleteExtSaveData(media_type, save_high, save_low)); @@ -524,10 +522,10 @@ void FS_USER::CreateLegacySystemSaveData(Kernel::HLERequestContext& ctx) { bool duplicate = rp.Pop(); LOG_WARNING(Service_FS, - "(STUBBED) savedata_id={:08X} total_size={:08X} block_size={:08X} directories={} " - "files={} directory_buckets={} file_buckets={} duplicate={}", - savedata_id, total_size, block_size, directories, files, directory_buckets, - file_buckets, duplicate); + "(STUBBED) savedata_id={:08X} total_size={:08X} block_size={:08X} directories={} " + "files={} directory_buckets={} file_buckets={} duplicate={}", + savedata_id, total_size, block_size, directories, files, directory_buckets, + file_buckets, duplicate); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); // With this command, the SystemSaveData always has save_high = 0 (Always created in the NAND) @@ -667,9 +665,9 @@ void FS_USER::SetSaveDataSecureValue(Kernel::HLERequestContext& ctx) { // TODO: Generate and Save the Secure Value LOG_WARNING(Service_FS, - "(STUBBED) called, value=0x{:016x} secure_value_slot=0x{:08X} " - "unqiue_id=0x{:08X} title_variation=0x{:02X}", - value, secure_value_slot, unique_id, title_variation); + "(STUBBED) called, value=0x{:016x} secure_value_slot=0x{:08X} " + "unqiue_id=0x{:08X} title_variation=0x{:02X}", + value, secure_value_slot, unique_id, title_variation); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp index 4e4ce399f..5835f1587 100644 --- a/src/core/hle/service/gsp/gsp_gpu.cpp +++ b/src/core/hle/service/gsp/gsp_gpu.cpp @@ -120,10 +120,9 @@ static ResultCode WriteHWRegs(u32 base_address, u32 size_in_bytes, const std::ve const u32 max_size_in_bytes = 0x80; if (base_address & 3 || base_address >= 0x420000) { - LOG_ERROR( - Service_GSP, - "Write address was out of range or misaligned! (address=0x{:08x}, size=0x{:08x})", - base_address, size_in_bytes); + LOG_ERROR(Service_GSP, + "Write address was out of range or misaligned! (address=0x{:08x}, size=0x{:08x})", + base_address, size_in_bytes); return ERR_REGS_OUTOFRANGE_OR_MISALIGNED; } else if (size_in_bytes <= max_size_in_bytes) { if (size_in_bytes & 3) { @@ -165,10 +164,9 @@ static ResultCode WriteHWRegsWithMask(u32 base_address, u32 size_in_bytes, const u32 max_size_in_bytes = 0x80; if (base_address & 3 || base_address >= 0x420000) { - LOG_ERROR( - Service_GSP, - "Write address was out of range or misaligned! (address=0x{:08x}, size=0x{:08x})", - base_address, size_in_bytes); + LOG_ERROR(Service_GSP, + "Write address was out of range or misaligned! (address=0x{:08x}, size=0x{:08x})", + base_address, size_in_bytes); return ERR_REGS_OUTOFRANGE_OR_MISALIGNED; } else if (size_in_bytes <= max_size_in_bytes) { if (size_in_bytes & 3) { @@ -319,8 +317,8 @@ void GSP_GPU::FlushDataCache(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_GSP, "(STUBBED) called address=0x{:08X}, size=0x{:08X}, process={}", - address, size, process->process_id); + LOG_DEBUG(Service_GSP, "(STUBBED) called address=0x{:08X}, size=0x{:08X}, process={}", address, + size, process->process_id); } void GSP_GPU::InvalidateDataCache(Kernel::HLERequestContext& ctx) { @@ -334,8 +332,8 @@ void GSP_GPU::InvalidateDataCache(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_GSP, "(STUBBED) called address=0x{:08X}, size=0x{:08X}, process={}", - address, size, process->process_id); + LOG_DEBUG(Service_GSP, "(STUBBED) called address=0x{:08X}, size=0x{:08X}, process={}", address, + size, process->process_id); } void GSP_GPU::SetAxiConfigQoSMode(Kernel::HLERequestContext& ctx) { @@ -680,7 +678,7 @@ void GSP_GPU::AcquireRight(Kernel::HLERequestContext& ctx) { SessionData* session_data = GetSessionData(ctx.Session()); LOG_WARNING(Service_GSP, "called flag={:08X} process={} thread_id={}", flag, - process->process_id, session_data->thread_id); + process->process_id, session_data->thread_id); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); @@ -726,8 +724,8 @@ void GSP_GPU::StoreDataCache(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_GSP, "(STUBBED) called address=0x{:08X}, size=0x{:08X}, process={}", - address, size, process->process_id); + LOG_DEBUG(Service_GSP, "(STUBBED) called address=0x{:08X}, size=0x{:08X}, process={}", address, + size, process->process_id); } void GSP_GPU::SetLedForceOff(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/ir/extra_hid.cpp b/src/core/hle/service/ir/extra_hid.cpp index 56008c3ae..f1f0c1043 100644 --- a/src/core/hle/service/ir/extra_hid.cpp +++ b/src/core/hle/service/ir/extra_hid.cpp @@ -166,7 +166,7 @@ void ExtraHID::OnDisconnect() { void ExtraHID::HandleConfigureHIDPollingRequest(const std::vector& request) { if (request.size() != 3) { LOG_ERROR(Service_IR, "Wrong request size ({}): {}", request.size(), - Common::ArrayToString(request.data(), request.size())); + Common::ArrayToString(request.data(), request.size())); return; } @@ -188,7 +188,7 @@ void ExtraHID::HandleReadCalibrationDataRequest(const std::vector& request_b if (request_buf.size() != sizeof(ReadCalibrationDataRequest)) { LOG_ERROR(Service_IR, "Wrong request size ({}): {}", request_buf.size(), - Common::ArrayToString(request_buf.data(), request_buf.size())); + Common::ArrayToString(request_buf.data(), request_buf.size())); return; } @@ -200,7 +200,7 @@ void ExtraHID::HandleReadCalibrationDataRequest(const std::vector& request_b if (offset + size > calibration_data.size()) { LOG_ERROR(Service_IR, "Read beyond the end of calibration data! (offset={}, size={})", - offset, size); + offset, size); return; } @@ -223,7 +223,7 @@ void ExtraHID::OnReceive(const std::vector& data) { break; default: LOG_ERROR(Service_IR, "Unknown request: {}", - Common::ArrayToString(data.data(), data.size())); + Common::ArrayToString(data.data(), data.size())); break; } } diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp index d8ad6ab06..1ac00663f 100644 --- a/src/core/hle/service/ir/ir_user.cpp +++ b/src/core/hle/service/ir/ir_user.cpp @@ -183,8 +183,7 @@ private: /// Wraps the payload into packet and puts it to the receive buffer void IR_USER::PutToReceive(const std::vector& payload) { - LOG_TRACE(Service_IR, "called, data={}", - Common::ArrayToString(payload.data(), payload.size())); + LOG_TRACE(Service_IR, "called, data={}", Common::ArrayToString(payload.data(), payload.size())); size_t size = payload.size(); std::vector packet; @@ -252,11 +251,11 @@ void IR_USER::InitializeIrNopShared(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_INFO(Service_IR, - "called, shared_buff_size={}, recv_buff_size={}, " - "recv_buff_packet_count={}, send_buff_size={}, " - "send_buff_packet_count={}, baud_rate={}", - shared_buff_size, recv_buff_size, recv_buff_packet_count, send_buff_size, - send_buff_packet_count, baud_rate); + "called, shared_buff_size={}, recv_buff_size={}, " + "recv_buff_packet_count={}, send_buff_size={}, " + "send_buff_packet_count={}, baud_rate={}", + shared_buff_size, recv_buff_size, recv_buff_packet_count, send_buff_size, + send_buff_packet_count, baud_rate); } void IR_USER::RequireConnection(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index 903b25c55..272f1b027 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp @@ -551,7 +551,7 @@ ResultCode CROHelper::ApplyStaticAnonymousSymbolToCRS(VAddr crs_address) { CROHelper crs(crs_address); u32 offset_export_num = GetField(StaticAnonymousSymbolNum); LOG_INFO(Service_LDR, "CRO \"{}\" exports {} static anonymous symbols", ModuleName(), - offset_export_num); + offset_export_num); for (u32 i = 0; i < offset_export_num; ++i) { StaticAnonymousSymbolEntry entry; GetEntry(i, entry); @@ -564,7 +564,7 @@ ResultCode CROHelper::ApplyStaticAnonymousSymbolToCRS(VAddr crs_address) { u32 symbol_address = SegmentTagToAddress(entry.symbol_position); LOG_TRACE(Service_LDR, "CRO \"{}\" exports 0x{:08X} to the static module", ModuleName(), - symbol_address); + symbol_address); ResultCode result = crs.ApplyRelocationBatch(batch_address, symbol_address); if (result.IsError()) { LOG_ERROR(Service_LDR, "Error applying relocation batch {:08X}", result.raw); @@ -604,7 +604,7 @@ ResultCode CROHelper::ApplyInternalRelocations(u32 old_data_segment_address) { SegmentEntry symbol_segment; GetEntry(relocation.symbol_segment, symbol_segment); LOG_TRACE(Service_LDR, "Internally relocates 0x{:08X} with 0x{:08X}", target_address, - symbol_segment.offset); + symbol_segment.offset); ResultCode result = ApplyRelocation(target_address, relocation.type, relocation.addend, symbol_segment.offset, target_addressB); if (result.IsError()) { @@ -765,12 +765,12 @@ ResultCode CROHelper::ApplyImportNamedSymbol(VAddr crs_address) { if (symbol_address != 0) { LOG_TRACE(Service_LDR, "CRO \"{}\" imports \"{}\" from \"{}\"", - ModuleName(), symbol_name, source.ModuleName()); + ModuleName(), symbol_name, source.ModuleName()); ResultCode result = ApplyRelocationBatch(relocation_addr, symbol_address); if (result.IsError()) { LOG_ERROR(Service_LDR, "Error applying relocation batch {:08X}", - result.raw); + result.raw); return result; } @@ -860,7 +860,7 @@ ResultCode CROHelper::ApplyModuleImport(VAddr crs_address) { ForEachAutoLinkCRO(crs_address, [&](CROHelper source) -> ResultVal { if (want_cro_name == source.ModuleName()) { LOG_INFO(Service_LDR, "CRO \"{}\" imports {} indexed symbols from \"{}\"", - ModuleName(), entry.import_indexed_symbol_num, source.ModuleName()); + ModuleName(), entry.import_indexed_symbol_num, source.ModuleName()); for (u32 j = 0; j < entry.import_indexed_symbol_num; ++j) { ImportIndexedSymbolEntry im; entry.GetImportIndexedSymbolEntry(j, im); @@ -872,13 +872,12 @@ ResultCode CROHelper::ApplyModuleImport(VAddr crs_address) { ApplyRelocationBatch(im.relocation_batch_offset, symbol_address); if (result.IsError()) { LOG_ERROR(Service_LDR, "Error applying relocation batch {:08X}", - result.raw); + result.raw); return result; } } LOG_INFO(Service_LDR, "CRO \"{}\" imports {} anonymous symbols from \"{}\"", - ModuleName(), entry.import_anonymous_symbol_num, - source.ModuleName()); + ModuleName(), entry.import_anonymous_symbol_num, source.ModuleName()); for (u32 j = 0; j < entry.import_anonymous_symbol_num; ++j) { ImportAnonymousSymbolEntry im; entry.GetImportAnonymousSymbolEntry(j, im); @@ -888,7 +887,7 @@ ResultCode CROHelper::ApplyModuleImport(VAddr crs_address) { ApplyRelocationBatch(im.relocation_batch_offset, symbol_address); if (result.IsError()) { LOG_ERROR(Service_LDR, "Error applying relocation batch {:08X}", - result.raw); + result.raw); return result; } } @@ -905,7 +904,7 @@ ResultCode CROHelper::ApplyModuleImport(VAddr crs_address) { ResultCode CROHelper::ApplyExportNamedSymbol(CROHelper target) { LOG_DEBUG(Service_LDR, "CRO \"{}\" exports named symbols to \"{}\"", ModuleName(), - target.ModuleName()); + target.ModuleName()); u32 target_import_strings_size = target.GetField(ImportStringsSize); u32 target_symbol_import_num = target.GetField(ImportNamedSymbolNum); for (u32 i = 0; i < target_symbol_import_num; ++i) { @@ -934,7 +933,7 @@ ResultCode CROHelper::ApplyExportNamedSymbol(CROHelper target) { ResultCode CROHelper::ResetExportNamedSymbol(CROHelper target) { LOG_DEBUG(Service_LDR, "CRO \"{}\" unexports named symbols to \"{}\"", ModuleName(), - target.ModuleName()); + target.ModuleName()); u32 unresolved_symbol = target.GetOnUnresolvedAddress(); u32 target_import_strings_size = target.GetField(ImportStringsSize); u32 target_symbol_import_num = target.GetField(ImportNamedSymbolNum); @@ -975,7 +974,7 @@ ResultCode CROHelper::ApplyModuleExport(CROHelper target) { continue; LOG_INFO(Service_LDR, "CRO \"{}\" exports {} indexed symbols to \"{}\"", module_name, - entry.import_indexed_symbol_num, target.ModuleName()); + entry.import_indexed_symbol_num, target.ModuleName()); for (u32 j = 0; j < entry.import_indexed_symbol_num; ++j) { ImportIndexedSymbolEntry im; entry.GetImportIndexedSymbolEntry(j, im); @@ -992,7 +991,7 @@ ResultCode CROHelper::ApplyModuleExport(CROHelper target) { } LOG_INFO(Service_LDR, "CRO \"{}\" exports {} anonymous symbols to \"{}\"", module_name, - entry.import_anonymous_symbol_num, target.ModuleName()); + entry.import_anonymous_symbol_num, target.ModuleName()); for (u32 j = 0; j < entry.import_anonymous_symbol_num; ++j) { ImportAnonymousSymbolEntry im; entry.GetImportAnonymousSymbolEntry(j, im); @@ -1024,7 +1023,7 @@ ResultCode CROHelper::ResetModuleExport(CROHelper target) { continue; LOG_DEBUG(Service_LDR, "CRO \"{}\" unexports indexed symbols to \"{}\"", module_name, - target.ModuleName()); + target.ModuleName()); for (u32 j = 0; j < entry.import_indexed_symbol_num; ++j) { ImportIndexedSymbolEntry im; entry.GetImportIndexedSymbolEntry(j, im); @@ -1037,7 +1036,7 @@ ResultCode CROHelper::ResetModuleExport(CROHelper target) { } LOG_DEBUG(Service_LDR, "CRO \"{}\" unexports anonymous symbols to \"{}\"", module_name, - target.ModuleName()); + target.ModuleName()); for (u32 j = 0; j < entry.import_anonymous_symbol_num; ++j) { ImportAnonymousSymbolEntry im; entry.GetImportAnonymousSymbolEntry(j, im); @@ -1070,12 +1069,12 @@ ResultCode CROHelper::ApplyExitRelocations(VAddr crs_address) { if (symbol_address != 0) { LOG_DEBUG(Service_LDR, "CRO \"{}\" import exit function from \"{}\"", - ModuleName(), source.ModuleName()); + ModuleName(), source.ModuleName()); ResultCode result = ApplyRelocationBatch(relocation_addr, symbol_address); if (result.IsError()) { LOG_ERROR(Service_LDR, "Error applying relocation batch {:08X}", - result.raw); + result.raw); return result; } diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp index 2a585a544..fdb7b0fdf 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.cpp +++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp @@ -58,9 +58,8 @@ void RO::Initialize(Kernel::HLERequestContext& ctx) { // All other service functions below have the same issue. auto process = rp.PopObject(); - LOG_DEBUG(Service_LDR, - "called, crs_buffer_ptr=0x{:08X}, crs_address=0x{:08X}, crs_size=0x{:X}", - crs_buffer_ptr, crs_address, crs_size); + LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x{:08X}, crs_address=0x{:08X}, crs_size=0x{:X}", + crs_buffer_ptr, crs_address, crs_size); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); @@ -167,7 +166,7 @@ void RO::LoadCRR(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_WARNING(Service_LDR, "(STUBBED) called, crr_buffer_ptr=0x{:08X}, crr_size=0x{:08X}", - crr_buffer_ptr, crr_size); + crr_buffer_ptr, crr_size); } void RO::UnloadCRR(Kernel::HLERequestContext& ctx) { @@ -197,13 +196,13 @@ void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) { auto process = rp.PopObject(); LOG_DEBUG(Service_LDR, - "called ({}), cro_buffer_ptr=0x{:08X}, cro_address=0x{:08X}, cro_size=0x{:X}, " - "data_segment_address=0x{:08X}, zero={}, data_segment_size=0x{:X}, " - "bss_segment_address=0x{:08X}, bss_segment_size=0x{:X}, auto_link={}, " - "fix_level={}, crr_address=0x{:08X}", - link_on_load_bug_fix ? "new" : "old", cro_buffer_ptr, cro_address, cro_size, - data_segment_address, zero, data_segment_size, bss_segment_address, - bss_segment_size, auto_link ? "true" : "false", fix_level, crr_address); + "called ({}), cro_buffer_ptr=0x{:08X}, cro_address=0x{:08X}, cro_size=0x{:X}, " + "data_segment_address=0x{:08X}, zero={}, data_segment_size=0x{:X}, " + "bss_segment_address=0x{:08X}, bss_segment_size=0x{:X}, auto_link={}, " + "fix_level={}, crr_address=0x{:08X}", + link_on_load_bug_fix ? "new" : "old", cro_buffer_ptr, cro_address, cro_size, + data_segment_address, zero, data_segment_size, bss_segment_address, bss_segment_size, + auto_link ? "true" : "false", fix_level, crr_address); IPC::RequestBuilder rb = rp.MakeBuilder(2, 0); @@ -373,7 +372,7 @@ void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) { Core::CPU().InvalidateCacheRange(cro_address, cro_size); LOG_INFO(Service_LDR, "CRO \"{}\" loaded at 0x{:08X}, fixed_end=0x{:08X}", cro.ModuleName(), - cro_address, cro_address + fix_size); + cro_address, cro_address + fix_size); rb.Push(RESULT_SUCCESS, fix_size); } @@ -386,7 +385,7 @@ void RO::UnloadCRO(Kernel::HLERequestContext& ctx) { auto process = rp.PopObject(); LOG_DEBUG(Service_LDR, "called, cro_address=0x{:08X}, zero={}, cro_buffer_ptr=0x{:08X}", - cro_address, zero, cro_buffer_ptr); + cro_address, zero, cro_buffer_ptr); CROHelper cro(cro_address); diff --git a/src/core/hle/service/mic_u.cpp b/src/core/hle/service/mic_u.cpp index 4e293f255..4e07abe70 100644 --- a/src/core/hle/service/mic_u.cpp +++ b/src/core/hle/service/mic_u.cpp @@ -64,10 +64,10 @@ struct MIC_U::Impl { rb.Push(RESULT_SUCCESS); is_sampling = true; LOG_WARNING(Service_MIC, - "(STUBBED) called, encoding={}, sample_rate={}, " - "audio_buffer_offset={}, audio_buffer_size={}, audio_buffer_loop={}", - static_cast(encoding), static_cast(sample_rate), - audio_buffer_offset, audio_buffer_size, audio_buffer_loop); + "(STUBBED) called, encoding={}, sample_rate={}, " + "audio_buffer_offset={}, audio_buffer_size={}, audio_buffer_loop={}", + static_cast(encoding), static_cast(sample_rate), audio_buffer_offset, + audio_buffer_size, audio_buffer_loop); } void AdjustSampling(Kernel::HLERequestContext& ctx) { @@ -76,8 +76,7 @@ struct MIC_U::Impl { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_WARNING(Service_MIC, "(STUBBED) called, sample_rate={}", - static_cast(sample_rate)); + LOG_WARNING(Service_MIC, "(STUBBED) called, sample_rate={}", static_cast(sample_rate)); } void StopSampling(Kernel::HLERequestContext& ctx) { @@ -148,7 +147,7 @@ struct MIC_U::Impl { rb.Push(RESULT_SUCCESS); rb.PushMappedBuffer(buffer); LOG_WARNING(Service_MIC, "(STUBBED) called, size=0x{:X}, buffer=0x{:08X}", size, - buffer.GetId()); + buffer.GetId()); } void SetClamp(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/ndm/ndm_u.cpp b/src/core/hle/service/ndm/ndm_u.cpp index 8581f5cd2..73282cb36 100644 --- a/src/core/hle/service/ndm/ndm_u.cpp +++ b/src/core/hle/service/ndm/ndm_u.cpp @@ -16,7 +16,7 @@ void NDM_U::EnterExclusiveState(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); LOG_WARNING(Service_NDM, "(STUBBED) exclusive_state=0x{:08X}", - static_cast(exclusive_state)); + static_cast(exclusive_state)); } void NDM_U::LeaveExclusiveState(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index e491e2994..36f403805 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -239,7 +239,7 @@ static void HandleEAPoLPacket(const Network::WifiPacket& packet) { if (GetEAPoLFrameType(packet.data) == EAPoLStartMagic) { if (connection_status.status != static_cast(NetworkStatus::ConnectedAsHost)) { LOG_DEBUG(Service_NWM, "Connection sequence aborted, because connection status is {}", - connection_status.status); + connection_status.status); return; } @@ -426,7 +426,7 @@ void SendAssociationResponseFrame(const MacAddress& address) { std::lock_guard lock(connection_status_mutex); if (connection_status.status != static_cast(NetworkStatus::ConnectedAsHost)) { LOG_ERROR(Service_NWM, "Connection sequence aborted, because connection status is {}", - connection_status.status); + connection_status.status); return; } @@ -458,8 +458,8 @@ void HandleAuthenticationFrame(const Network::WifiPacket& packet) { std::lock_guard lock(connection_status_mutex); if (connection_status.status != static_cast(NetworkStatus::ConnectedAsHost)) { LOG_ERROR(Service_NWM, - "Connection sequence aborted, because connection status is {}", - connection_status.status); + "Connection sequence aborted, because connection status is {}", + connection_status.status); return; } @@ -618,9 +618,9 @@ void NWM_UDS::RecvBeaconBroadcastData(Kernel::HLERequestContext& ctx) { rb.PushMappedBuffer(out_buffer); LOG_DEBUG(Service_NWM, - "called out_buffer_size=0x{:08X}, wlan_comm_id=0x{:08X}, id=0x{:08X}," - "unk1=0x{:08X}, unk2=0x{:08X}, offset={}", - out_buffer_size, wlan_comm_id, id, unk1, unk2, cur_buffer_size); + "called out_buffer_size=0x{:08X}, wlan_comm_id=0x{:08X}, id=0x{:08X}," + "unk1=0x{:08X}, unk2=0x{:08X}, offset={}", + out_buffer_size, wlan_comm_id, id, unk1, unk2, cur_buffer_size); } void NWM_UDS::InitializeWithVersion(Kernel::HLERequestContext& ctx) { @@ -661,7 +661,7 @@ void NWM_UDS::InitializeWithVersion(Kernel::HLERequestContext& ctx) { rb.PushCopyObjects(connection_status_event); LOG_DEBUG(Service_NWM, "called sharedmem_size=0x{:08X}, version=0x{:08X}", sharedmem_size, - version); + version); } void NWM_UDS::GetConnectionStatus(Kernel::HLERequestContext& ctx) { @@ -729,7 +729,7 @@ void NWM_UDS::Bind(Kernel::HLERequestContext& ctx) { rb.Push(ResultCode(ErrorDescription::NotAuthorized, ErrorModule::UDS, ErrorSummary::WrongArgument, ErrorLevel::Usage)); LOG_WARNING(Service_NWM, "data_channel = {}, bind_node_id = {}", data_channel, - bind_node_id); + bind_node_id); return; } diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index aca971c9b..933cb74db 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp @@ -93,7 +93,7 @@ void Module::Interface::GetStepHistory(Kernel::HLERequestContext& ctx) { rb.PushMappedBuffer(buffer); LOG_WARNING(Service_PTM, "(STUBBED) called, from time(raw): 0x{:x}, for {} hours", start_time, - hours); + hours); } void Module::Interface::GetTotalStepCount(Kernel::HLERequestContext& ctx) { @@ -120,16 +120,14 @@ void CheckNew3DS(IPC::RequestBuilder& rb) { const bool is_new_3ds = Settings::values.is_new_3ds; if (is_new_3ds) { - LOG_CRITICAL(Service_PTM, - "The option 'is_new_3ds' is enabled as part of the 'System' " - "settings. Citra does not fully support New 3DS emulation yet!"); + LOG_CRITICAL(Service_PTM, "The option 'is_new_3ds' is enabled as part of the 'System' " + "settings. Citra does not fully support New 3DS emulation yet!"); } rb.Push(RESULT_SUCCESS); rb.Push(is_new_3ds); - LOG_WARNING(Service_PTM, "(STUBBED) called isNew3DS = 0x{:08x}", - static_cast(is_new_3ds)); + LOG_WARNING(Service_PTM, "(STUBBED) called isNew3DS = 0x{:08x}", static_cast(is_new_3ds)); } void Module::Interface::CheckNew3DS(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 018c69819..422b26f23 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -95,14 +95,13 @@ void Interface::HandleSyncRequest(SharedPtr server_session) { ? Common::StringFromFormat("0x%08X", cmd_buff[0]) : itr->second.name; LOG_ERROR(Service, "unknown / unimplemented {}", - MakeFunctionString(function_name.c_str(), GetPortName().c_str(), cmd_buff)); + MakeFunctionString(function_name.c_str(), GetPortName().c_str(), cmd_buff)); // TODO(bunnei): Hack - ignore error cmd_buff[1] = 0; return; } - LOG_TRACE(Service, "{}", - MakeFunctionString(itr->second.name, GetPortName().c_str(), cmd_buff)); + LOG_TRACE(Service, "{}", MakeFunctionString(itr->second.name, GetPortName().c_str(), cmd_buff)); itr->second.func(this); } diff --git a/src/core/hle/service/sm/srv.cpp b/src/core/hle/service/sm/srv.cpp index 66359ff07..f459d3784 100644 --- a/src/core/hle/service/sm/srv.cpp +++ b/src/core/hle/service/sm/srv.cpp @@ -103,15 +103,13 @@ void SRV::GetServiceHandle(Kernel::HLERequestContext& ctx) { if (client_port.Failed()) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(client_port.Code()); - LOG_ERROR(Service_SRV, "called service={} -> error 0x{:08X}", name, - client_port.Code().raw); + LOG_ERROR(Service_SRV, "called service={} -> error 0x{:08X}", name, client_port.Code().raw); return; } auto session = client_port.Unwrap()->Connect(); if (session.Succeeded()) { - LOG_DEBUG(Service_SRV, "called service={} -> session={}", name, - (*session)->GetObjectId()); + LOG_DEBUG(Service_SRV, "called service={} -> session={}", name, (*session)->GetObjectId()); IPC::RequestBuilder rb = rp.MakeBuilder(1, 2); rb.Push(session.Code()); rb.PushMoveObjects(std::move(session).Unwrap()); @@ -179,8 +177,8 @@ void SRV::PublishToSubscriber(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_WARNING(Service_SRV, "(STUBBED) called, notification_id=0x{:X}, flags={}", - notification_id, flags); + LOG_WARNING(Service_SRV, "(STUBBED) called, notification_id=0x{:X}, flags={}", notification_id, + flags); } void SRV::RegisterService(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp index ce96845ad..c270c1efb 100644 --- a/src/core/hle/service/y2r_u.cpp +++ b/src/core/hle/service/y2r_u.cpp @@ -133,7 +133,7 @@ void Y2R_U::SetBlockAlignment(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, "called block_alignment={}", - static_cast(conversion.block_alignment)); + static_cast(conversion.block_alignment)); } void Y2R_U::GetBlockAlignment(Kernel::HLERequestContext& ctx) { @@ -144,7 +144,7 @@ void Y2R_U::GetBlockAlignment(Kernel::HLERequestContext& ctx) { rb.PushEnum(conversion.block_alignment); LOG_DEBUG(Service_Y2R, "called block_alignment={}", - static_cast(conversion.block_alignment)); + static_cast(conversion.block_alignment)); } void Y2R_U::SetSpacialDithering(Kernel::HLERequestContext& ctx) { @@ -231,10 +231,10 @@ void Y2R_U::SetSendingY(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, - "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " - "src_process_id={}", - conversion.src_Y.image_size, conversion.src_Y.transfer_unit, conversion.src_Y.gap, - process->process_id); + "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " + "src_process_id={}", + conversion.src_Y.image_size, conversion.src_Y.transfer_unit, conversion.src_Y.gap, + process->process_id); } void Y2R_U::SetSendingU(Kernel::HLERequestContext& ctx) { @@ -250,10 +250,10 @@ void Y2R_U::SetSendingU(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, - "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " - "src_process_id={}", - conversion.src_U.image_size, conversion.src_U.transfer_unit, conversion.src_U.gap, - process->process_id); + "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " + "src_process_id={}", + conversion.src_U.image_size, conversion.src_U.transfer_unit, conversion.src_U.gap, + process->process_id); } void Y2R_U::SetSendingV(Kernel::HLERequestContext& ctx) { @@ -270,10 +270,10 @@ void Y2R_U::SetSendingV(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, - "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " - "src_process_id={}", - conversion.src_V.image_size, conversion.src_V.transfer_unit, conversion.src_V.gap, - process->process_id); + "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " + "src_process_id={}", + conversion.src_V.image_size, conversion.src_V.transfer_unit, conversion.src_V.gap, + process->process_id); } void Y2R_U::SetSendingYUYV(Kernel::HLERequestContext& ctx) { @@ -290,10 +290,10 @@ void Y2R_U::SetSendingYUYV(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, - "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " - "src_process_id={}", - conversion.src_YUYV.image_size, conversion.src_YUYV.transfer_unit, - conversion.src_YUYV.gap, process->process_id); + "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " + "src_process_id={}", + conversion.src_YUYV.image_size, conversion.src_YUYV.transfer_unit, + conversion.src_YUYV.gap, process->process_id); } void Y2R_U::IsFinishedSendingYuv(Kernel::HLERequestContext& ctx) { @@ -350,10 +350,10 @@ void Y2R_U::SetReceiving(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, - "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " - "dst_process_id={}", - conversion.dst.image_size, conversion.dst.transfer_unit, conversion.dst.gap, - static_cast(dst_process->process_id)); + "called image_size=0x{:08X}, transfer_unit={}, transfer_stride={}, " + "dst_process_id={}", + conversion.dst.image_size, conversion.dst.transfer_unit, conversion.dst.gap, + static_cast(dst_process->process_id)); } void Y2R_U::IsFinishedReceiving(Kernel::HLERequestContext& ctx) { @@ -415,9 +415,9 @@ void Y2R_U::SetCoefficient(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); LOG_DEBUG(Service_Y2R, "called coefficients=[{:X}, {:X}, {:X}, {:X}, {:X}, {:X}, {:X}, {:X}]", - conversion.coefficients[0], conversion.coefficients[1], conversion.coefficients[2], - conversion.coefficients[3], conversion.coefficients[4], conversion.coefficients[5], - conversion.coefficients[6], conversion.coefficients[7]); + conversion.coefficients[0], conversion.coefficients[1], conversion.coefficients[2], + conversion.coefficients[3], conversion.coefficients[4], conversion.coefficients[5], + conversion.coefficients[6], conversion.coefficients[7]); } void Y2R_U::GetCoefficient(Kernel::HLERequestContext& ctx) { @@ -568,12 +568,12 @@ cleanup: rb.Push(result); LOG_DEBUG(Service_Y2R, - "called input_format={} output_format={} rotation={} block_alignment={} " - "input_line_width={} input_lines={} standard_coefficient={} reserved={} alpha={:X}", - static_cast(params.input_format), static_cast(params.output_format), - static_cast(params.rotation), static_cast(params.block_alignment), - params.input_line_width, params.input_lines, - static_cast(params.standard_coefficient), params.padding, params.alpha); + "called input_format={} output_format={} rotation={} block_alignment={} " + "input_line_width={} input_lines={} standard_coefficient={} reserved={} alpha={:X}", + static_cast(params.input_format), static_cast(params.output_format), + static_cast(params.rotation), static_cast(params.block_alignment), + params.input_line_width, params.input_lines, + static_cast(params.standard_coefficient), params.padding, params.alpha); } void Y2R_U::PingProcess(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 61ac7768e..306c91009 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -65,8 +65,7 @@ static Math::Vec4 DecodePixel(Regs::PixelFormat input_format, const u8* src_ return Color::DecodeRGBA4(src_pixel); default: - LOG_ERROR(HW_GPU, "Unknown source framebuffer format {:x}", - static_cast(input_format)); + LOG_ERROR(HW_GPU, "Unknown source framebuffer format {:x}", static_cast(input_format)); return {0, 0, 0, 0}; } } @@ -91,7 +90,7 @@ static void MemoryFill(const Regs::MemoryFillConfig& config) { if (end_addr <= start_addr) { LOG_CRITICAL(HW_GPU, "invalid memory range from {:#010X} to {:#010X}", start_addr, - end_addr); + end_addr); return; } @@ -170,7 +169,7 @@ static void DisplayTransfer(const Regs::DisplayTransferConfig& config) { if (config.scaling > config.ScaleXY) { LOG_CRITICAL(HW_GPU, "Unimplemented display transfer scaling mode {}", - config.scaling.Value()); + config.scaling.Value()); UNIMPLEMENTED(); return; } @@ -296,7 +295,7 @@ static void DisplayTransfer(const Regs::DisplayTransferConfig& config) { default: LOG_ERROR(HW_GPU, "Unknown destination framebuffer format {:x}", - static_cast(config.output_format.Value())); + static_cast(config.output_format.Value())); break; } } @@ -392,8 +391,7 @@ inline void Write(u32 addr, const T data) { // Writes other than u32 are untested, so I'd rather have them abort than silently fail if (index >= Regs::NumIds() || !std::is_same::value) { - LOG_ERROR(HW_GPU, "unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, (u32)data, - addr); + LOG_ERROR(HW_GPU, "unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, (u32)data, addr); return; } @@ -410,7 +408,7 @@ inline void Write(u32 addr, const T data) { if (config.trigger) { MemoryFill(config); LOG_TRACE(HW_GPU, "MemoryFill from {:#010X} to {:#010X}", config.GetStartAddress(), - config.GetEndAddress()); + config.GetEndAddress()); // It seems that it won't signal interrupt if "address_start" is zero. // TODO: hwtest this @@ -443,22 +441,21 @@ inline void Write(u32 addr, const T data) { if (config.is_texture_copy) { TextureCopy(config); LOG_TRACE(HW_GPU, - "TextureCopy: {:#X} bytes from {:#010X}({}+{})-> " - "{:#010X}({}+{}), flags {:#010X}", - config.texture_copy.size, config.GetPhysicalInputAddress(), - config.texture_copy.input_width * 16, - config.texture_copy.input_gap * 16, config.GetPhysicalOutputAddress(), - config.texture_copy.output_width * 16, - config.texture_copy.output_gap * 16, config.flags); + "TextureCopy: {:#X} bytes from {:#010X}({}+{})-> " + "{:#010X}({}+{}), flags {:#010X}", + config.texture_copy.size, config.GetPhysicalInputAddress(), + config.texture_copy.input_width * 16, config.texture_copy.input_gap * 16, + config.GetPhysicalOutputAddress(), config.texture_copy.output_width * 16, + config.texture_copy.output_gap * 16, config.flags); } else { DisplayTransfer(config); LOG_TRACE(HW_GPU, - "DisplayTransfer: {:#010X}({}x{})-> " - "{:#010X}({}x{}), dst format {:x}, flags {:#010X}", - config.GetPhysicalInputAddress(), config.input_width.Value(), - config.input_height.Value(), config.GetPhysicalOutputAddress(), - config.output_width.Value(), config.output_height.Value(), - static_cast(config.output_format.Value()), config.flags); + "DisplayTransfer: {:#010X}({}x{})-> " + "{:#010X}({}x{}), dst format {:x}, flags {:#010X}", + config.GetPhysicalInputAddress(), config.input_width.Value(), + config.input_height.Value(), config.GetPhysicalOutputAddress(), + config.output_width.Value(), config.output_height.Value(), + static_cast(config.output_format.Value()), config.flags); } g_regs.display_transfer_config.trigger = 0; diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index ff594db0e..4d31b3c80 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -66,7 +66,7 @@ inline void Write(u32 addr, const T data) { break; default: LOG_ERROR(HW_Memory, "unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, (u32)data, - addr); + addr); } } diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp index 91b023c6c..b7e86dd42 100644 --- a/src/core/hw/lcd.cpp +++ b/src/core/hw/lcd.cpp @@ -35,8 +35,7 @@ inline void Write(u32 addr, const T data) { // Writes other than u32 are untested, so I'd rather have them abort than silently fail if (index >= 0x400 || !std::is_same::value) { - LOG_ERROR(HW_LCD, "unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, (u32)data, - addr); + LOG_ERROR(HW_LCD, "unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, (u32)data, addr); return; } diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index eb54c8139..b7bf37399 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp @@ -173,7 +173,7 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, current_inprogress < remaining && pos < end_pos; current_inprogress++) { const auto& table = reloc_table[current_inprogress]; LOG_TRACE(Loader, "(t={},skip={},patch={})", current_segment_reloc_table, - static_cast(table.skip), static_cast(table.patch)); + static_cast(table.skip), static_cast(table.patch)); pos += table.skip; s32 num_patches = table.patch; while (0 < num_patches && pos < end_pos) { @@ -183,7 +183,7 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, u32 sub_type = orig_data >> (32 - 4); u32 addr = TranslateAddr(orig_data & ~0xF0000000, &loadinfo, offsets); LOG_TRACE(Loader, "Patching {:08X} <-- rel({:08X},{}) ({:08X})", in_addr, - addr, current_segment_reloc_table, *pos); + addr, current_segment_reloc_table, *pos); switch (current_segment_reloc_table) { case 0: { if (sub_type != 0) @@ -237,7 +237,7 @@ static THREEDSX_Error Load3DSXFile(FileUtil::IOFile& file, u32 base_addr, LOG_DEBUG(Loader, "code size: {:#X}", loadinfo.seg_sizes[0]); LOG_DEBUG(Loader, "rodata size: {:#X}", loadinfo.seg_sizes[1]); LOG_DEBUG(Loader, "data size: {:#X} (including {:#X} of bss)", loadinfo.seg_sizes[2], - hdr.bss_size); + hdr.bss_size); *out_codeset = code_set; return ERROR_NONE; diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index bb9e85b46..c4dd0579a 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -304,7 +304,7 @@ SharedPtr ElfReader::LoadInto(u32 vaddr) { for (unsigned int i = 0; i < header->e_phnum; ++i) { Elf32_Phdr* p = &segments[i]; LOG_DEBUG(Loader, "Type: {} Vaddr: {:08X} Filesz: {:08X} Memsz: {:08X} ", p->p_type, - p->p_vaddr, p->p_filesz, p->p_memsz); + p->p_vaddr, p->p_filesz, p->p_memsz); if (p->p_type == PT_LOAD) { CodeSet::Segment* codeset_segment; @@ -317,15 +317,15 @@ SharedPtr ElfReader::LoadInto(u32 vaddr) { codeset_segment = &codeset->data; } else { LOG_ERROR(Loader, "Unexpected ELF PT_LOAD segment id {} with flags {:X}", i, - p->p_flags); + p->p_flags); continue; } if (codeset_segment->size != 0) { LOG_ERROR(Loader, - "ELF has more than one segment of the same type. Skipping extra " - "segment (id {})", - i); + "ELF has more than one segment of the same type. Skipping extra " + "segment (id {})", + i); continue; } diff --git a/src/core/memory.cpp b/src/core/memory.cpp index bd6957e37..5663a4c33 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -39,7 +39,7 @@ PageTable* GetCurrentPageTable() { static void MapPages(PageTable& page_table, u32 base, u32 size, u8* memory, PageType type) { LOG_DEBUG(HW_Memory, "Mapping {} onto {:08X}-{:08X}", (void*)memory, base * PAGE_SIZE, - (base + size) * PAGE_SIZE); + (base + size) * PAGE_SIZE); RasterizerFlushVirtualRegion(base << PAGE_BITS, size * PAGE_SIZE, FlushMode::FlushAndInvalidate); @@ -189,7 +189,7 @@ void Write(const VAddr vaddr, const T data) { switch (type) { case PageType::Unmapped: LOG_ERROR(HW_Memory, "unmapped Write{} 0x{:08X} @ 0x{:08X}", sizeof(data) * 8, (u32)data, - vaddr); + vaddr); return; case PageType::Memory: ASSERT_MSG(false, "Mapped memory page without a pointer @ {:08X}", vaddr); @@ -340,8 +340,8 @@ void RasterizerMarkRegionCached(PAddr start, u32 size, bool cached) { // parts of the texture. if (!maybe_vaddr) { LOG_ERROR(HW_Memory, - "Trying to flush a cached region to an invalid physical address {:08X}", - paddr); + "Trying to flush a cached region to an invalid physical address {:08X}", + paddr); continue; } VAddr vaddr = *maybe_vaddr; @@ -486,8 +486,8 @@ void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_ switch (page_table.attributes[page_index]) { case PageType::Unmapped: { LOG_ERROR(HW_Memory, - "unmapped ReadBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", - current_vaddr, src_addr, size); + "unmapped ReadBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", + current_vaddr, src_addr, size); std::memset(dest_buffer, 0, copy_amount); break; } @@ -555,8 +555,8 @@ void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const voi switch (page_table.attributes[page_index]) { case PageType::Unmapped: { LOG_ERROR(HW_Memory, - "unmapped WriteBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", - current_vaddr, dest_addr, size); + "unmapped WriteBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", + current_vaddr, dest_addr, size); break; } case PageType::Memory: { @@ -608,8 +608,8 @@ void ZeroBlock(const Kernel::Process& process, const VAddr dest_addr, const size switch (page_table.attributes[page_index]) { case PageType::Unmapped: { LOG_ERROR(HW_Memory, - "unmapped ZeroBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", - current_vaddr, dest_addr, size); + "unmapped ZeroBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", + current_vaddr, dest_addr, size); break; } case PageType::Memory: { @@ -658,8 +658,8 @@ void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr, switch (page_table.attributes[page_index]) { case PageType::Unmapped: { LOG_ERROR(HW_Memory, - "unmapped CopyBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", - current_vaddr, src_addr, size); + "unmapped CopyBlock @ 0x{:08X} (start address = 0x{:08X}, size = {})", + current_vaddr, src_addr, size); ZeroBlock(process, dest_addr, copy_amount); break; } diff --git a/src/core/movie.cpp b/src/core/movie.cpp index 8270cfe66..e72016238 100644 --- a/src/core/movie.cpp +++ b/src/core/movie.cpp @@ -139,8 +139,8 @@ void Movie::Play(Service::HID::PadState& pad_state, s16& circle_pad_x, s16& circ if (s.type != ControllerStateType::PadAndCircle) { LOG_ERROR(Movie, - "Expected to read type {}, but found {}. Your playback will be out of sync", - static_cast(ControllerStateType::PadAndCircle), static_cast(s.type)); + "Expected to read type {}, but found {}. Your playback will be out of sync", + static_cast(ControllerStateType::PadAndCircle), static_cast(s.type)); return; } @@ -168,8 +168,8 @@ void Movie::Play(Service::HID::TouchDataEntry& touch_data) { if (s.type != ControllerStateType::Touch) { LOG_ERROR(Movie, - "Expected to read type {}, but found {}. Your playback will be out of sync", - static_cast(ControllerStateType::Touch), static_cast(s.type)); + "Expected to read type {}, but found {}. Your playback will be out of sync", + static_cast(ControllerStateType::Touch), static_cast(s.type)); return; } @@ -185,8 +185,8 @@ void Movie::Play(Service::HID::AccelerometerDataEntry& accelerometer_data) { if (s.type != ControllerStateType::Accelerometer) { LOG_ERROR(Movie, - "Expected to read type {}, but found {}. Your playback will be out of sync", - static_cast(ControllerStateType::Accelerometer), static_cast(s.type)); + "Expected to read type {}, but found {}. Your playback will be out of sync", + static_cast(ControllerStateType::Accelerometer), static_cast(s.type)); return; } @@ -202,8 +202,8 @@ void Movie::Play(Service::HID::GyroscopeDataEntry& gyroscope_data) { if (s.type != ControllerStateType::Gyroscope) { LOG_ERROR(Movie, - "Expected to read type {}, but found {}. Your playback will be out of sync", - static_cast(ControllerStateType::Gyroscope), static_cast(s.type)); + "Expected to read type {}, but found {}. Your playback will be out of sync", + static_cast(ControllerStateType::Gyroscope), static_cast(s.type)); return; } @@ -219,8 +219,8 @@ void Movie::Play(Service::IR::PadState& pad_state, s16& c_stick_x, s16& c_stick_ if (s.type != ControllerStateType::IrRst) { LOG_ERROR(Movie, - "Expected to read type {}, but found {}. Your playback will be out of sync", - static_cast(ControllerStateType::IrRst), static_cast(s.type)); + "Expected to read type {}, but found {}. Your playback will be out of sync", + static_cast(ControllerStateType::IrRst), static_cast(s.type)); return; } @@ -351,8 +351,8 @@ bool Movie::ValidateHeader(const CTMHeader& header) { revision = Common::ToLower(revision); if (revision != Common::g_scm_rev) { - LOG_WARNING( - Movie, "This movie was created on a different version of Citra, playback may desync"); + LOG_WARNING(Movie, + "This movie was created on a different version of Citra, playback may desync"); } u64 program_id; @@ -408,7 +408,7 @@ void Movie::Init() { } } else { LOG_ERROR(Movie, "Failed to playback movie: Unable to open '{}'", - Settings::values.movie_play); + Settings::values.movie_play); } } diff --git a/src/network/room.cpp b/src/network/room.cpp index 89ca13083..d6b032baf 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -409,10 +409,10 @@ void Room::RoomImpl::HandleWifiPacket(const ENetEvent* event) { enet_peer_send(member->peer, 0, enet_packet); } else { LOG_ERROR(Network, - "Attempting to send to unknown MAC address: " - "{:02X}:{:02X}:{:02X}:{:02X}:{:02X}:{:02X}", - destination_address[0], destination_address[1], destination_address[2], - destination_address[3], destination_address[4], destination_address[5]); + "Attempting to send to unknown MAC address: " + "{:02X}:{:02X}:{:02X}:{:02X}:{:02X}:{:02X}", + destination_address[0], destination_address[1], destination_address[2], + destination_address[3], destination_address[4], destination_address[5]); enet_packet_destroy(enet_packet); } } diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index e73e159a2..098f4c0d8 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -69,7 +69,7 @@ static void WriteUniformIntReg(Shader::ShaderSetup& setup, unsigned index, ASSERT(index < setup.uniforms.i.size()); setup.uniforms.i[index] = values; LOG_TRACE(HW_GPU, "Set {} integer uniform {} to {:02x} {:02x} {:02x} {:02x}", - GetShaderSetupTypeName(setup), index, values.x, values.y, values.z, values.w); + GetShaderSetupTypeName(setup), index, values.x, values.y, values.z, values.w); } static void WriteUniformFloatReg(ShaderRegs& config, Shader::ShaderSetup& setup, @@ -91,7 +91,7 @@ static void WriteUniformFloatReg(ShaderRegs& config, Shader::ShaderSetup& setup, if (uniform_setup.index >= 96) { LOG_ERROR(HW_GPU, "Invalid {} float uniform index {}", GetShaderSetupTypeName(setup), - (int)uniform_setup.index); + (int)uniform_setup.index); } else { // NOTE: The destination component order indeed is "backwards" @@ -109,9 +109,9 @@ static void WriteUniformFloatReg(ShaderRegs& config, Shader::ShaderSetup& setup, } LOG_TRACE(HW_GPU, "Set {} float uniform {:x} to ({} {} {} {})", - GetShaderSetupTypeName(setup), (int)uniform_setup.index, - uniform.x.ToFloat32(), uniform.y.ToFloat32(), uniform.z.ToFloat32(), - uniform.w.ToFloat32()); + GetShaderSetupTypeName(setup), (int)uniform_setup.index, + uniform.x.ToFloat32(), uniform.y.ToFloat32(), uniform.z.ToFloat32(), + uniform.w.ToFloat32()); // TODO: Verify that this actually modifies the register! uniform_setup.index.Assign(uniform_setup.index + 1); @@ -199,8 +199,8 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { attribute.x = float24::FromRaw(default_attr_write_buffer[2] & 0xFFFFFF); LOG_TRACE(HW_GPU, "Set default VS attribute {:x} to ({} {} {} {})", (int)setup.index, - attribute.x.ToFloat32(), attribute.y.ToFloat32(), attribute.z.ToFloat32(), - attribute.w.ToFloat32()); + attribute.x.ToFloat32(), attribute.y.ToFloat32(), attribute.z.ToFloat32(), + attribute.w.ToFloat32()); // TODO: Verify that this actually modifies the register! if (setup.index < 15) { diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 96976a273..fcbe46195 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -179,11 +179,11 @@ void DumpShader(const std::string& filename, const ShaderRegs& config, } catch (const std::out_of_range&) { DEBUG_ASSERT_MSG(false, "Unknown output attribute mapping"); LOG_ERROR(HW_GPU, - "Unknown output attribute mapping: {:03x}, {:03x}, {:03x}, {:03x}", - (int)output_attributes[i].map_x.Value(), - (int)output_attributes[i].map_y.Value(), - (int)output_attributes[i].map_z.Value(), - (int)output_attributes[i].map_w.Value()); + "Unknown output attribute mapping: {:03x}, {:03x}, {:03x}, {:03x}", + (int)output_attributes[i].map_x.Value(), + (int)output_attributes[i].map_y.Value(), + (int)output_attributes[i].map_z.Value(), + (int)output_attributes[i].map_w.Value()); } } } diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index a4567c1a4..fb876a3d1 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -43,9 +43,8 @@ RasterizerOpenGL::RasterizerOpenGL() allow_shadow = GLAD_GL_ARB_shader_image_load_store && GLAD_GL_ARB_shader_image_size && GLAD_GL_ARB_framebuffer_no_attachments; if (!allow_shadow) { - LOG_WARNING( - Render_OpenGL, - "Shadow might not be able to render because of unsupported OpenGL extensions."); + LOG_WARNING(Render_OpenGL, + "Shadow might not be able to render because of unsupported OpenGL extensions."); } // Clipping plane 0 is always enabled for PICA fixed clip plane z <= 0 @@ -1601,7 +1600,7 @@ void RasterizerOpenGL::SyncCullMode() { default: LOG_CRITICAL(Render_OpenGL, "Unknown cull mode {}", - static_cast(regs.rasterizer.cull_mode.Value())); + static_cast(regs.rasterizer.cull_mode.Value())); UNIMPLEMENTED(); break; } diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index d870dd9e2..f2f1d73c5 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -1391,7 +1391,7 @@ SurfaceSurfaceRect_Tuple RasterizerCacheOpenGL::GetFramebufferSurfaces( if (using_color_fb && using_depth_fb && boost::icl::length(color_vp_interval & depth_vp_interval)) { LOG_CRITICAL(Render_OpenGL, "Color and depth framebuffer memory regions overlap; " - "overlapping framebuffers not supported!"); + "overlapping framebuffers not supported!"); using_depth_fb = false; } diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index fe83de426..85bdf2f0f 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -573,8 +573,8 @@ private: default: { LOG_ERROR(HW_GPU, "Unhandled arithmetic instruction: 0x{:02x} ({}): 0x{:08x}", - (int)instr.opcode.Value().EffectiveOpCode(), - instr.opcode.Value().GetInfo().name, instr.hex); + (int)instr.opcode.Value().EffectiveOpCode(), + instr.opcode.Value().GetInfo().name, instr.hex); throw DecompileFail("Unhandled instruction"); break; } @@ -617,8 +617,8 @@ private: } } else { LOG_ERROR(HW_GPU, "Unhandled multiply-add instruction: 0x{:02x} ({}): 0x{:08x}", - (int)instr.opcode.Value().EffectiveOpCode(), - instr.opcode.Value().GetInfo().name, instr.hex); + (int)instr.opcode.Value().EffectiveOpCode(), + instr.opcode.Value().GetInfo().name, instr.hex); throw DecompileFail("Unhandled instruction"); } break; @@ -771,8 +771,8 @@ private: default: { LOG_ERROR(HW_GPU, "Unhandled instruction: 0x{:02x} ({}): 0x{:08x}", - (int)instr.opcode.Value().EffectiveOpCode(), - instr.opcode.Value().GetInfo().name, instr.hex); + (int)instr.opcode.Value().EffectiveOpCode(), + instr.opcode.Value().GetInfo().name, instr.hex); throw DecompileFail("Unhandled instruction"); break; } diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index 32a4c4069..0c71c9345 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -270,7 +270,7 @@ void PicaGSConfigCommonRaw::Init(const Pica::Regs& regs) { semantic_maps[static_cast(semantic)] = {attrib, comp}; } else if (semantic != VSOutputAttributes::INVALID) { LOG_ERROR(Render_OpenGL, "Invalid/unknown semantic id: {}", - static_cast(semantic)); + static_cast(semantic)); } } } @@ -321,7 +321,7 @@ static std::string SampleTexture(const PicaFSConfig& config, unsigned texture_un return "shadowTextureCube(texcoord0, texcoord0_w)"; default: LOG_CRITICAL(HW_GPU, "Unhandled texture type {:x}", - static_cast(state.texture0_type)); + static_cast(state.texture0_type)); UNIMPLEMENTED(); return "texture(tex0, texcoord0)"; } @@ -535,7 +535,7 @@ static void AppendColorCombiner(std::string& out, TevStageConfig::Operation oper default: out += "vec3(0.0)"; LOG_CRITICAL(Render_OpenGL, "Unknown color combiner operation: {}", - static_cast(operation)); + static_cast(operation)); break; } out += ", vec3(0.0), vec3(1.0))"; // Clamp result to 0.0, 1.0 @@ -576,7 +576,7 @@ static void AppendAlphaCombiner(std::string& out, TevStageConfig::Operation oper default: out += "0.0"; LOG_CRITICAL(Render_OpenGL, "Unknown alpha combiner operation: {}", - static_cast(operation)); + static_cast(operation)); break; } out += ", 0.0, 1.0)"; diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp index d78244d66..58c54444e 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.cpp +++ b/src/video_core/renderer_opengl/gl_shader_util.cpp @@ -43,7 +43,7 @@ GLuint LoadShader(const char* source, GLenum type) { LOG_DEBUG(Render_OpenGL, "{}", &shader_error[0]); } else { LOG_ERROR(Render_OpenGL, "Error compiling {} shader:\n{}", debug_type, - &shader_error[0]); + &shader_error[0]); LOG_ERROR(Render_OpenGL, "Shader source code:\n{}", source); } } diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 4072d0c72..96125075f 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -172,8 +172,8 @@ void RendererOpenGL::LoadFBToScreenInfo(const GPU::Regs::FramebufferConfig& fram : (!right_eye ? framebuffer.address_left2 : framebuffer.address_right2); LOG_TRACE(Render_OpenGL, "0x{:08x} bytes from 0x{:08x}({}x{}), fmt {:x}", - framebuffer.stride * framebuffer.height, framebuffer_addr, (int)framebuffer.width, - (int)framebuffer.height, (int)framebuffer.format); + framebuffer.stride * framebuffer.height, framebuffer_addr, (int)framebuffer.width, + (int)framebuffer.height, (int)framebuffer.format); int bpp = GPU::Regs::BytesPerPixel(framebuffer.color_format); size_t pixel_stride = framebuffer.stride / bpp; @@ -494,8 +494,8 @@ static void APIENTRY DebugHandler(GLenum source, GLenum type, GLuint id, GLenum level = Log::Level::Debug; break; } - LOG_GENERIC(Log::Class::Render_OpenGL, level, "{} {} {}: {}", GetSource(source), - GetType(type), id, message); + LOG_GENERIC(Log::Class::Render_OpenGL, level, "{} {} {}: {}", GetSource(source), GetType(type), + id, message); } /// Initialize the renderer diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 852342b2b..341d8a453 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -66,14 +66,14 @@ OutputVertex OutputVertex::FromAttributeBuffer(const RasterizerRegs& regs, } LOG_TRACE(HW_GPU, - "Output vertex: pos({:.2}, {:.2}, {:.2}, {:.2}), quat({:.2}, {:.2}, {:.2}, {:.2}), " - "col({:.2}, {:.2}, {:.2}, {:.2}), tc0({:.2}, {:.2}), view({:.2}, {:.2}, {:.2})", - ret.pos.x.ToFloat32(), ret.pos.y.ToFloat32(), ret.pos.z.ToFloat32(), - ret.pos.w.ToFloat32(), ret.quat.x.ToFloat32(), ret.quat.y.ToFloat32(), - ret.quat.z.ToFloat32(), ret.quat.w.ToFloat32(), ret.color.x.ToFloat32(), - ret.color.y.ToFloat32(), ret.color.z.ToFloat32(), ret.color.w.ToFloat32(), - ret.tc0.u().ToFloat32(), ret.tc0.v().ToFloat32(), ret.view.x.ToFloat32(), - ret.view.y.ToFloat32(), ret.view.z.ToFloat32()); + "Output vertex: pos({:.2}, {:.2}, {:.2}, {:.2}), quat({:.2}, {:.2}, {:.2}, {:.2}), " + "col({:.2}, {:.2}, {:.2}, {:.2}), tc0({:.2}, {:.2}), view({:.2}, {:.2}, {:.2})", + ret.pos.x.ToFloat32(), ret.pos.y.ToFloat32(), ret.pos.z.ToFloat32(), + ret.pos.w.ToFloat32(), ret.quat.x.ToFloat32(), ret.quat.y.ToFloat32(), + ret.quat.z.ToFloat32(), ret.quat.w.ToFloat32(), ret.color.x.ToFloat32(), + ret.color.y.ToFloat32(), ret.color.z.ToFloat32(), ret.color.w.ToFloat32(), + ret.tc0.u().ToFloat32(), ret.tc0.v().ToFloat32(), ret.view.x.ToFloat32(), + ret.view.y.ToFloat32(), ret.view.z.ToFloat32()); return ret; } diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index 1c69a3e48..6d001c709 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -447,8 +447,8 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData default: LOG_ERROR(HW_GPU, "Unhandled arithmetic instruction: 0x{:02x} ({}): 0x{:08x}", - (int)instr.opcode.Value().EffectiveOpCode(), - instr.opcode.Value().GetInfo().name, instr.hex); + (int)instr.opcode.Value().EffectiveOpCode(), + instr.opcode.Value().GetInfo().name, instr.hex); DEBUG_ASSERT(false); break; } @@ -536,8 +536,8 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData Record(debug_data, iteration, dest); } else { LOG_ERROR(HW_GPU, "Unhandled multiply-add instruction: 0x{:02x} ({}): 0x{:08x}", - (int)instr.opcode.Value().EffectiveOpCode(), - instr.opcode.Value().GetInfo().name, instr.hex); + (int)instr.opcode.Value().EffectiveOpCode(), + instr.opcode.Value().GetInfo().name, instr.hex); } break; } @@ -654,8 +654,8 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData default: LOG_ERROR(HW_GPU, "Unhandled instruction: 0x{:02x} ({}): 0x{:08x}", - (int)instr.opcode.Value().EffectiveOpCode(), - instr.opcode.Value().GetInfo().name, instr.hex); + (int)instr.opcode.Value().EffectiveOpCode(), + instr.opcode.Value().GetInfo().name, instr.hex); break; } diff --git a/src/video_core/shader/shader_jit_x64_compiler.cpp b/src/video_core/shader/shader_jit_x64_compiler.cpp index 2457585c3..02f6b2791 100644 --- a/src/video_core/shader/shader_jit_x64_compiler.cpp +++ b/src/video_core/shader/shader_jit_x64_compiler.cpp @@ -859,7 +859,7 @@ void JitShader::Compile_NextInstr() { } else { // Unhandled instruction LOG_CRITICAL(HW_GPU, "Unhandled instruction: 0x{:02x} (0x{:08x})", - static_cast(instr.opcode.Value().EffectiveOpCode()), instr.hex); + static_cast(instr.opcode.Value().EffectiveOpCode()), instr.hex); } } diff --git a/src/video_core/swrasterizer/framebuffer.cpp b/src/video_core/swrasterizer/framebuffer.cpp index 78e748a10..7e89e9966 100644 --- a/src/video_core/swrasterizer/framebuffer.cpp +++ b/src/video_core/swrasterizer/framebuffer.cpp @@ -58,7 +58,7 @@ void DrawPixel(int x, int y, const Math::Vec4& color) { default: LOG_CRITICAL(Render_Software, "Unknown framebuffer color format {:x}", - static_cast(framebuffer.color_format.Value())); + static_cast(framebuffer.color_format.Value())); UNIMPLEMENTED(); } } @@ -94,7 +94,7 @@ const Math::Vec4 GetPixel(int x, int y) { default: LOG_CRITICAL(Render_Software, "Unknown framebuffer color format {:x}", - static_cast(framebuffer.color_format.Value())); + static_cast(framebuffer.color_format.Value())); UNIMPLEMENTED(); } @@ -124,7 +124,7 @@ u32 GetDepth(int x, int y) { return Color::DecodeD24S8(src_pixel).x; default: LOG_CRITICAL(HW_GPU, "Unimplemented depth format {}", - static_cast(framebuffer.depth_format.Value())); + static_cast(framebuffer.depth_format.Value())); UNIMPLEMENTED(); return 0; } @@ -186,7 +186,7 @@ void SetDepth(int x, int y, u32 value) { default: LOG_CRITICAL(HW_GPU, "Unimplemented depth format {}", - static_cast(framebuffer.depth_format.Value())); + static_cast(framebuffer.depth_format.Value())); UNIMPLEMENTED(); break; } @@ -218,7 +218,7 @@ void SetStencil(int x, int y, u8 value) { default: LOG_CRITICAL(HW_GPU, "Unimplemented depth format {}", - static_cast(framebuffer.depth_format.Value())); + static_cast(framebuffer.depth_format.Value())); UNIMPLEMENTED(); break; } diff --git a/src/video_core/swrasterizer/lighting.cpp b/src/video_core/swrasterizer/lighting.cpp index 69e132cb0..16491d6ef 100644 --- a/src/video_core/swrasterizer/lighting.cpp +++ b/src/video_core/swrasterizer/lighting.cpp @@ -54,7 +54,7 @@ std::tuple, Math::Vec4> ComputeFragmentsColors( surface_tangent = perturbation; } else { LOG_ERROR(HW_GPU, "Unknown bump mode {}", - static_cast(lighting.config0.bump_mode.Value())); + static_cast(lighting.config0.bump_mode.Value())); } } else { surface_normal = Math::MakeVec(0.0f, 0.0f, 1.0f); diff --git a/src/video_core/swrasterizer/rasterizer.cpp b/src/video_core/swrasterizer/rasterizer.cpp index 36c198ea2..d6d5256bf 100644 --- a/src/video_core/swrasterizer/rasterizer.cpp +++ b/src/video_core/swrasterizer/rasterizer.cpp @@ -363,8 +363,7 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve } default: // TODO: Change to LOG_ERROR when more types are handled. - LOG_DEBUG(HW_GPU, "Unhandled texture type {:x}", - (int)texture.config.type); + LOG_DEBUG(HW_GPU, "Unhandled texture type {:x}", (int)texture.config.type); UNIMPLEMENTED(); break; } @@ -844,8 +843,7 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve return std::min(combiner_output.a(), static_cast(255 - dest.a())); default: - LOG_CRITICAL(HW_GPU, "Unknown blend factor {:x}", - static_cast(factor)); + LOG_CRITICAL(HW_GPU, "Unknown blend factor {:x}", static_cast(factor)); UNIMPLEMENTED(); break; } diff --git a/src/video_core/vertex_loader.cpp b/src/video_core/vertex_loader.cpp index aac541bea..a6cfd6080 100644 --- a/src/video_core/vertex_loader.cpp +++ b/src/video_core/vertex_loader.cpp @@ -37,10 +37,9 @@ void VertexLoader::Setup(const PipelineRegs& regs) { // TODO: What happens if a loader overwrites a previous one's data? for (unsigned component = 0; component < loader_config.component_count; ++component) { if (component >= 12) { - LOG_ERROR( - HW_GPU, - "Overflow in the vertex attribute loader {} trying to load component {}", - loader, component); + LOG_ERROR(HW_GPU, + "Overflow in the vertex attribute loader {} trying to load component {}", + loader, component); continue; } @@ -138,12 +137,12 @@ void VertexLoader::LoadVertex(u32 base_address, int index, int vertex, } LOG_TRACE(HW_GPU, - "Loaded {} components of attribute {:x} for vertex {:x} (index {:x}) from " - "0x{:08x} + 0x{:08x} + 0x{:04x}: {} {} {} {}", - vertex_attribute_elements[i], i, vertex, index, base_address, - vertex_attribute_sources[i], vertex_attribute_strides[i] * vertex, - input.attr[i][0].ToFloat32(), input.attr[i][1].ToFloat32(), - input.attr[i][2].ToFloat32(), input.attr[i][3].ToFloat32()); + "Loaded {} components of attribute {:x} for vertex {:x} (index {:x}) from " + "0x{:08x} + 0x{:08x} + 0x{:04x}: {} {} {} {}", + vertex_attribute_elements[i], i, vertex, index, base_address, + vertex_attribute_sources[i], vertex_attribute_strides[i] * vertex, + input.attr[i][0].ToFloat32(), input.attr[i][1].ToFloat32(), + input.attr[i][2].ToFloat32(), input.attr[i][3].ToFloat32()); } else if (vertex_attribute_is_default[i]) { // Load the default attribute if we're configured to do so input.attr[i] = g_state.input_default_attributes.attr[i]; diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp index 868d5d190..696de6c30 100644 --- a/src/web_service/web_backend.cpp +++ b/src/web_service/web_backend.cpp @@ -104,7 +104,7 @@ std::future PostJson(const std::string& url, const std::strin if (response.status >= 400) { LOG_ERROR(WebService, "POST to {} returned error status code: {}", url, - response.status); + response.status); return Common::WebResult{Common::WebResult::Code::HttpError, std::to_string(response.status)}; } @@ -114,7 +114,7 @@ std::future PostJson(const std::string& url, const std::strin if (content_type == response.headers.end() || content_type->second.find("application/json") == std::string::npos) { LOG_ERROR(WebService, "POST to {} returned wrong content: {}", url, - content_type->second); + content_type->second); return Common::WebResult{Common::WebResult::Code::WrongContent, content_type->second}; } @@ -175,8 +175,7 @@ std::future GetJson(std::function func, const std::str } if (response.status >= 400) { - LOG_ERROR(WebService, "GET to {} returned error status code: {}", url, - response.status); + LOG_ERROR(WebService, "GET to {} returned error status code: {}", url, response.status); return func(""); } @@ -185,7 +184,7 @@ std::future GetJson(std::function func, const std::str if (content_type == response.headers.end() || content_type->second.find("application/json") == std::string::npos) { LOG_ERROR(WebService, "GET to {} returned wrong content: {}", url, - content_type->second); + content_type->second); return func(""); } @@ -248,7 +247,7 @@ void DeleteJson(const std::string& url, const std::string& data, const std::stri if (response.status >= 400) { LOG_ERROR(WebService, "DELETE to {} returned error status code: {}", url, - response.status); + response.status); return; } @@ -257,7 +256,7 @@ void DeleteJson(const std::string& url, const std::string& data, const std::stri if (content_type == response.headers.end() || content_type->second.find("application/json") == std::string::npos) { LOG_ERROR(WebService, "DELETE to {} returned wrong content: {}", url, - content_type->second); + content_type->second); return; }