From 47ea473018fb26d3cb01f5c081374d1251e84d79 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 20 Jan 2018 00:31:44 -0700 Subject: [PATCH 1/5] CMake: Add a custom clang format target Checks to see if clang-format can be found, and if it is, sets up a custom target that will run against the src dir and auto formats all files. In MSVC, this is a project, and in Makefiles, its a make target --- CMakeLists.txt | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48c1e0a803..a17e061abb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,6 +274,53 @@ if (UNIX OR MINGW) endif() endif() +# Setup a custom clang-format target (if clang-format can be found) that will run +# against all the src files. This should be used before making a pull request. +# ======================================================================= + +set(CLANG_FORMAT_POSTFIX "-6.0") +find_program(CLANG_FORMAT + NAMES clang-format${CLANG_FORMAT_POSTFIX} + clang-format + PATHS ${CMAKE_BINARY_DIR}/externals) +# if find_program doesn't find it, try to download from externals +if (NOT CLANG_FORMAT) + if (WIN32) + message(STATUS "Clang format not found! Downloading...") + set(CLANG_FORMAT "${CMAKE_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") + file(DOWNLOAD + https://github.com/yuzu-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe + "${CLANG_FORMAT}" SHOW_PROGRESS + STATUS DOWNLOAD_SUCCESS) + if (NOT DOWNLOAD_SUCCESS EQUAL 0) + message(WARNING "Could not download clang format! Disabling the clang format target") + file(REMOVE ${CLANG_FORMAT}) + unset(CLANG_FORMAT) + endif() + else() + message(WARNING "Clang format not found! Disabling the clang format target") + endif() +endif() + +if (CLANG_FORMAT) + set(SRCS ${CMAKE_SOURCE_DIR}/src) + set(CCOMMENT "Running clang format against all the .h and .cpp files in src/") + if (WIN32) + add_custom_target(clang-format + COMMAND powershell.exe -Command "${CLANG_FORMAT} -i @(Get-ChildItem -Recurse ${SRCS}/* -Include \'*.h\', \'*.cpp\')" + COMMENT ${CCOMMENT}) + elseif(MINGW) + add_custom_target(clang-format + COMMAND find `cygpath -u ${SRCS}` -iname *.h -o -iname *.cpp | xargs `cygpath -u ${CLANG_FORMAT}` -i + COMMENT ${CCOMMENT}) + else() + add_custom_target(clang-format + COMMAND find ${SRCS} -iname *.h -o -iname *.cpp | xargs ${CLANG_FORMAT} -i + COMMENT ${CCOMMENT}) + endif() + unset(SRCS) + unset(CCOMMENT) +endif() # Include source code # =================== From 9d59ff1879ed784c31258715ec588885a2a53184 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 20 Jan 2018 00:37:57 -0700 Subject: [PATCH 2/5] CMake: Update contributing guide with the new clang format info --- CONTRIBUTING.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0b012ed9d..d2634647c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,17 @@ If you believe you have a valid issue report, please post text or a screenshot from the log (the console window that opens alongside Citra) and build version (hex string visible in the titlebar and zip filename), as well as your hardware and software information if applicable. # Contributing -Citra is a brand new project, so we have a great opportunity to keep things clean and well organized early on. As such, coding style is very important when making commits. We run clang-format on our CI to check the code. Please use it to format your code when contributing. However, it doesn't cover all the rules below. Some of them aren't very strict rules since we want to be flexible and we understand that under certain circumstances some of them can be counterproductive. Just try to follow as many of them as possible: + +Citra is a brand new project, so we have a great opportunity to keep things clean and well organized early on. As such, coding style is very important when making commits. We run clang-format on our CI to check the code. Please use it to format your code when contributing. However, it doesn't cover all the rules below. Some of them aren't very strict rules since we want to be flexible and we understand that under certain circumstances some of them can be counterproductive. Just try to follow as many of them as possible. + +# Using clang format (version 6.0) +When generating the native build script for your toolset, cmake will try to find the correct version of clang format (or will download it on windows). Before running cmake, please install clang format version 6.0 for your platform as follows: + +* Windows: do nothing; cmake will download a pre built binary for MSVC and MINGW. MSVC users can additionally install a clang format Visual Studio extension to add features like format on save. +* OSX: run `brew install clang-format`. +* Linux: use your package manager to get an appropriate binary. + +If clang format is found, then cmake will add a custom build target that can be run at any time to run clang format against *all* source files and update the formatting in them. This should be used before making a pull request so that the reviewers can spend more time reviewing the code instead of having to worry about minor style violations. On MSVC, you can run clang format by building the clang-format project in the solution. On OSX, you can either use the Makefile target `make clang-format` or by building the clang-format target in XCode. For Makefile builds, you can use the clang-format target with `make clang-format` ### General Rules * A lot of code was taken from other projects (e.g. Dolphin, PPSSPP, Gekko, SkyEye). In general, when editing other people's code, follow the style of the module you're in (or better yet, fix the style if it drastically differs from our guide). From b6d94864fdf0b0a48e5f9edf487fd4aa2402590d Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 20 Jan 2018 00:46:04 -0700 Subject: [PATCH 3/5] CMake: Conditionally turn on bundled libs for MSVC Removes the annoying step when generating sln for MSVC where you have to click an extra checkbox after the first generate fails by using a conditional option. The USE_BUNDLED options will be off by default, but if the enable_lib option is enabled and the toolset is msvc, they are turned ON. --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a17e061abb..bd82dfd87d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,15 +3,18 @@ cmake_minimum_required(VERSION 3.8) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") include(DownloadExternals) +include(CMakeDependentOption) project(citra) +# Set bundled sdl2/qt as dependent options. +# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON option(ENABLE_SDL2 "Enable the SDL2 frontend" ON) -option(CITRA_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" OFF) +CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON "ENABLE_SDL2;MSVC" OFF) option(ENABLE_QT "Enable the Qt frontend" ON) option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF) -option(CITRA_USE_BUNDLED_QT "Download bundled Qt binaries" OFF) +CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_QT "Download bundled Qt binaries" ON "ENABLE_QT;MSVC" OFF) option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON) option(CITRA_USE_BUNDLED_CURL "FOR MINGW ONLY: Download curl configured against winssl instead of openssl" OFF) From ed36edf69c59730cbd868571e92be29e76bd0921 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 20 Jan 2018 01:09:19 -0700 Subject: [PATCH 4/5] Travis: Update clang-format to 6.0 --- .travis.yml | 6 +++++- .travis/clang-format/script.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1811bc130a..a3550024f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,12 @@ matrix: dist: trusty addons: apt: + sources: + - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + - sourceline: 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main' packages: - - clang-format-3.9 + - clang-format-6.0 script: "./.travis/clang-format/script.sh" - os: linux env: NAME="linux build" diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh index 80a0f47e52..0f6e8e6e43 100755 --- a/.travis/clang-format/script.sh +++ b/.travis/clang-format/script.sh @@ -7,7 +7,7 @@ if grep -nr '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-3.9 +CLANG_FORMAT=clang-format-6.0 $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then From f61141e86a4da1c0ad5eb1ecbcb75dae63ffd638 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Fri, 9 Mar 2018 10:54:43 -0700 Subject: [PATCH 5/5] Update the entire application to use the new clang format style --- src/audio_core/hle/mixers.cpp | 4 +- src/audio_core/hle/source.h | 2 +- src/audio_core/sink.h | 2 +- src/citra/config.cpp | 12 +- src/citra_qt/configuration/config.cpp | 12 +- .../configuration/configure_input.cpp | 19 +- .../configuration/configure_system.cpp | 13 +- .../graphics/graphics_breakpoints.cpp | 4 +- .../graphics/graphics_vertex_shader.cpp | 4 +- src/citra_qt/debugger/wait_tree.h | 2 +- src/common/bit_set.h | 2 +- src/common/chunk_file.h | 5 +- src/common/color.h | 2 +- src/common/file_util.cpp | 17 +- src/common/file_util.h | 2 +- src/common/logging/backend.cpp | 4 +- src/common/logging/backend.h | 2 +- src/common/logging/filter.cpp | 2 +- src/common/logging/filter.h | 2 +- src/common/logging/text_formatter.cpp | 2 +- src/common/logging/text_formatter.h | 2 +- src/common/memory_util.cpp | 7 +- src/common/quaternion.h | 2 +- src/common/scm_rev.h | 2 +- src/common/scope_exit.h | 2 +- src/common/string_util.cpp | 4 +- src/common/string_util.h | 2 +- src/common/thread_queue_list.h | 2 +- src/common/x64/xbyak_abi.h | 69 ++++- src/core/arm/dyncom/arm_dyncom_dec.cpp | 2 +- src/core/arm/dyncom/arm_dyncom_run.h | 32 +-- src/core/arm/dyncom/arm_dyncom_thumb.h | 44 +-- src/core/arm/dyncom/arm_dyncom_trans.cpp | 268 +++++++++++++----- src/core/arm/skyeye_common/vfp/vfpdouble.cpp | 4 +- src/core/arm/skyeye_common/vfp/vfpsingle.cpp | 4 +- src/core/file_sys/archive_backend.cpp | 2 +- src/core/file_sys/archive_selfncch.cpp | 11 +- src/core/file_sys/cia_container.cpp | 2 +- src/core/file_sys/ncch_container.h | 14 +- src/core/frontend/emu_window.h | 6 +- src/core/frontend/framebuffer_layout.cpp | 9 +- src/core/frontend/framebuffer_layout.h | 16 +- src/core/gdbstub/gdbstub.cpp | 12 +- src/core/gdbstub/gdbstub.h | 2 +- src/core/hle/applets/applet.cpp | 6 +- src/core/hle/applets/applet.h | 4 +- src/core/hle/applets/swkbd.cpp | 4 +- src/core/hle/applets/swkbd.h | 4 +- src/core/hle/config_mem.cpp | 2 +- src/core/hle/config_mem.h | 2 +- src/core/hle/ipc_helpers.h | 2 +- src/core/hle/kernel/client_port.cpp | 2 +- src/core/hle/kernel/client_port.h | 2 +- src/core/hle/kernel/client_session.cpp | 2 +- src/core/hle/kernel/client_session.h | 2 +- src/core/hle/kernel/event.cpp | 2 +- src/core/hle/kernel/event.h | 2 +- src/core/hle/kernel/handle_table.cpp | 2 +- src/core/hle/kernel/handle_table.h | 2 +- src/core/hle/kernel/hle_ipc.cpp | 5 +- src/core/hle/kernel/kernel.cpp | 2 +- src/core/hle/kernel/memory.cpp | 5 +- src/core/hle/kernel/resource_limit.cpp | 2 +- src/core/hle/kernel/resource_limit.h | 2 +- src/core/hle/kernel/semaphore.cpp | 2 +- src/core/hle/kernel/semaphore.h | 4 +- src/core/hle/kernel/server_port.cpp | 2 +- src/core/hle/kernel/server_port.h | 2 +- src/core/hle/kernel/session.cpp | 2 +- src/core/hle/kernel/session.h | 2 +- src/core/hle/kernel/shared_memory.h | 10 +- src/core/hle/kernel/svc.cpp | 9 +- src/core/hle/kernel/timer.cpp | 2 +- src/core/hle/kernel/timer.h | 2 +- src/core/hle/service/am/am.h | 2 +- src/core/hle/service/apt/apt.cpp | 10 +- src/core/hle/service/boss/boss.cpp | 186 +++++++----- src/core/hle/service/cam/cam.cpp | 5 +- src/core/hle/service/cfg/cfg.cpp | 2 +- src/core/hle/service/dsp_dsp.cpp | 10 +- src/core/hle/service/fs/archive.cpp | 5 +- src/core/hle/service/fs/fs_user.cpp | 10 +- src/core/hle/service/gsp/gsp_gpu.cpp | 35 +-- src/core/hle/service/hid/hid.cpp | 4 +- src/core/hle/service/hid/hid.h | 6 +- src/core/hle/service/ir/extra_hid.cpp | 72 ++++- src/core/hle/service/ir/ir_rst.h | 2 +- src/core/hle/service/ir/ir_user.cpp | 7 +- src/core/hle/service/ir/ir_user.h | 2 +- src/core/hle/service/ldr_ro/cro_helper.cpp | 43 ++- src/core/hle/service/ldr_ro/ldr_ro.cpp | 9 +- src/core/hle/service/ndm/ndm.cpp | 5 +- src/core/hle/service/nwm/nwm_uds.cpp | 5 +- src/core/hle/service/nwm/uds_data.cpp | 5 +- src/core/hle/service/sm/srv.h | 2 +- src/core/hle/service/ssl_c.cpp | 2 +- src/core/hle/service/y2r_u.cpp | 25 +- src/core/hw/aes/arithmetic128.h | 2 +- src/core/hw/aes/ccm.cpp | 4 +- src/core/hw/aes/key.h | 2 +- src/core/hw/gpu.cpp | 10 +- src/core/hw/gpu.h | 2 +- src/core/hw/hw.cpp | 2 +- src/core/hw/hw.h | 2 +- src/core/hw/lcd.cpp | 2 +- src/core/hw/lcd.h | 2 +- src/core/hw/y2r.cpp | 4 +- src/core/hw/y2r.h | 4 +- src/core/loader/elf.cpp | 5 +- src/core/loader/smdh.cpp | 2 +- src/core/loader/smdh.h | 2 +- src/core/memory_setup.h | 2 +- src/core/mmio.h | 2 +- src/core/movie.h | 42 +-- src/core/settings.h | 21 +- src/core/tracer/citrace.h | 2 +- src/core/tracer/recorder.cpp | 2 +- src/core/tracer/recorder.h | 8 +- src/input_common/main.cpp | 3 +- src/tests/common/param_package.cpp | 4 +- src/tests/core/hle/kernel/hle_ipc.cpp | 32 ++- src/video_core/command_processor.cpp | 5 +- src/video_core/command_processor.h | 4 +- src/video_core/debug_utils/debug_utils.cpp | 4 +- src/video_core/debug_utils/debug_utils.h | 4 +- src/video_core/gpu_debugger.h | 10 +- src/video_core/pica.cpp | 2 +- src/video_core/pica.h | 2 +- src/video_core/pica_state.h | 2 +- src/video_core/primitive_assembly.cpp | 2 +- src/video_core/primitive_assembly.h | 2 +- src/video_core/rasterizer_interface.h | 4 +- src/video_core/regs.h | 2 +- src/video_core/regs_lighting.h | 14 +- .../renderer_opengl/gl_rasterizer.cpp | 16 +- .../renderer_opengl/gl_shader_gen.cpp | 1 - .../renderer_opengl/gl_shader_util.h | 2 +- src/video_core/renderer_opengl/pica_to_gl.h | 10 +- src/video_core/shader/shader.cpp | 5 +- src/video_core/shader/shader.h | 2 +- src/video_core/shader/shader_interpreter.cpp | 6 +- src/video_core/shader/shader_interpreter.h | 4 +- .../shader/shader_jit_x64_compiler.cpp | 15 +- .../shader/shader_jit_x64_compiler.h | 4 +- src/video_core/swrasterizer/rasterizer.cpp | 25 +- src/video_core/texture/etc1.cpp | 9 +- src/video_core/utils.h | 2 +- src/video_core/vertex_loader.cpp | 5 +- 148 files changed, 955 insertions(+), 552 deletions(-) diff --git a/src/audio_core/hle/mixers.cpp b/src/audio_core/hle/mixers.cpp index d40044eec1..533df2be22 100644 --- a/src/audio_core/hle/mixers.cpp +++ b/src/audio_core/hle/mixers.cpp @@ -115,8 +115,8 @@ void Mixers::DownmixAndMixIntoCurrentFrame(float gain, const QuadFrame32& sample return; case OutputFormat::Surround: - // TODO(merry): Implement surround sound. - // fallthrough + // TODO(merry): Implement surround sound. + // fallthrough case OutputFormat::Stereo: std::transform( diff --git a/src/audio_core/hle/source.h b/src/audio_core/hle/source.h index 2480c4ac16..3a63889567 100644 --- a/src/audio_core/hle/source.h +++ b/src/audio_core/hle/source.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include #include "audio_core/audio_types.h" #include "audio_core/codec.h" #include "audio_core/hle/common.h" diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h index c69cb2c74e..19fe128601 100644 --- a/src/audio_core/sink.h +++ b/src/audio_core/sink.h @@ -42,4 +42,4 @@ public: virtual std::vector GetDeviceList() const = 0; }; -} // namespace +} // namespace AudioCore diff --git a/src/citra/config.cpp b/src/citra/config.cpp index b958129649..40e3f70e17 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -49,10 +49,18 @@ static const std::array default_buttons static const std::array, Settings::NativeAnalog::NumAnalogs> default_analogs{{ { - SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, SDL_SCANCODE_D, + SDL_SCANCODE_UP, + SDL_SCANCODE_DOWN, + SDL_SCANCODE_LEFT, + SDL_SCANCODE_RIGHT, + SDL_SCANCODE_D, }, { - SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L, SDL_SCANCODE_D, + SDL_SCANCODE_I, + SDL_SCANCODE_K, + SDL_SCANCODE_J, + SDL_SCANCODE_L, + SDL_SCANCODE_D, }, }}; diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 602a19e137..a0dc0cd843 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -24,10 +24,18 @@ const std::array Config::default_button const std::array, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ { - Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, + Qt::Key_Up, + Qt::Key_Down, + Qt::Key_Left, + Qt::Key_Right, + Qt::Key_D, }, { - Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, + Qt::Key_I, + Qt::Key_K, + Qt::Key_J, + Qt::Key_L, + Qt::Key_D, }, }}; diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp index 64a22cb035..8bdfd83a1a 100644 --- a/src/citra_qt/configuration/configure_input.cpp +++ b/src/citra_qt/configuration/configure_input.cpp @@ -13,7 +13,11 @@ const std::array ConfigureInput::analog_sub_buttons{{ - "up", "down", "left", "right", "modifier", + "up", + "down", + "left", + "right", + "modifier", }}; static QString getKeyName(int key_code) { @@ -35,7 +39,8 @@ static void SetAnalogButton(const Common::ParamPackage& input_param, Common::ParamPackage& analog_param, const std::string& button_name) { if (analog_param.Get("engine", "") != "analog_from_button") { analog_param = { - {"engine", "analog_from_button"}, {"modifier_scale", "0.5"}, + {"engine", "analog_from_button"}, + {"modifier_scale", "0.5"}, }; } analog_param.Set(button_name, input_param.Serialize()); @@ -102,11 +107,17 @@ ConfigureInput::ConfigureInput(QWidget* parent) analog_map_buttons = {{ { - ui->buttonCircleUp, ui->buttonCircleDown, ui->buttonCircleLeft, ui->buttonCircleRight, + ui->buttonCircleUp, + ui->buttonCircleDown, + ui->buttonCircleLeft, + ui->buttonCircleRight, ui->buttonCircleMod, }, { - ui->buttonCStickUp, ui->buttonCStickDown, ui->buttonCStickLeft, ui->buttonCStickRight, + ui->buttonCStickUp, + ui->buttonCStickDown, + ui->buttonCStickLeft, + ui->buttonCStickRight, nullptr, }, }}; diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 6793fb50de..dd4b5caffd 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -11,7 +11,18 @@ #include "ui_configure_system.h" static const std::array days_in_month = {{ - 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, + 31, + 29, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31, }}; ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) { diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp index ae1285742b..28e02d367e 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp @@ -129,8 +129,8 @@ void BreakPointModel::OnResumed() { GraphicsBreakPointsWidget::GraphicsBreakPointsWidget( std::shared_ptr debug_context, QWidget* parent) - : QDockWidget(tr("Pica Breakpoints"), parent), - Pica::DebugContext::BreakPointObserver(debug_context) { + : QDockWidget(tr("Pica Breakpoints"), parent), Pica::DebugContext::BreakPointObserver( + debug_context) { setObjectName("PicaBreakPointsWidget"); status_text = new QLabel(tr("Emulation running")); diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp index 66a766c255..017bc20e51 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp @@ -21,8 +21,8 @@ #include "video_core/shader/shader.h" #include "video_core/shader/shader_interpreter.h" -using nihstro::OpCode; using nihstro::Instruction; +using nihstro::OpCode; using nihstro::SourceRegister; using nihstro::SwizzlePattern; @@ -331,7 +331,7 @@ QVariant GraphicsVertexShaderModel::data(const QModelIndex& index, int role) con return QBrush(QColor(192, 192, 192)); } - // TODO: Draw arrows for each "reachable" instruction to visualize control flow + // TODO: Draw arrows for each "reachable" instruction to visualize control flow default: break; diff --git a/src/citra_qt/debugger/wait_tree.h b/src/citra_qt/debugger/wait_tree.h index 2b38712b91..24a235a760 100644 --- a/src/citra_qt/debugger/wait_tree.h +++ b/src/citra_qt/debugger/wait_tree.h @@ -20,7 +20,7 @@ class Mutex; class Semaphore; class Thread; class Timer; -} +} // namespace Kernel class WaitTreeThread; diff --git a/src/common/bit_set.h b/src/common/bit_set.h index 749de4df01..fe22b3b328 100644 --- a/src/common/bit_set.h +++ b/src/common/bit_set.h @@ -221,7 +221,7 @@ public: IntTy m_val; }; -} // Common +} // namespace Common typedef Common::BitSet BitSet8; typedef Common::BitSet BitSet16; diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h index 5145a3657d..972ef90390 100644 --- a/src/common/chunk_file.h +++ b/src/common/chunk_file.h @@ -607,8 +607,9 @@ public: u32 cookie = arbitraryNumber; Do(cookie); if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) { - LOG_ERROR(Common, "After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " - "Aborting savestate load...", + LOG_ERROR(Common, + "After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). " + "Aborting savestate load...", prevName, cookie, cookie, arbitraryNumber, arbitraryNumber); SetError(ERROR_FAILURE); } diff --git a/src/common/color.h b/src/common/color.h index 4ebd4f3d01..24a445daca 100644 --- a/src/common/color.h +++ b/src/common/color.h @@ -256,4 +256,4 @@ inline void EncodeX24S8(u8 stencil, u8* bytes) { bytes[3] = stencil; } -} // namespace +} // namespace Color diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 5ab036b343..4e1d702f7a 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -873,20 +873,19 @@ bool IOFile::Flush() { } bool IOFile::Resize(u64 size) { - if (!IsOpen() || - 0 != + if (!IsOpen() || 0 != #ifdef _WIN32 - // ector: _chsize sucks, not 64-bit safe - // F|RES: changed to _chsize_s. i think it is 64-bit safe - _chsize_s(_fileno(m_file), size) + // ector: _chsize sucks, not 64-bit safe + // F|RES: changed to _chsize_s. i think it is 64-bit safe + _chsize_s(_fileno(m_file), size) #else - // TODO: handle 64bit and growing - ftruncate(fileno(m_file), size) + // TODO: handle 64bit and growing + ftruncate(fileno(m_file), size) #endif - ) + ) m_good = false; return m_good; } -} // namespace +} // namespace FileUtil diff --git a/src/common/file_util.h b/src/common/file_util.h index 94adfcd7ec..630232a25d 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -253,7 +253,7 @@ private: bool m_good = true; }; -} // namespace +} // namespace FileUtil // To deal with Windows being dumb at unicode: template diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 7e58314a39..e1425332af 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -114,8 +114,8 @@ const char* GetLevelName(Level log_level) { Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsigned int line_nr, const char* function, const char* format, va_list args) { - using std::chrono::steady_clock; using std::chrono::duration_cast; + using std::chrono::steady_clock; static steady_clock::time_point time_origin = steady_clock::now(); @@ -154,4 +154,4 @@ void LogMessage(Class log_class, Level log_level, const char* filename, unsigned PrintColoredMessage(entry); } -} +} // namespace Log diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h index c4fe2acbf2..70744e3e5b 100644 --- a/src/common/logging/backend.h +++ b/src/common/logging/backend.h @@ -47,4 +47,4 @@ Entry CreateEntry(Class log_class, Level log_level, const char* filename, unsign const char* function, const char* format, va_list args); void SetFilter(Filter* filter); -} +} // namespace Log diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp index 12e5bb45dc..733247b516 100644 --- a/src/common/logging/filter.cpp +++ b/src/common/logging/filter.cpp @@ -94,4 +94,4 @@ bool Filter::ParseFilterRule(const std::string::const_iterator begin, bool Filter::CheckMessage(Class log_class, Level level) const { return static_cast(level) >= static_cast(class_levels[static_cast(log_class)]); } -} +} // namespace Log diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h index b51df61de9..16fa72642c 100644 --- a/src/common/logging/filter.h +++ b/src/common/logging/filter.h @@ -50,4 +50,4 @@ public: private: std::array class_levels; }; -} +} // namespace Log diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp index f71e748d13..e7e46c76b5 100644 --- a/src/common/logging/text_formatter.cpp +++ b/src/common/logging/text_formatter.cpp @@ -129,4 +129,4 @@ void PrintColoredMessage(const Entry& entry) { #undef ESC #endif } -} +} // namespace Log diff --git a/src/common/logging/text_formatter.h b/src/common/logging/text_formatter.h index 749268310d..66e86d9ec4 100644 --- a/src/common/logging/text_formatter.h +++ b/src/common/logging/text_formatter.h @@ -28,4 +28,4 @@ void FormatLogMessage(const Entry& entry, char* out_text, size_t text_len); void PrintMessage(const Entry& entry); /// Prints the same message as `PrintMessage`, but colored acoording to the severity level. void PrintColoredMessage(const Entry& entry); -} +} // namespace Log diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index c19729b21f..759ad02cae 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -40,11 +40,12 @@ void* AllocateExecutableMemory(size_t size, bool low) { if (low && (!map_hint)) map_hint = (char*)round_page(512 * 1024 * 1024); /* 0.5 GB rounded up to the next page */ #endif - void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE + void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_ANON | MAP_PRIVATE #if defined(ARCHITECTURE_X64) && defined(MAP_32BIT) - | (low ? MAP_32BIT : 0) + | (low ? MAP_32BIT : 0) #endif - , + , -1, 0); #endif /* defined(_WIN32) */ diff --git a/src/common/quaternion.h b/src/common/quaternion.h index 77f626bcb4..ea39298c1f 100644 --- a/src/common/quaternion.h +++ b/src/common/quaternion.h @@ -46,4 +46,4 @@ inline Quaternion MakeQuaternion(const Math::Vec3& axis, float ang return {axis * std::sin(angle / 2), std::cos(angle / 2)}; } -} // namspace Math +} // namespace Math diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h index 18aaa1735d..db0f4a947e 100644 --- a/src/common/scm_rev.h +++ b/src/common/scm_rev.h @@ -12,4 +12,4 @@ extern const char g_scm_desc[]; extern const char g_build_name[]; extern const char g_build_date[]; -} // namespace +} // namespace Common diff --git a/src/common/scope_exit.h b/src/common/scope_exit.h index 072ab285d4..baf1f1c9e2 100644 --- a/src/common/scope_exit.h +++ b/src/common/scope_exit.h @@ -22,7 +22,7 @@ template ScopeExitHelper ScopeExit(Func&& func) { return ScopeExitHelper(std::move(func)); } -} +} // namespace detail /** * This macro allows you to conveniently specify a block of code that will run on scope exit. Handy diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 6959915faa..e9a2a6b00e 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -202,7 +202,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _ #ifdef _WIN32 ":" #endif - ); + ); if (std::string::npos == dir_end) dir_end = 0; else @@ -462,4 +462,4 @@ std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_l return std::string(buffer, len); } -} +} // namespace Common diff --git a/src/common/string_util.h b/src/common/string_util.h index 259360aecb..ceb8df48e4 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -134,4 +134,4 @@ bool ComparePartialString(InIt begin, InIt end, const char* other) { * NUL-terminated then the string ends at max_len characters. */ std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len); -} +} // namespace Common diff --git a/src/common/thread_queue_list.h b/src/common/thread_queue_list.h index edd0e4a3f8..38a450d693 100644 --- a/src/common/thread_queue_list.h +++ b/src/common/thread_queue_list.h @@ -158,4 +158,4 @@ private: std::array queues; }; -} // namespace +} // namespace Common diff --git a/src/common/x64/xbyak_abi.h b/src/common/x64/xbyak_abi.h index 6090d93e1c..fd3fbdd4b7 100644 --- a/src/common/x64/xbyak_abi.h +++ b/src/common/x64/xbyak_abi.h @@ -60,20 +60,41 @@ const Xbyak::Reg ABI_PARAM4 = Xbyak::util::r9; const BitSet32 ABI_ALL_CALLER_SAVED = BuildRegSet({ // GPRs - Xbyak::util::rcx, Xbyak::util::rdx, Xbyak::util::r8, Xbyak::util::r9, Xbyak::util::r10, + Xbyak::util::rcx, + Xbyak::util::rdx, + Xbyak::util::r8, + Xbyak::util::r9, + Xbyak::util::r10, Xbyak::util::r11, // XMMs - Xbyak::util::xmm0, Xbyak::util::xmm1, Xbyak::util::xmm2, Xbyak::util::xmm3, Xbyak::util::xmm4, + Xbyak::util::xmm0, + Xbyak::util::xmm1, + Xbyak::util::xmm2, + Xbyak::util::xmm3, + Xbyak::util::xmm4, Xbyak::util::xmm5, }); const BitSet32 ABI_ALL_CALLEE_SAVED = BuildRegSet({ // GPRs - Xbyak::util::rbx, Xbyak::util::rsi, Xbyak::util::rdi, Xbyak::util::rbp, Xbyak::util::r12, - Xbyak::util::r13, Xbyak::util::r14, Xbyak::util::r15, + Xbyak::util::rbx, + Xbyak::util::rsi, + Xbyak::util::rdi, + Xbyak::util::rbp, + Xbyak::util::r12, + Xbyak::util::r13, + Xbyak::util::r14, + Xbyak::util::r15, // XMMs - Xbyak::util::xmm6, Xbyak::util::xmm7, Xbyak::util::xmm8, Xbyak::util::xmm9, Xbyak::util::xmm10, - Xbyak::util::xmm11, Xbyak::util::xmm12, Xbyak::util::xmm13, Xbyak::util::xmm14, + Xbyak::util::xmm6, + Xbyak::util::xmm7, + Xbyak::util::xmm8, + Xbyak::util::xmm9, + Xbyak::util::xmm10, + Xbyak::util::xmm11, + Xbyak::util::xmm12, + Xbyak::util::xmm13, + Xbyak::util::xmm14, Xbyak::util::xmm15, }); @@ -90,18 +111,40 @@ const Xbyak::Reg ABI_PARAM4 = Xbyak::util::rcx; const BitSet32 ABI_ALL_CALLER_SAVED = BuildRegSet({ // GPRs - Xbyak::util::rcx, Xbyak::util::rdx, Xbyak::util::rdi, Xbyak::util::rsi, Xbyak::util::r8, - Xbyak::util::r9, Xbyak::util::r10, Xbyak::util::r11, + Xbyak::util::rcx, + Xbyak::util::rdx, + Xbyak::util::rdi, + Xbyak::util::rsi, + Xbyak::util::r8, + Xbyak::util::r9, + Xbyak::util::r10, + Xbyak::util::r11, // XMMs - Xbyak::util::xmm0, Xbyak::util::xmm1, Xbyak::util::xmm2, Xbyak::util::xmm3, Xbyak::util::xmm4, - Xbyak::util::xmm5, Xbyak::util::xmm6, Xbyak::util::xmm7, Xbyak::util::xmm8, Xbyak::util::xmm9, - Xbyak::util::xmm10, Xbyak::util::xmm11, Xbyak::util::xmm12, Xbyak::util::xmm13, - Xbyak::util::xmm14, Xbyak::util::xmm15, + Xbyak::util::xmm0, + Xbyak::util::xmm1, + Xbyak::util::xmm2, + Xbyak::util::xmm3, + Xbyak::util::xmm4, + Xbyak::util::xmm5, + Xbyak::util::xmm6, + Xbyak::util::xmm7, + Xbyak::util::xmm8, + Xbyak::util::xmm9, + Xbyak::util::xmm10, + Xbyak::util::xmm11, + Xbyak::util::xmm12, + Xbyak::util::xmm13, + Xbyak::util::xmm14, + Xbyak::util::xmm15, }); const BitSet32 ABI_ALL_CALLEE_SAVED = BuildRegSet({ // GPRs - Xbyak::util::rbx, Xbyak::util::rbp, Xbyak::util::r12, Xbyak::util::r13, Xbyak::util::r14, + Xbyak::util::rbx, + Xbyak::util::rbp, + Xbyak::util::r12, + Xbyak::util::r13, + Xbyak::util::r14, Xbyak::util::r15, }); diff --git a/src/core/arm/dyncom/arm_dyncom_dec.cpp b/src/core/arm/dyncom/arm_dyncom_dec.cpp index b66960620e..ce8fbd95fd 100644 --- a/src/core/arm/dyncom/arm_dyncom_dec.cpp +++ b/src/core/arm/dyncom/arm_dyncom_dec.cpp @@ -28,7 +28,7 @@ enum { ARMVFP3, ARMV6K, }; -} +} // namespace // clang-format off const InstructionSetEncodingItem arm_instruction[] = { diff --git a/src/core/arm/dyncom/arm_dyncom_run.h b/src/core/arm/dyncom/arm_dyncom_run.h index 8eb694feec..3e5fd2290d 100644 --- a/src/core/arm/dyncom/arm_dyncom_run.h +++ b/src/core/arm/dyncom/arm_dyncom_run.h @@ -1,20 +1,20 @@ /* Copyright (C) -* 2011 - Michael.Kang blackfin.kang@gmail.com -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -*/ + * 2011 - Michael.Kang blackfin.kang@gmail.com + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ #pragma once diff --git a/src/core/arm/dyncom/arm_dyncom_thumb.h b/src/core/arm/dyncom/arm_dyncom_thumb.h index 231e48aa43..d95586379b 100644 --- a/src/core/arm/dyncom/arm_dyncom_thumb.h +++ b/src/core/arm/dyncom/arm_dyncom_thumb.h @@ -1,28 +1,28 @@ /* Copyright (C) -* 2011 - Michael.Kang blackfin.kang@gmail.com -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -*/ + * 2011 - Michael.Kang blackfin.kang@gmail.com + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ /** -* @file arm_dyncom_thumb.h -* @brief The thumb dyncom -* @author Michael.Kang blackfin.kang@gmail.com -* @version 78.77 -* @date 2011-11-07 -*/ + * @file arm_dyncom_thumb.h + * @brief The thumb dyncom + * @author Michael.Kang blackfin.kang@gmail.com + * @version 78.77 + * @date 2011-11-07 + */ #pragma once diff --git a/src/core/arm/dyncom/arm_dyncom_trans.cpp b/src/core/arm/dyncom/arm_dyncom_trans.cpp index 4735ca6489..be3daec4ae 100644 --- a/src/core/arm/dyncom/arm_dyncom_trans.cpp +++ b/src/core/arm/dyncom/arm_dyncom_trans.cpp @@ -1808,78 +1808,210 @@ static ARM_INST_PTR INTERPRETER_TRANSLATE(yield)(unsigned int inst, int index) { #undef VFP_INTERPRETER_TRANS const transop_fp_t arm_instruction_trans[] = { - INTERPRETER_TRANSLATE(vmla), INTERPRETER_TRANSLATE(vmls), INTERPRETER_TRANSLATE(vnmla), - INTERPRETER_TRANSLATE(vnmls), INTERPRETER_TRANSLATE(vnmul), INTERPRETER_TRANSLATE(vmul), - INTERPRETER_TRANSLATE(vadd), INTERPRETER_TRANSLATE(vsub), INTERPRETER_TRANSLATE(vdiv), - INTERPRETER_TRANSLATE(vmovi), INTERPRETER_TRANSLATE(vmovr), INTERPRETER_TRANSLATE(vabs), - INTERPRETER_TRANSLATE(vneg), INTERPRETER_TRANSLATE(vsqrt), INTERPRETER_TRANSLATE(vcmp), - INTERPRETER_TRANSLATE(vcmp2), INTERPRETER_TRANSLATE(vcvtbds), INTERPRETER_TRANSLATE(vcvtbff), - INTERPRETER_TRANSLATE(vcvtbfi), INTERPRETER_TRANSLATE(vmovbrs), INTERPRETER_TRANSLATE(vmsr), - INTERPRETER_TRANSLATE(vmovbrc), INTERPRETER_TRANSLATE(vmrs), INTERPRETER_TRANSLATE(vmovbcr), - INTERPRETER_TRANSLATE(vmovbrrss), INTERPRETER_TRANSLATE(vmovbrrd), INTERPRETER_TRANSLATE(vstr), - INTERPRETER_TRANSLATE(vpush), INTERPRETER_TRANSLATE(vstm), INTERPRETER_TRANSLATE(vpop), - INTERPRETER_TRANSLATE(vldr), INTERPRETER_TRANSLATE(vldm), + INTERPRETER_TRANSLATE(vmla), + INTERPRETER_TRANSLATE(vmls), + INTERPRETER_TRANSLATE(vnmla), + INTERPRETER_TRANSLATE(vnmls), + INTERPRETER_TRANSLATE(vnmul), + INTERPRETER_TRANSLATE(vmul), + INTERPRETER_TRANSLATE(vadd), + INTERPRETER_TRANSLATE(vsub), + INTERPRETER_TRANSLATE(vdiv), + INTERPRETER_TRANSLATE(vmovi), + INTERPRETER_TRANSLATE(vmovr), + INTERPRETER_TRANSLATE(vabs), + INTERPRETER_TRANSLATE(vneg), + INTERPRETER_TRANSLATE(vsqrt), + INTERPRETER_TRANSLATE(vcmp), + INTERPRETER_TRANSLATE(vcmp2), + INTERPRETER_TRANSLATE(vcvtbds), + INTERPRETER_TRANSLATE(vcvtbff), + INTERPRETER_TRANSLATE(vcvtbfi), + INTERPRETER_TRANSLATE(vmovbrs), + INTERPRETER_TRANSLATE(vmsr), + INTERPRETER_TRANSLATE(vmovbrc), + INTERPRETER_TRANSLATE(vmrs), + INTERPRETER_TRANSLATE(vmovbcr), + INTERPRETER_TRANSLATE(vmovbrrss), + INTERPRETER_TRANSLATE(vmovbrrd), + INTERPRETER_TRANSLATE(vstr), + INTERPRETER_TRANSLATE(vpush), + INTERPRETER_TRANSLATE(vstm), + INTERPRETER_TRANSLATE(vpop), + INTERPRETER_TRANSLATE(vldr), + INTERPRETER_TRANSLATE(vldm), - INTERPRETER_TRANSLATE(srs), INTERPRETER_TRANSLATE(rfe), INTERPRETER_TRANSLATE(bkpt), - INTERPRETER_TRANSLATE(blx), INTERPRETER_TRANSLATE(cps), INTERPRETER_TRANSLATE(pld), - INTERPRETER_TRANSLATE(setend), INTERPRETER_TRANSLATE(clrex), INTERPRETER_TRANSLATE(rev16), - INTERPRETER_TRANSLATE(usad8), INTERPRETER_TRANSLATE(sxtb), INTERPRETER_TRANSLATE(uxtb), - INTERPRETER_TRANSLATE(sxth), INTERPRETER_TRANSLATE(sxtb16), INTERPRETER_TRANSLATE(uxth), - INTERPRETER_TRANSLATE(uxtb16), INTERPRETER_TRANSLATE(cpy), INTERPRETER_TRANSLATE(uxtab), - INTERPRETER_TRANSLATE(ssub8), INTERPRETER_TRANSLATE(shsub8), INTERPRETER_TRANSLATE(ssubaddx), - INTERPRETER_TRANSLATE(strex), INTERPRETER_TRANSLATE(strexb), INTERPRETER_TRANSLATE(swp), - INTERPRETER_TRANSLATE(swpb), INTERPRETER_TRANSLATE(ssub16), INTERPRETER_TRANSLATE(ssat16), - INTERPRETER_TRANSLATE(shsubaddx), INTERPRETER_TRANSLATE(qsubaddx), - INTERPRETER_TRANSLATE(shaddsubx), INTERPRETER_TRANSLATE(shadd8), INTERPRETER_TRANSLATE(shadd16), - INTERPRETER_TRANSLATE(sel), INTERPRETER_TRANSLATE(saddsubx), INTERPRETER_TRANSLATE(sadd8), - INTERPRETER_TRANSLATE(sadd16), INTERPRETER_TRANSLATE(shsub16), INTERPRETER_TRANSLATE(umaal), - INTERPRETER_TRANSLATE(uxtab16), INTERPRETER_TRANSLATE(usubaddx), INTERPRETER_TRANSLATE(usub8), - INTERPRETER_TRANSLATE(usub16), INTERPRETER_TRANSLATE(usat16), INTERPRETER_TRANSLATE(usada8), - INTERPRETER_TRANSLATE(uqsubaddx), INTERPRETER_TRANSLATE(uqsub8), INTERPRETER_TRANSLATE(uqsub16), - INTERPRETER_TRANSLATE(uqaddsubx), INTERPRETER_TRANSLATE(uqadd8), INTERPRETER_TRANSLATE(uqadd16), - INTERPRETER_TRANSLATE(sxtab), INTERPRETER_TRANSLATE(uhsubaddx), INTERPRETER_TRANSLATE(uhsub8), - INTERPRETER_TRANSLATE(uhsub16), INTERPRETER_TRANSLATE(uhaddsubx), INTERPRETER_TRANSLATE(uhadd8), - INTERPRETER_TRANSLATE(uhadd16), INTERPRETER_TRANSLATE(uaddsubx), INTERPRETER_TRANSLATE(uadd8), - INTERPRETER_TRANSLATE(uadd16), INTERPRETER_TRANSLATE(sxtah), INTERPRETER_TRANSLATE(sxtab16), - INTERPRETER_TRANSLATE(qadd8), INTERPRETER_TRANSLATE(bxj), INTERPRETER_TRANSLATE(clz), - INTERPRETER_TRANSLATE(uxtah), INTERPRETER_TRANSLATE(bx), INTERPRETER_TRANSLATE(rev), - INTERPRETER_TRANSLATE(blx), INTERPRETER_TRANSLATE(revsh), INTERPRETER_TRANSLATE(qadd), - INTERPRETER_TRANSLATE(qadd16), INTERPRETER_TRANSLATE(qaddsubx), INTERPRETER_TRANSLATE(ldrex), - INTERPRETER_TRANSLATE(qdadd), INTERPRETER_TRANSLATE(qdsub), INTERPRETER_TRANSLATE(qsub), - INTERPRETER_TRANSLATE(ldrexb), INTERPRETER_TRANSLATE(qsub8), INTERPRETER_TRANSLATE(qsub16), - INTERPRETER_TRANSLATE(smuad), INTERPRETER_TRANSLATE(smmul), INTERPRETER_TRANSLATE(smusd), - INTERPRETER_TRANSLATE(smlsd), INTERPRETER_TRANSLATE(smlsld), INTERPRETER_TRANSLATE(smmla), - INTERPRETER_TRANSLATE(smmls), INTERPRETER_TRANSLATE(smlald), INTERPRETER_TRANSLATE(smlad), - INTERPRETER_TRANSLATE(smlaw), INTERPRETER_TRANSLATE(smulw), INTERPRETER_TRANSLATE(pkhtb), - INTERPRETER_TRANSLATE(pkhbt), INTERPRETER_TRANSLATE(smul), INTERPRETER_TRANSLATE(smlalxy), - INTERPRETER_TRANSLATE(smla), INTERPRETER_TRANSLATE(mcrr), INTERPRETER_TRANSLATE(mrrc), - INTERPRETER_TRANSLATE(cmp), INTERPRETER_TRANSLATE(tst), INTERPRETER_TRANSLATE(teq), - INTERPRETER_TRANSLATE(cmn), INTERPRETER_TRANSLATE(smull), INTERPRETER_TRANSLATE(umull), - INTERPRETER_TRANSLATE(umlal), INTERPRETER_TRANSLATE(smlal), INTERPRETER_TRANSLATE(mul), - INTERPRETER_TRANSLATE(mla), INTERPRETER_TRANSLATE(ssat), INTERPRETER_TRANSLATE(usat), - INTERPRETER_TRANSLATE(mrs), INTERPRETER_TRANSLATE(msr), INTERPRETER_TRANSLATE(and), - INTERPRETER_TRANSLATE(bic), INTERPRETER_TRANSLATE(ldm), INTERPRETER_TRANSLATE(eor), - INTERPRETER_TRANSLATE(add), INTERPRETER_TRANSLATE(rsb), INTERPRETER_TRANSLATE(rsc), - INTERPRETER_TRANSLATE(sbc), INTERPRETER_TRANSLATE(adc), INTERPRETER_TRANSLATE(sub), - INTERPRETER_TRANSLATE(orr), INTERPRETER_TRANSLATE(mvn), INTERPRETER_TRANSLATE(mov), - INTERPRETER_TRANSLATE(stm), INTERPRETER_TRANSLATE(ldm), INTERPRETER_TRANSLATE(ldrsh), - INTERPRETER_TRANSLATE(stm), INTERPRETER_TRANSLATE(ldm), INTERPRETER_TRANSLATE(ldrsb), - INTERPRETER_TRANSLATE(strd), INTERPRETER_TRANSLATE(ldrh), INTERPRETER_TRANSLATE(strh), - INTERPRETER_TRANSLATE(ldrd), INTERPRETER_TRANSLATE(strt), INTERPRETER_TRANSLATE(strbt), - INTERPRETER_TRANSLATE(ldrbt), INTERPRETER_TRANSLATE(ldrt), INTERPRETER_TRANSLATE(mrc), - INTERPRETER_TRANSLATE(mcr), INTERPRETER_TRANSLATE(msr), INTERPRETER_TRANSLATE(msr), - INTERPRETER_TRANSLATE(msr), INTERPRETER_TRANSLATE(msr), INTERPRETER_TRANSLATE(msr), - INTERPRETER_TRANSLATE(ldrb), INTERPRETER_TRANSLATE(strb), INTERPRETER_TRANSLATE(ldr), - INTERPRETER_TRANSLATE(ldrcond), INTERPRETER_TRANSLATE(str), INTERPRETER_TRANSLATE(cdp), - INTERPRETER_TRANSLATE(stc), INTERPRETER_TRANSLATE(ldc), INTERPRETER_TRANSLATE(ldrexd), - INTERPRETER_TRANSLATE(strexd), INTERPRETER_TRANSLATE(ldrexh), INTERPRETER_TRANSLATE(strexh), - INTERPRETER_TRANSLATE(nop), INTERPRETER_TRANSLATE(yield), INTERPRETER_TRANSLATE(wfe), - INTERPRETER_TRANSLATE(wfi), INTERPRETER_TRANSLATE(sev), INTERPRETER_TRANSLATE(swi), + INTERPRETER_TRANSLATE(srs), + INTERPRETER_TRANSLATE(rfe), + INTERPRETER_TRANSLATE(bkpt), + INTERPRETER_TRANSLATE(blx), + INTERPRETER_TRANSLATE(cps), + INTERPRETER_TRANSLATE(pld), + INTERPRETER_TRANSLATE(setend), + INTERPRETER_TRANSLATE(clrex), + INTERPRETER_TRANSLATE(rev16), + INTERPRETER_TRANSLATE(usad8), + INTERPRETER_TRANSLATE(sxtb), + INTERPRETER_TRANSLATE(uxtb), + INTERPRETER_TRANSLATE(sxth), + INTERPRETER_TRANSLATE(sxtb16), + INTERPRETER_TRANSLATE(uxth), + INTERPRETER_TRANSLATE(uxtb16), + INTERPRETER_TRANSLATE(cpy), + INTERPRETER_TRANSLATE(uxtab), + INTERPRETER_TRANSLATE(ssub8), + INTERPRETER_TRANSLATE(shsub8), + INTERPRETER_TRANSLATE(ssubaddx), + INTERPRETER_TRANSLATE(strex), + INTERPRETER_TRANSLATE(strexb), + INTERPRETER_TRANSLATE(swp), + INTERPRETER_TRANSLATE(swpb), + INTERPRETER_TRANSLATE(ssub16), + INTERPRETER_TRANSLATE(ssat16), + INTERPRETER_TRANSLATE(shsubaddx), + INTERPRETER_TRANSLATE(qsubaddx), + INTERPRETER_TRANSLATE(shaddsubx), + INTERPRETER_TRANSLATE(shadd8), + INTERPRETER_TRANSLATE(shadd16), + INTERPRETER_TRANSLATE(sel), + INTERPRETER_TRANSLATE(saddsubx), + INTERPRETER_TRANSLATE(sadd8), + INTERPRETER_TRANSLATE(sadd16), + INTERPRETER_TRANSLATE(shsub16), + INTERPRETER_TRANSLATE(umaal), + INTERPRETER_TRANSLATE(uxtab16), + INTERPRETER_TRANSLATE(usubaddx), + INTERPRETER_TRANSLATE(usub8), + INTERPRETER_TRANSLATE(usub16), + INTERPRETER_TRANSLATE(usat16), + INTERPRETER_TRANSLATE(usada8), + INTERPRETER_TRANSLATE(uqsubaddx), + INTERPRETER_TRANSLATE(uqsub8), + INTERPRETER_TRANSLATE(uqsub16), + INTERPRETER_TRANSLATE(uqaddsubx), + INTERPRETER_TRANSLATE(uqadd8), + INTERPRETER_TRANSLATE(uqadd16), + INTERPRETER_TRANSLATE(sxtab), + INTERPRETER_TRANSLATE(uhsubaddx), + INTERPRETER_TRANSLATE(uhsub8), + INTERPRETER_TRANSLATE(uhsub16), + INTERPRETER_TRANSLATE(uhaddsubx), + INTERPRETER_TRANSLATE(uhadd8), + INTERPRETER_TRANSLATE(uhadd16), + INTERPRETER_TRANSLATE(uaddsubx), + INTERPRETER_TRANSLATE(uadd8), + INTERPRETER_TRANSLATE(uadd16), + INTERPRETER_TRANSLATE(sxtah), + INTERPRETER_TRANSLATE(sxtab16), + INTERPRETER_TRANSLATE(qadd8), + INTERPRETER_TRANSLATE(bxj), + INTERPRETER_TRANSLATE(clz), + INTERPRETER_TRANSLATE(uxtah), + INTERPRETER_TRANSLATE(bx), + INTERPRETER_TRANSLATE(rev), + INTERPRETER_TRANSLATE(blx), + INTERPRETER_TRANSLATE(revsh), + INTERPRETER_TRANSLATE(qadd), + INTERPRETER_TRANSLATE(qadd16), + INTERPRETER_TRANSLATE(qaddsubx), + INTERPRETER_TRANSLATE(ldrex), + INTERPRETER_TRANSLATE(qdadd), + INTERPRETER_TRANSLATE(qdsub), + INTERPRETER_TRANSLATE(qsub), + INTERPRETER_TRANSLATE(ldrexb), + INTERPRETER_TRANSLATE(qsub8), + INTERPRETER_TRANSLATE(qsub16), + INTERPRETER_TRANSLATE(smuad), + INTERPRETER_TRANSLATE(smmul), + INTERPRETER_TRANSLATE(smusd), + INTERPRETER_TRANSLATE(smlsd), + INTERPRETER_TRANSLATE(smlsld), + INTERPRETER_TRANSLATE(smmla), + INTERPRETER_TRANSLATE(smmls), + INTERPRETER_TRANSLATE(smlald), + INTERPRETER_TRANSLATE(smlad), + INTERPRETER_TRANSLATE(smlaw), + INTERPRETER_TRANSLATE(smulw), + INTERPRETER_TRANSLATE(pkhtb), + INTERPRETER_TRANSLATE(pkhbt), + INTERPRETER_TRANSLATE(smul), + INTERPRETER_TRANSLATE(smlalxy), + INTERPRETER_TRANSLATE(smla), + INTERPRETER_TRANSLATE(mcrr), + INTERPRETER_TRANSLATE(mrrc), + INTERPRETER_TRANSLATE(cmp), + INTERPRETER_TRANSLATE(tst), + INTERPRETER_TRANSLATE(teq), + INTERPRETER_TRANSLATE(cmn), + INTERPRETER_TRANSLATE(smull), + INTERPRETER_TRANSLATE(umull), + INTERPRETER_TRANSLATE(umlal), + INTERPRETER_TRANSLATE(smlal), + INTERPRETER_TRANSLATE(mul), + INTERPRETER_TRANSLATE(mla), + INTERPRETER_TRANSLATE(ssat), + INTERPRETER_TRANSLATE(usat), + INTERPRETER_TRANSLATE(mrs), + INTERPRETER_TRANSLATE(msr), + INTERPRETER_TRANSLATE(and), + INTERPRETER_TRANSLATE(bic), + INTERPRETER_TRANSLATE(ldm), + INTERPRETER_TRANSLATE(eor), + INTERPRETER_TRANSLATE(add), + INTERPRETER_TRANSLATE(rsb), + INTERPRETER_TRANSLATE(rsc), + INTERPRETER_TRANSLATE(sbc), + INTERPRETER_TRANSLATE(adc), + INTERPRETER_TRANSLATE(sub), + INTERPRETER_TRANSLATE(orr), + INTERPRETER_TRANSLATE(mvn), + INTERPRETER_TRANSLATE(mov), + INTERPRETER_TRANSLATE(stm), + INTERPRETER_TRANSLATE(ldm), + INTERPRETER_TRANSLATE(ldrsh), + INTERPRETER_TRANSLATE(stm), + INTERPRETER_TRANSLATE(ldm), + INTERPRETER_TRANSLATE(ldrsb), + INTERPRETER_TRANSLATE(strd), + INTERPRETER_TRANSLATE(ldrh), + INTERPRETER_TRANSLATE(strh), + INTERPRETER_TRANSLATE(ldrd), + INTERPRETER_TRANSLATE(strt), + INTERPRETER_TRANSLATE(strbt), + INTERPRETER_TRANSLATE(ldrbt), + INTERPRETER_TRANSLATE(ldrt), + INTERPRETER_TRANSLATE(mrc), + INTERPRETER_TRANSLATE(mcr), + INTERPRETER_TRANSLATE(msr), + INTERPRETER_TRANSLATE(msr), + INTERPRETER_TRANSLATE(msr), + INTERPRETER_TRANSLATE(msr), + INTERPRETER_TRANSLATE(msr), + INTERPRETER_TRANSLATE(ldrb), + INTERPRETER_TRANSLATE(strb), + INTERPRETER_TRANSLATE(ldr), + INTERPRETER_TRANSLATE(ldrcond), + INTERPRETER_TRANSLATE(str), + INTERPRETER_TRANSLATE(cdp), + INTERPRETER_TRANSLATE(stc), + INTERPRETER_TRANSLATE(ldc), + INTERPRETER_TRANSLATE(ldrexd), + INTERPRETER_TRANSLATE(strexd), + INTERPRETER_TRANSLATE(ldrexh), + INTERPRETER_TRANSLATE(strexh), + INTERPRETER_TRANSLATE(nop), + INTERPRETER_TRANSLATE(yield), + INTERPRETER_TRANSLATE(wfe), + INTERPRETER_TRANSLATE(wfi), + INTERPRETER_TRANSLATE(sev), + INTERPRETER_TRANSLATE(swi), INTERPRETER_TRANSLATE(bbl), // All the thumb instructions should be placed the end of table - INTERPRETER_TRANSLATE(b_2_thumb), INTERPRETER_TRANSLATE(b_cond_thumb), - INTERPRETER_TRANSLATE(bl_1_thumb), INTERPRETER_TRANSLATE(bl_2_thumb), + INTERPRETER_TRANSLATE(b_2_thumb), + INTERPRETER_TRANSLATE(b_cond_thumb), + INTERPRETER_TRANSLATE(bl_1_thumb), + INTERPRETER_TRANSLATE(bl_2_thumb), INTERPRETER_TRANSLATE(blx_1_thumb), }; diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp index 3a9e8159f1..10b7313331 100644 --- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp @@ -58,7 +58,9 @@ #include "core/arm/skyeye_common/vfp/vfp_helper.h" static struct vfp_double vfp_double_default_qnan = { - 2047, 0, VFP_DOUBLE_SIGNIFICAND_QNAN, + 2047, + 0, + VFP_DOUBLE_SIGNIFICAND_QNAN, }; static void vfp_double_dump(const char* str, struct vfp_double* d) { diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp index 1f9142abcf..5c8231c009 100644 --- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp @@ -61,7 +61,9 @@ #include "core/arm/skyeye_common/vfp/vfp_helper.h" static struct vfp_single vfp_single_default_qnan = { - 255, 0, VFP_SINGLE_SIGNIFICAND_QNAN, + 255, + 0, + VFP_SINGLE_SIGNIFICAND_QNAN, }; static void vfp_single_dump(const char* str, struct vfp_single* s) { diff --git a/src/core/file_sys/archive_backend.cpp b/src/core/file_sys/archive_backend.cpp index e2b94a6f6e..9ace371fed 100644 --- a/src/core/file_sys/archive_backend.cpp +++ b/src/core/file_sys/archive_backend.cpp @@ -118,4 +118,4 @@ std::vector Path::AsBinary() const { return {}; } } -} +} // namespace FileSys diff --git a/src/core/file_sys/archive_selfncch.cpp b/src/core/file_sys/archive_selfncch.cpp index 08237d9ef5..e5864953d0 100644 --- a/src/core/file_sys/archive_selfncch.cpp +++ b/src/core/file_sys/archive_selfncch.cpp @@ -245,8 +245,9 @@ void ArchiveFactory_SelfNCCH::Register(Loader::AppLoader& app_loader) { program_id); if (ncch_data.find(program_id) != ncch_data.end()) { - LOG_WARNING(Service_FS, "Registering program %016" PRIX64 - " with SelfNCCH will override existing mapping", + LOG_WARNING(Service_FS, + "Registering program %016" PRIX64 + " with SelfNCCH will override existing mapping", program_id); } @@ -260,9 +261,9 @@ void ArchiveFactory_SelfNCCH::Register(Loader::AppLoader& app_loader) { } std::shared_ptr update_romfs_file; - if (Loader::ResultStatus::Success == - app_loader.ReadUpdateRomFS(update_romfs_file, data.update_romfs_offset, - data.update_romfs_size)) { + if (Loader::ResultStatus::Success == app_loader.ReadUpdateRomFS(update_romfs_file, + data.update_romfs_offset, + data.update_romfs_size)) { data.update_romfs_file = std::move(update_romfs_file); } diff --git a/src/core/file_sys/cia_container.cpp b/src/core/file_sys/cia_container.cpp index e96cdf33fc..5cf8505f25 100644 --- a/src/core/file_sys/cia_container.cpp +++ b/src/core/file_sys/cia_container.cpp @@ -225,4 +225,4 @@ void CIAContainer::Print() const { LOG_DEBUG(Service_FS, "Content %x Offset: 0x%08" PRIx64 " bytes", i, GetContentOffset(i)); } } -} +} // namespace FileSys diff --git a/src/core/file_sys/ncch_container.h b/src/core/file_sys/ncch_container.h index 77794a763c..026da7c814 100644 --- a/src/core/file_sys/ncch_container.h +++ b/src/core/file_sys/ncch_container.h @@ -215,13 +215,13 @@ public: u64& size); /** - * Get the override RomFS of the NCCH container - * Since the RomFS can be huge, we return a file reference instead of copying to a buffer - * @param romfs_file The file containing the RomFS - * @param offset The offset the romfs begins on - * @param size The size of the romfs - * @return ResultStatus result of function - */ + * Get the override RomFS of the NCCH container + * Since the RomFS can be huge, we return a file reference instead of copying to a buffer + * @param romfs_file The file containing the RomFS + * @param offset The offset the romfs begins on + * @param size The size of the romfs + * @return ResultStatus result of function + */ Loader::ResultStatus ReadOverrideRomFS(std::shared_ptr& romfs_file, u64& offset, u64& size); diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index c10dee51ba..e8c29adfb6 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h @@ -87,9 +87,9 @@ public: } /** - * Gets the framebuffer layout (width, height, and screen regions) - * @note This method is thread-safe - */ + * Gets the framebuffer layout (width, height, and screen regions) + * @note This method is thread-safe + */ const Layout::FramebufferLayout& GetFramebufferLayout() const { return framebuffer_layout; } diff --git a/src/core/frontend/framebuffer_layout.cpp b/src/core/frontend/framebuffer_layout.cpp index 7af9556b19..b49d7f509f 100644 --- a/src/core/frontend/framebuffer_layout.cpp +++ b/src/core/frontend/framebuffer_layout.cpp @@ -109,11 +109,10 @@ FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool swapped // To do that, find the total emulation box and maximize that based on window size float window_aspect_ratio = static_cast(height) / width; float emulation_aspect_ratio = - swapped - ? Core::kScreenBottomHeight * 4 / - (Core::kScreenBottomWidth * 4.0f + Core::kScreenTopWidth) - : Core::kScreenTopHeight * 4 / - (Core::kScreenTopWidth * 4.0f + Core::kScreenBottomWidth); + swapped ? Core::kScreenBottomHeight * 4 / + (Core::kScreenBottomWidth * 4.0f + Core::kScreenTopWidth) + : Core::kScreenTopHeight * 4 / + (Core::kScreenTopWidth * 4.0f + Core::kScreenBottomWidth); float large_screen_aspect_ratio = swapped ? BOT_SCREEN_ASPECT_RATIO : TOP_SCREEN_ASPECT_RATIO; float small_screen_aspect_ratio = swapped ? TOP_SCREEN_ASPECT_RATIO : BOT_SCREEN_ASPECT_RATIO; diff --git a/src/core/frontend/framebuffer_layout.h b/src/core/frontend/framebuffer_layout.h index 0d826be9e3..b40bf94b6e 100644 --- a/src/core/frontend/framebuffer_layout.h +++ b/src/core/frontend/framebuffer_layout.h @@ -54,14 +54,14 @@ FramebufferLayout SingleFrameLayout(unsigned width, unsigned height, bool is_swa FramebufferLayout LargeFrameLayout(unsigned width, unsigned height, bool is_swapped); /** -* Factory method for constructing a Frame with the Top screen and bottom -* screen side by side -* This is useful for devices with small screens, like the GPDWin -* @param width Window framebuffer width in pixels -* @param height Window framebuffer height in pixels -* @param is_swapped if true, the bottom screen will be the left display -* @return Newly created FramebufferLayout object with default screen regions initialized -*/ + * Factory method for constructing a Frame with the Top screen and bottom + * screen side by side + * This is useful for devices with small screens, like the GPDWin + * @param width Window framebuffer width in pixels + * @param height Window framebuffer height in pixels + * @param is_swapped if true, the bottom screen will be the left display + * @return Newly created FramebufferLayout object with default screen regions initialized + */ FramebufferLayout SideFrameLayout(unsigned width, unsigned height, bool is_swapped); /** diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index f90836c237..7dab0584e6 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -183,11 +183,11 @@ static u8 NibbleToHex(u8 n) { } /** -* Converts input hex string characters into an array of equivalent of u8 bytes. -* -* @param src Pointer to array of output hex string characters. -* @param len Length of src array. -*/ + * Converts input hex string characters into an array of equivalent of u8 bytes. + * + * @param src Pointer to array of output hex string characters. + * @param len Length of src array. + */ static u32 HexToInt(const u8* src, size_t len) { u32 output = 0; while (len-- > 0) { @@ -1037,4 +1037,4 @@ bool GetCpuStepFlag() { void SetCpuStepFlag(bool is_step) { step_loop = is_step; } -}; +}; // namespace GDBStub diff --git a/src/core/gdbstub/gdbstub.h b/src/core/gdbstub/gdbstub.h index 38177e32c8..da00ba5df7 100644 --- a/src/core/gdbstub/gdbstub.h +++ b/src/core/gdbstub/gdbstub.h @@ -91,4 +91,4 @@ bool GetCpuStepFlag(); * @param is_step */ void SetCpuStepFlag(bool is_step); -} +} // namespace GDBStub diff --git a/src/core/hle/applets/applet.cpp b/src/core/hle/applets/applet.cpp index 7c8aedfebd..3e115f1131 100644 --- a/src/core/hle/applets/applet.cpp +++ b/src/core/hle/applets/applet.cpp @@ -31,7 +31,7 @@ struct hash { return std::hash()(static_cast(id_code)); } }; -} +} // namespace std namespace HLE { namespace Applets { @@ -134,5 +134,5 @@ void Init() { void Shutdown() { CoreTiming::RemoveEvent(applet_update_event); } -} -} // namespace +} // namespace Applets +} // namespace HLE diff --git a/src/core/hle/applets/applet.h b/src/core/hle/applets/applet.h index 317554b001..87ecd7b687 100644 --- a/src/core/hle/applets/applet.h +++ b/src/core/hle/applets/applet.h @@ -86,5 +86,5 @@ void Init(); /// Shuts down the HLE applets void Shutdown(); -} -} // namespace +} // namespace Applets +} // namespace HLE diff --git a/src/core/hle/applets/swkbd.cpp b/src/core/hle/applets/swkbd.cpp index 48a08798e7..36c29854e3 100644 --- a/src/core/hle/applets/swkbd.cpp +++ b/src/core/hle/applets/swkbd.cpp @@ -114,5 +114,5 @@ void SoftwareKeyboard::Finalize() { is_running = false; } -} -} // namespace +} // namespace Applets +} // namespace HLE diff --git a/src/core/hle/applets/swkbd.h b/src/core/hle/applets/swkbd.h index f11dc45e41..f0cf320a33 100644 --- a/src/core/hle/applets/swkbd.h +++ b/src/core/hle/applets/swkbd.h @@ -82,5 +82,5 @@ private: /// Configuration of this instance of the SoftwareKeyboard, as received from the application SoftwareKeyboardConfig config; }; -} -} // namespace +} // namespace Applets +} // namespace HLE diff --git a/src/core/hle/config_mem.cpp b/src/core/hle/config_mem.cpp index e386ccdc6b..038af79096 100644 --- a/src/core/hle/config_mem.cpp +++ b/src/core/hle/config_mem.cpp @@ -28,4 +28,4 @@ void Init() { config_mem.firm_ctr_sdk_ver = 0x0000F297; } -} // namespace +} // namespace ConfigMem diff --git a/src/core/hle/config_mem.h b/src/core/hle/config_mem.h index 42fa6d789e..1840d17609 100644 --- a/src/core/hle/config_mem.h +++ b/src/core/hle/config_mem.h @@ -53,4 +53,4 @@ extern ConfigMemDef config_mem; void Init(); -} // namespace +} // namespace ConfigMem diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index 83f393756f..98575da030 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h @@ -398,7 +398,7 @@ std::array RequestParser::PopHLEHandles() { } inline Kernel::SharedPtr RequestParser::PopGenericObject() { - auto[handle] = PopHLEHandles<1>(); + auto [handle] = PopHLEHandles<1>(); return context->GetIncomingHandle(handle); } diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp index ce5d94e990..fb2b6f7a3c 100644 --- a/src/core/hle/kernel/client_port.cpp +++ b/src/core/hle/kernel/client_port.cpp @@ -39,4 +39,4 @@ ResultVal> ClientPort::Connect() { return MakeResult(std::get>(sessions)); } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h index 8f7d6ac442..a829aeb6d0 100644 --- a/src/core/hle/kernel/client_port.h +++ b/src/core/hle/kernel/client_port.h @@ -47,4 +47,4 @@ private: ~ClientPort() override; }; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/client_session.cpp b/src/core/hle/kernel/client_session.cpp index 4780590e66..17f4c12d3b 100644 --- a/src/core/hle/kernel/client_session.cpp +++ b/src/core/hle/kernel/client_session.cpp @@ -52,4 +52,4 @@ ResultCode ClientSession::SendSyncRequest(SharedPtr thread) { return server->HandleSyncRequest(std::move(thread)); } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/client_session.h b/src/core/hle/kernel/client_session.h index daf521529e..f098c4c3a3 100644 --- a/src/core/hle/kernel/client_session.h +++ b/src/core/hle/kernel/client_session.h @@ -50,4 +50,4 @@ private: ~ClientSession() override; }; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 23f9df0d63..9cae2369ff 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp @@ -52,4 +52,4 @@ void Event::WakeupAllWaitingThreads() { signaled = false; } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index cc41abb85b..e5c924a755 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h @@ -49,4 +49,4 @@ private: ~Event() override; }; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp index c7322d883f..3beb557535 100644 --- a/src/core/hle/kernel/handle_table.cpp +++ b/src/core/hle/kernel/handle_table.cpp @@ -94,4 +94,4 @@ void HandleTable::Clear() { next_free_slot = 0; } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h index d6aaefbf7d..ba968c6667 100644 --- a/src/core/hle/kernel/handle_table.h +++ b/src/core/hle/kernel/handle_table.h @@ -123,4 +123,4 @@ private: extern HandleTable g_handle_table; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 660f783421..8240324bdd 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -36,8 +36,9 @@ SharedPtr HLERequestContext::SleepClientThread(SharedPtr thread, std::chrono::nanoseconds timeout, WakeupCallback&& callback) { // Put the client thread to sleep until the wait event is signaled or the timeout expires. - thread->wakeup_callback = [ context = *this, callback ]( - ThreadWakeupReason reason, SharedPtr thread, SharedPtr object) mutable { + thread->wakeup_callback = [context = *this, callback](ThreadWakeupReason reason, + SharedPtr thread, + SharedPtr object) mutable { ASSERT(thread->status == THREADSTATUS_WAIT_HLE_EVENT); callback(thread, context, reason); diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 7470a97cad..2e470c40e2 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -45,4 +45,4 @@ void Shutdown() { Kernel::MemoryShutdown(); } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index 7f27e9655c..cf6f977a62 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp @@ -126,8 +126,9 @@ void HandleSpecialMapping(VMManager& address_space, const AddressMapping& mappin mapping_limit <= area.vaddr_base + area.size; }); if (area == std::end(memory_areas)) { - LOG_ERROR(Loader, "Unhandled special mapping: address=0x%08" PRIX32 " size=0x%" PRIX32 - " read_only=%d unk_flag=%d", + LOG_ERROR(Loader, + "Unhandled special mapping: address=0x%08" PRIX32 " size=0x%" PRIX32 + " read_only=%d unk_flag=%d", mapping.address, mapping.size, mapping.read_only, mapping.unk_flag); return; } diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp index 517dc47a8c..0149a3ed6a 100644 --- a/src/core/hle/kernel/resource_limit.cpp +++ b/src/core/hle/kernel/resource_limit.cpp @@ -151,4 +151,4 @@ void ResourceLimitsInit() { void ResourceLimitsShutdown() {} -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h index 42874eb8dd..1a0ca11f19 100644 --- a/src/core/hle/kernel/resource_limit.h +++ b/src/core/hle/kernel/resource_limit.h @@ -123,4 +123,4 @@ void ResourceLimitsInit(); // Destroys the resource limits void ResourceLimitsShutdown(); -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp index fcf5867288..4ec1669bac 100644 --- a/src/core/hle/kernel/semaphore.cpp +++ b/src/core/hle/kernel/semaphore.cpp @@ -52,4 +52,4 @@ ResultVal Semaphore::Release(s32 release_count) { return MakeResult(previous_count); } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/semaphore.h b/src/core/hle/kernel/semaphore.h index 7b0cacf2ef..ce56902258 100644 --- a/src/core/hle/kernel/semaphore.h +++ b/src/core/hle/kernel/semaphore.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "common/common_types.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/wait_object.h" @@ -56,4 +56,4 @@ private: ~Semaphore() override; }; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp index 49a9cdfa30..0b7061403e 100644 --- a/src/core/hle/kernel/server_port.cpp +++ b/src/core/hle/kernel/server_port.cpp @@ -50,4 +50,4 @@ std::tuple, SharedPtr> ServerPort::CreatePortP return std::make_tuple(std::move(server_port), std::move(client_port)); } -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h index 6fe7c7f2fc..9ef4ecc35b 100644 --- a/src/core/hle/kernel/server_port.h +++ b/src/core/hle/kernel/server_port.h @@ -72,4 +72,4 @@ private: ~ServerPort() override; }; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/session.cpp b/src/core/hle/kernel/session.cpp index 8a2a7e3fd3..6429147442 100644 --- a/src/core/hle/kernel/session.cpp +++ b/src/core/hle/kernel/session.cpp @@ -9,4 +9,4 @@ namespace Kernel { Session::Session() {} Session::~Session() {} -} +} // namespace Kernel diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h index a45e78022b..9c38c2fd08 100644 --- a/src/core/hle/kernel/session.h +++ b/src/core/hle/kernel/session.h @@ -24,4 +24,4 @@ public: ServerSession* server = nullptr; ///< The server endpoint of the session. SharedPtr port; ///< The port that this session is associated with (optional). }; -} +} // namespace Kernel diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 93a6f21822..e948819c0d 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -98,10 +98,10 @@ public: ResultCode Unmap(Process* target_process, VAddr address); /** - * Gets a pointer to the shared memory block - * @param offset Offset from the start of the shared memory block to get pointer - * @return Pointer to the shared memory block from the specified offset - */ + * Gets a pointer to the shared memory block + * @param offset Offset from the start of the shared memory block to get pointer + * @return Pointer to the shared memory block from the specified offset + */ u8* GetPointer(u32 offset = 0); /// Process that created this shared memory block. @@ -129,4 +129,4 @@ private: ~SharedMemory() override; }; -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 04dae82a16..fc645ceded 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -288,7 +288,6 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) { thread->wakeup_callback = [](ThreadWakeupReason reason, SharedPtr thread, SharedPtr object) { - ASSERT(thread->status == THREADSTATUS_WAIT_SYNCH_ANY); if (reason == ThreadWakeupReason::Timeout) { @@ -378,7 +377,6 @@ static ResultCode WaitSynchronizationN(s32* out, VAddr handles_address, s32 hand thread->wakeup_callback = [](ThreadWakeupReason reason, SharedPtr thread, SharedPtr object) { - ASSERT(thread->status == THREADSTATUS_WAIT_SYNCH_ALL); if (reason == ThreadWakeupReason::Timeout) { @@ -439,7 +437,6 @@ static ResultCode WaitSynchronizationN(s32* out, VAddr handles_address, s32 hand thread->wakeup_callback = [](ThreadWakeupReason reason, SharedPtr thread, SharedPtr object) { - ASSERT(thread->status == THREADSTATUS_WAIT_SYNCH_ANY); if (reason == ThreadWakeupReason::Timeout) { @@ -591,7 +588,6 @@ static ResultCode ReplyAndReceive(s32* index, VAddr handles_address, s32 handle_ thread->wakeup_callback = [](ThreadWakeupReason reason, SharedPtr thread, SharedPtr object) { - ASSERT(thread->status == THREADSTATUS_WAIT_SYNCH_ANY); ASSERT(reason == ThreadWakeupReason::Signal); @@ -770,8 +766,9 @@ static ResultCode CreateThread(Handle* out_handle, u32 priority, u32 entry_point Core::System::GetInstance().PrepareReschedule(); - LOG_TRACE(Kernel_SVC, "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " - "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", + LOG_TRACE(Kernel_SVC, + "called entrypoint=0x%08X (%s), arg=0x%08X, stacktop=0x%08X, " + "threadpriority=0x%08X, processorid=0x%08X : created handle=0x%08X", entry_point, name.c_str(), arg, stack_top, priority, processor_id, *out_handle); return RESULT_SUCCESS; diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index a93a6c87a4..8da745634e 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -111,4 +111,4 @@ void TimersInit() { void TimersShutdown() {} -} // namespace +} // namespace Kernel diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 82552372d5..82d19cefcd 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -76,4 +76,4 @@ void TimersInit(); /// Tears down the timer variables void TimersShutdown(); -} // namespace +} // namespace Kernel diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index 3492d14058..220ca3f232 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -18,7 +18,7 @@ namespace Service { namespace FS { enum class MediaType : u32; } -} +} // namespace Service namespace Service { namespace AM { diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index 48ff76eee7..240ff91e90 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -306,8 +306,9 @@ void Module::Interface::SendParameter(Kernel::HLERequestContext& ctx) { Kernel::SharedPtr object = rp.PopGenericObject(); std::vector buffer = rp.PopStaticBuffer(); - LOG_DEBUG(Service_APT, "called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X," - "buffer_size=0x%08X", + LOG_DEBUG(Service_APT, + "called src_app_id=0x%08X, dst_app_id=0x%08X, signal_type=0x%08X," + "buffer_size=0x%08X", static_cast(src_app_id), static_cast(dst_app_id), static_cast(signal_type), buffer_size); @@ -392,8 +393,9 @@ void Module::Interface::CancelParameter(Kernel::HLERequestContext& ctx) { rb.Push(apt->applet_manager->CancelParameter(check_sender, sender_appid, check_receiver, receiver_appid)); - LOG_DEBUG(Service_APT, "called check_sender=%u, sender_appid=0x%08X, " - "check_receiver=%u, receiver_appid=0x%08X", + LOG_DEBUG(Service_APT, + "called check_sender=%u, sender_appid=0x%08X, " + "check_receiver=%u, receiver_appid=0x%08X", check_sender, static_cast(sender_appid), check_receiver, static_cast(receiver_appid)); } diff --git a/src/core/hle/service/boss/boss.cpp b/src/core/hle/service/boss/boss.cpp index 2bba3aff63..e0d14c6a6a 100644 --- a/src/core/hle/service/boss/boss.cpp +++ b/src/core/hle/service/boss/boss.cpp @@ -111,9 +111,10 @@ void RegisterPrivateClientCert(Service::Interface* self) { cmd_buff[2] = (buff2_size << 4 | 0xA); cmd_buff[3] = buff2_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " - "translation1=0x%08X, buff1_addr=0x%08X, buff1_size=0x%08X, " - "translation2=0x%08X, buff2_addr=0x%08X, buff2_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " + "translation1=0x%08X, buff1_addr=0x%08X, buff1_size=0x%08X, " + "translation2=0x%08X, buff2_addr=0x%08X, buff2_size=0x%08X", unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, buff2_addr, buff2_size); } @@ -177,8 +178,9 @@ void RegisterTask(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } @@ -196,8 +198,9 @@ void UnregisterTask(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, translation, buff_addr, buff_size); } @@ -215,8 +218,9 @@ void ReconfigureTask(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, translation, buff_addr, buff_size); } @@ -263,9 +267,10 @@ void GetNsDataIdList(Service::Interface* self) { cmd_buff[4] = (buff_size << 4 | 0xC); cmd_buff[5] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "unk_param4=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "unk_param4=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } @@ -287,9 +292,10 @@ void GetOwnNsDataIdList(Service::Interface* self) { cmd_buff[4] = (buff_size << 4 | 0xC); cmd_buff[5] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "unk_param4=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "unk_param4=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } @@ -311,9 +317,10 @@ void GetNewDataNsDataIdList(Service::Interface* self) { cmd_buff[4] = (buff_size << 4 | 0xC); cmd_buff[5] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "unk_param4=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "unk_param4=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } @@ -335,9 +342,10 @@ void GetOwnNewDataNsDataIdList(Service::Interface* self) { cmd_buff[4] = (buff_size << 4 | 0xC); cmd_buff[5] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "unk_param4=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "unk_param4=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } @@ -355,8 +363,9 @@ void SendProperty(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, translation, buff_addr, buff_size); } @@ -373,8 +382,9 @@ void SendPropertyHandle(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -392,8 +402,9 @@ void ReceiveProperty(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xC); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, buff_size=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, buff_size=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X", unk_param1, buff_size, translation, buff_addr); } @@ -411,8 +422,9 @@ void UpdateTaskInterval(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, translation, buff_addr, buff_size); } @@ -429,8 +441,9 @@ void UpdateTaskCount(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X", buff_size, unk_param2, translation, buff_addr); } @@ -448,8 +461,9 @@ void GetTaskInterval(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -467,8 +481,9 @@ void GetTaskCount(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -486,8 +501,9 @@ void GetTaskServiceStatus(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -504,8 +520,9 @@ void StartTask(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -522,8 +539,9 @@ void StartTaskImmediate(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -540,8 +558,9 @@ void CancelTask(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -572,8 +591,9 @@ void GetTaskState(Service::Interface* self) { cmd_buff[5] = (buff_size << 4 | 0xA); cmd_buff[6] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X", buff_size, unk_param2, translation, buff_addr); } @@ -593,8 +613,9 @@ void GetTaskResult(Service::Interface* self) { cmd_buff[5] = (buff_size << 4 | 0xA); cmd_buff[6] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -614,8 +635,9 @@ void GetTaskCommErrorCode(Service::Interface* self) { cmd_buff[5] = (buff_size << 4 | 0xA); cmd_buff[6] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -635,8 +657,9 @@ void GetTaskStatus(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } @@ -655,8 +678,9 @@ void GetTaskError(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, translation, buff_addr, buff_size); } @@ -674,8 +698,9 @@ void GetTaskInfo(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, translation, buff_addr, buff_size); } @@ -705,8 +730,9 @@ void GetNsDataHeaderInfo(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xC); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } @@ -728,9 +754,10 @@ void ReadNsData(Service::Interface* self) { cmd_buff[4] = (buff_size << 4 | 0xC); cmd_buff[5] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "unk_param4=0x%08X, translation=0x%08X, " - "buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "unk_param4=0x%08X, translation=0x%08X, " + "buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4, translation, buff_addr, buff_size); } @@ -822,8 +849,9 @@ void RegisterStorageEntry(Service::Interface* self) { cmd_buff[0] = IPC::MakeHeader(0x2F, 0x1, 0); cmd_buff[1] = RESULT_SUCCESS.raw; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "unk_param4=0x%08X, unk_param5=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "unk_param4=0x%08X, unk_param5=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4, unk_param5); } @@ -849,8 +877,9 @@ void SetStorageOption(Service::Interface* self) { cmd_buff[0] = IPC::MakeHeader(0x31, 0x1, 0); cmd_buff[1] = RESULT_SUCCESS.raw; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " - "unk_param3=0x%08X, unk_param4=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " + "unk_param3=0x%08X, unk_param4=0x%08X", unk_param1, unk_param2, unk_param3, unk_param4); } @@ -880,8 +909,9 @@ void StartBgImmediate(Service::Interface* self) { cmd_buff[2] = (buff_size << 4 | 0xA); cmd_buff[3] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -899,8 +929,9 @@ void GetTaskActivePriority(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) buff_size=0x%08X, unk_param2=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X", unk_param1, translation, buff_addr, buff_size); } @@ -919,8 +950,9 @@ void RegisterImmediateTask(Service::Interface* self) { cmd_buff[3] = (buff_size << 4 | 0xA); cmd_buff[4] = buff_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " - "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, unk_param3=0x%08X, " + "translation=0x%08X, buff_addr=0x%08X, buff_size=0x%08X", unk_param1, unk_param2, unk_param3, translation, buff_addr, buff_size); } @@ -943,9 +975,10 @@ void SetTaskQuery(Service::Interface* self) { cmd_buff[2] = (buff2_size << 4 | 0xA); cmd_buff[3] = buff2_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " - "translation1=0x%08X, buff1_addr=0x%08X, buff1_size=0x%08X, " - "translation2=0x%08X, buff2_addr=0x%08X, buff2_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " + "translation1=0x%08X, buff1_addr=0x%08X, buff1_size=0x%08X, " + "translation2=0x%08X, buff2_addr=0x%08X, buff2_size=0x%08X", unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, buff2_addr, buff2_size); } @@ -969,9 +1002,10 @@ void GetTaskQuery(Service::Interface* self) { cmd_buff[2] = (buff2_size << 4 | 0xC); cmd_buff[3] = buff2_addr; - LOG_WARNING(Service_BOSS, "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " - "translation1=0x%08X, buff1_addr=0x%08X, buff1_size=0x%08X, " - "translation2=0x%08X, buff2_addr=0x%08X, buff2_size=0x%08X", + LOG_WARNING(Service_BOSS, + "(STUBBED) unk_param1=0x%08X, unk_param2=0x%08X, " + "translation1=0x%08X, buff1_addr=0x%08X, buff1_size=0x%08X, " + "translation2=0x%08X, buff2_addr=0x%08X, buff2_size=0x%08X", unk_param1, unk_param2, translation1, buff1_addr, buff1_size, translation2, buff2_addr, buff2_size); } diff --git a/src/core/hle/service/cam/cam.cpp b/src/core/hle/service/cam/cam.cpp index 8d52f24055..e828709091 100644 --- a/src/core/hle/service/cam/cam.cpp +++ b/src/core/hle/service/cam/cam.cpp @@ -728,8 +728,9 @@ void Module::Interface::SetDetailSize(Kernel::HLERequestContext& ctx) { rb.Push(ERROR_INVALID_ENUM_VALUE); } - LOG_DEBUG(Service_CAM, "called, camera_select=%u, width=%u, height=%u, crop_x0=%u, crop_y0=%u, " - "crop_x1=%u, crop_y1=%u, context_select=%u", + LOG_DEBUG(Service_CAM, + "called, camera_select=%u, width=%u, height=%u, crop_x0=%u, crop_y0=%u, " + "crop_x1=%u, crop_y1=%u, context_select=%u", camera_select.m_val, resolution.width, resolution.height, resolution.crop_x0, resolution.crop_y0, resolution.crop_x1, resolution.crop_y1, context_select.m_val); } diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index 2c48288abf..3c4f247708 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp @@ -90,7 +90,7 @@ struct ConsoleCountryInfo { u8 country_code; ///< The country code of the console }; static_assert(sizeof(ConsoleCountryInfo) == 4, "ConsoleCountryInfo must be exactly 4 bytes"); -} +} // namespace static const ConsoleModelInfo CONSOLE_MODEL = {NINTENDO_3DS_XL, {0, 0, 0}}; static const u8 CONSOLE_LANGUAGE = LANGUAGE_EN; diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp index 68d9387f83..d5ea979866 100644 --- a/src/core/hle/service/dsp_dsp.cpp +++ b/src/core/hle/service/dsp_dsp.cpp @@ -236,8 +236,9 @@ static void RegisterInterruptEvents(Service::Interface* self) { } if (interrupt_events.HasTooManyEventsRegistered()) { - LOG_INFO(Service_DSP, "Ran out of space to register interrupts (Attempted to register " - "type=%u, pipe=%u, event_handle=0x%08X)", + LOG_INFO(Service_DSP, + "Ran out of space to register interrupts (Attempted to register " + "type=%u, pipe=%u, event_handle=0x%08X)", type_index, pipe_index, event_handle); cmd_buff[1] = ResultCode(ErrorDescription::InvalidResultValue, ErrorModule::DSP, ErrorSummary::OutOfResource, ErrorLevel::Status) @@ -294,8 +295,9 @@ static void WriteProcessPipe(Service::Interface* self) { AudioCore::DspPipe pipe = static_cast(pipe_index); if (IPC::StaticBufferDesc(size, 1) != cmd_buff[3]) { - LOG_ERROR(Service_DSP, "IPC static buffer descriptor failed validation (0x%X). pipe=%u, " - "size=0x%X, buffer=0x%08X", + LOG_ERROR(Service_DSP, + "IPC static buffer descriptor failed validation (0x%X). pipe=%u, " + "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; diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index cac1701f7d..4ae3fb7f04 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -87,8 +87,9 @@ void File::Read(Kernel::HLERequestContext& ctx) { offset += file->offset; if (offset + length > backend->GetSize()) { - LOG_ERROR(Service_FS, "Reading from out of bounds offset=0x%" PRIx64 - " length=0x%08X file_size=0x%" PRIx64, + LOG_ERROR(Service_FS, + "Reading from out of bounds offset=0x%" PRIx64 + " length=0x%08X file_size=0x%" PRIx64, offset, length, backend->GetSize()); } diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index d39b76f455..afcf6bd914 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp @@ -438,8 +438,9 @@ void FS_USER::CreateExtSaveData(Kernel::HLERequestContext& ctx) { u32 icon_size = rp.Pop(); auto icon_buffer = rp.PopMappedBuffer(); - LOG_WARNING(Service_FS, "(STUBBED) savedata_high=%08X savedata_low=%08X unknown=%08X " - "files=%08X directories=%08X size_limit=%016" PRIx64 " icon_size=%08X", + LOG_WARNING(Service_FS, + "(STUBBED) savedata_high=%08X savedata_low=%08X unknown=%08X " + "files=%08X directories=%08X size_limit=%016" PRIx64 " icon_size=%08X", save_high, save_low, unknown, directories, files, size_limit, icon_size); std::vector icon(icon_size); @@ -663,8 +664,9 @@ void FS_USER::SetSaveDataSecureValue(Kernel::HLERequestContext& ctx) { // TODO: Generate and Save the Secure Value - LOG_WARNING(Service_FS, "(STUBBED) called, value=0x%016" PRIx64 " secure_value_slot=0x%08X " - "unqiue_id=0x%08X title_variation=0x%02X", + LOG_WARNING(Service_FS, + "(STUBBED) called, value=0x%016" PRIx64 " 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 bafe03b5d9..0b7cf9123c 100644 --- a/src/core/hle/service/gsp/gsp_gpu.cpp +++ b/src/core/hle/service/gsp/gsp_gpu.cpp @@ -261,31 +261,26 @@ ResultCode SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) { PAddr phys_address_left = Memory::VirtualToPhysicalAddress(info.address_left); PAddr phys_address_right = Memory::VirtualToPhysicalAddress(info.address_right); if (info.active_fb == 0) { - WriteSingleHWReg( - base_address + - 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].address_left1)), - phys_address_left); - WriteSingleHWReg( - base_address + - 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].address_right1)), - phys_address_right); + WriteSingleHWReg(base_address + 4 * static_cast(GPU_REG_INDEX( + framebuffer_config[screen_id].address_left1)), + phys_address_left); + WriteSingleHWReg(base_address + 4 * static_cast(GPU_REG_INDEX( + framebuffer_config[screen_id].address_right1)), + phys_address_right); } else { - WriteSingleHWReg( - base_address + - 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].address_left2)), - phys_address_left); - WriteSingleHWReg( - base_address + - 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].address_right2)), - phys_address_right); + WriteSingleHWReg(base_address + 4 * static_cast(GPU_REG_INDEX( + framebuffer_config[screen_id].address_left2)), + phys_address_left); + WriteSingleHWReg(base_address + 4 * static_cast(GPU_REG_INDEX( + framebuffer_config[screen_id].address_right2)), + phys_address_right); } WriteSingleHWReg(base_address + 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].stride)), info.stride); - WriteSingleHWReg( - base_address + - 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].color_format)), - info.format); + WriteSingleHWReg(base_address + 4 * static_cast(GPU_REG_INDEX( + framebuffer_config[screen_id].color_format)), + info.format); WriteSingleHWReg( base_address + 4 * static_cast(GPU_REG_INDEX(framebuffer_config[screen_id].active_fb)), info.shown_fb); diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 2b49e31cc2..f436568a8b 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -333,7 +333,9 @@ void Module::Interface::GetGyroscopeLowCalibrateParam(Kernel::HLERequestContext& const s16 param_unit = 6700; // an approximate value taken from hw GyroscopeCalibrateParam param = { - {0, param_unit, -param_unit}, {0, param_unit, -param_unit}, {0, param_unit, -param_unit}, + {0, param_unit, -param_unit}, + {0, param_unit, -param_unit}, + {0, param_unit, -param_unit}, }; rb.PushRaw(param); diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 1518111d34..9689245ede 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -21,7 +21,7 @@ namespace Kernel { class Event; class SharedMemory; -} +} // namespace Kernel namespace CoreTiming { class EventType; @@ -335,5 +335,5 @@ void InstallInterfaces(SM::ServiceManager& service_manager); /// Reload input devices. Used when input configuration changed void ReloadInputDevices(); -} -} +} // namespace HID +} // namespace Service diff --git a/src/core/hle/service/ir/extra_hid.cpp b/src/core/hle/service/ir/extra_hid.cpp index 9f93257287..d070fbe8c4 100644 --- a/src/core/hle/service/ir/extra_hid.cpp +++ b/src/core/hle/service/ir/extra_hid.cpp @@ -72,21 +72,77 @@ ExtraHID::ExtraHID(SendFunc send_func) : IRDevice(send_func) { // and loaded from somewhere. calibration_data = std::array{{ // 0x00 - 0x00, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, + 0x00, + 0x00, + 0x08, + 0x80, + 0x85, + 0xEB, + 0x11, + 0x3F, // 0x08 - 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0xF5, + 0x85, + 0xEB, + 0x11, + 0x3F, + 0xFF, + 0xFF, + 0xFF, + 0xF5, // 0x10 - 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, + 0xFF, + 0x00, + 0x08, + 0x80, + 0x85, + 0xEB, + 0x11, + 0x3F, // 0x18 - 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0x65, + 0x85, + 0xEB, + 0x11, + 0x3F, + 0xFF, + 0xFF, + 0xFF, + 0x65, // 0x20 - 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, + 0xFF, + 0x00, + 0x08, + 0x80, + 0x85, + 0xEB, + 0x11, + 0x3F, // 0x28 - 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0x65, + 0x85, + 0xEB, + 0x11, + 0x3F, + 0xFF, + 0xFF, + 0xFF, + 0x65, // 0x30 - 0xFF, 0x00, 0x08, 0x80, 0x85, 0xEB, 0x11, 0x3F, + 0xFF, + 0x00, + 0x08, + 0x80, + 0x85, + 0xEB, + 0x11, + 0x3F, // 0x38 - 0x85, 0xEB, 0x11, 0x3F, 0xFF, 0xFF, 0xFF, 0x65, + 0x85, + 0xEB, + 0x11, + 0x3F, + 0xFF, + 0xFF, + 0xFF, + 0x65, }}; hid_polling_callback_id = diff --git a/src/core/hle/service/ir/ir_rst.h b/src/core/hle/service/ir/ir_rst.h index 882b3e4c1b..0512cb4cf5 100644 --- a/src/core/hle/service/ir/ir_rst.h +++ b/src/core/hle/service/ir/ir_rst.h @@ -16,7 +16,7 @@ namespace Kernel { class Event; class SharedMemory; -} +} // namespace Kernel namespace CoreTiming { class EventType; diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp index aee4b13056..472074b388 100644 --- a/src/core/hle/service/ir/ir_user.cpp +++ b/src/core/hle/service/ir/ir_user.cpp @@ -251,9 +251,10 @@ void IR_USER::InitializeIrNopShared(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); - LOG_INFO(Service_IR, "called, shared_buff_size=%u, recv_buff_size=%u, " - "recv_buff_packet_count=%u, send_buff_size=%u, " - "send_buff_packet_count=%u, baud_rate=%u", + LOG_INFO(Service_IR, + "called, shared_buff_size=%u, recv_buff_size=%u, " + "recv_buff_packet_count=%u, send_buff_size=%u, " + "send_buff_packet_count=%u, baud_rate=%u", shared_buff_size, recv_buff_size, recv_buff_packet_count, send_buff_size, send_buff_packet_count, baud_rate); } diff --git a/src/core/hle/service/ir/ir_user.h b/src/core/hle/service/ir/ir_user.h index 64673293f1..d94dbbb21b 100644 --- a/src/core/hle/service/ir/ir_user.h +++ b/src/core/hle/service/ir/ir_user.h @@ -12,7 +12,7 @@ namespace Kernel { class Event; class SharedMemory; -} +} // namespace Kernel namespace CoreTiming { class EventType; diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index acecceeb7e..4d95b6debb 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp @@ -25,18 +25,27 @@ const std::array CROHelper::ENTRY_SIZE{{ 1, // code 1, // data 1, // module name - sizeof(SegmentEntry), sizeof(ExportNamedSymbolEntry), sizeof(ExportIndexedSymbolEntry), + sizeof(SegmentEntry), + sizeof(ExportNamedSymbolEntry), + sizeof(ExportIndexedSymbolEntry), 1, // export strings - sizeof(ExportTreeEntry), sizeof(ImportModuleEntry), sizeof(ExternalRelocationEntry), - sizeof(ImportNamedSymbolEntry), sizeof(ImportIndexedSymbolEntry), + sizeof(ExportTreeEntry), + sizeof(ImportModuleEntry), + sizeof(ExternalRelocationEntry), + sizeof(ImportNamedSymbolEntry), + sizeof(ImportIndexedSymbolEntry), sizeof(ImportAnonymousSymbolEntry), 1, // import strings - sizeof(StaticAnonymousSymbolEntry), sizeof(InternalRelocationEntry), + sizeof(StaticAnonymousSymbolEntry), + sizeof(InternalRelocationEntry), sizeof(StaticRelocationEntry), }}; const std::array CROHelper::FIX_BARRIERS{{ - Fix0Barrier, Fix1Barrier, Fix2Barrier, Fix3Barrier, + Fix0Barrier, + Fix1Barrier, + Fix2Barrier, + Fix3Barrier, }}; VAddr CROHelper::SegmentTagToAddress(SegmentTag segment_tag) const { @@ -209,12 +218,24 @@ ResultCode CROHelper::RebaseHeader(u32 cro_size) { // verifies that all offsets are in the correct order constexpr std::array OFFSET_ORDER = {{ - CodeOffset, ModuleNameOffset, SegmentTableOffset, ExportNamedSymbolTableOffset, - ExportTreeTableOffset, ExportIndexedSymbolTableOffset, ExportStringsOffset, - ImportModuleTableOffset, ExternalRelocationTableOffset, ImportNamedSymbolTableOffset, - ImportIndexedSymbolTableOffset, ImportAnonymousSymbolTableOffset, ImportStringsOffset, - StaticAnonymousSymbolTableOffset, InternalRelocationTableOffset, - StaticRelocationTableOffset, DataOffset, FileSize, + CodeOffset, + ModuleNameOffset, + SegmentTableOffset, + ExportNamedSymbolTableOffset, + ExportTreeTableOffset, + ExportIndexedSymbolTableOffset, + ExportStringsOffset, + ImportModuleTableOffset, + ExternalRelocationTableOffset, + ImportNamedSymbolTableOffset, + ImportIndexedSymbolTableOffset, + ImportAnonymousSymbolTableOffset, + ImportStringsOffset, + StaticAnonymousSymbolTableOffset, + InternalRelocationTableOffset, + StaticRelocationTableOffset, + DataOffset, + FileSize, }}; u32 prev_offset = GetField(OFFSET_ORDER[0]); diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp index 15014a64c0..c73292087c 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.cpp +++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp @@ -195,10 +195,11 @@ void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) { VAddr crr_address = rp.Pop(); auto process = rp.PopObject(); - LOG_DEBUG(Service_LDR, "called (%s), cro_buffer_ptr=0x%08X, cro_address=0x%08X, cro_size=0x%X, " - "data_segment_address=0x%08X, zero=%d, data_segment_size=0x%X, " - "bss_segment_address=0x%08X, bss_segment_size=0x%X, auto_link=%s, " - "fix_level=%d, crr_address=0x%08X", + LOG_DEBUG(Service_LDR, + "called (%s), cro_buffer_ptr=0x%08X, cro_address=0x%08X, cro_size=0x%X, " + "data_segment_address=0x%08X, zero=%d, data_segment_size=0x%X, " + "bss_segment_address=0x%08X, bss_segment_size=0x%X, auto_link=%s, " + "fix_level=%d, 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); diff --git a/src/core/hle/service/ndm/ndm.cpp b/src/core/hle/service/ndm/ndm.cpp index 9f57b3a5ab..8a5647072e 100644 --- a/src/core/hle/service/ndm/ndm.cpp +++ b/src/core/hle/service/ndm/ndm.cpp @@ -21,7 +21,10 @@ enum : u32 { static DaemonMask daemon_bit_mask = DaemonMask::Default; static DaemonMask default_daemon_bit_mask = DaemonMask::Default; static std::array daemon_status = { - DaemonStatus::Idle, DaemonStatus::Idle, DaemonStatus::Idle, DaemonStatus::Idle, + DaemonStatus::Idle, + DaemonStatus::Idle, + DaemonStatus::Idle, + DaemonStatus::Idle, }; static ExclusiveState exclusive_state = ExclusiveState::None; static u32 scan_interval = DEFAULT_SCAN_INTERVAL; diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index 43dbe59020..ecc2ed966d 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -554,8 +554,9 @@ void NWM_UDS::RecvBeaconBroadcastData(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); 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=%zu", + 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=%zu", out_buffer_size, wlan_comm_id, id, unk1, unk2, cur_buffer_size); } diff --git a/src/core/hle/service/nwm/uds_data.cpp b/src/core/hle/service/nwm/uds_data.cpp index 6a693c0796..16d20166c2 100644 --- a/src/core/hle/service/nwm/uds_data.cpp +++ b/src/core/hle/service/nwm/uds_data.cpp @@ -187,8 +187,9 @@ static std::vector DecryptDataFrame(const std::vector& encrypted_payload d.SpecifyDataLengths(aad.size(), encrypted_payload.size() - 8, 0); CryptoPP::AuthenticatedDecryptionFilter df( - d, nullptr, CryptoPP::AuthenticatedDecryptionFilter::MAC_AT_END | - CryptoPP::AuthenticatedDecryptionFilter::THROW_EXCEPTION); + d, nullptr, + CryptoPP::AuthenticatedDecryptionFilter::MAC_AT_END | + CryptoPP::AuthenticatedDecryptionFilter::THROW_EXCEPTION); // put aad df.ChannelPut(CryptoPP::AAD_CHANNEL, aad.data(), aad.size()); diff --git a/src/core/hle/service/sm/srv.h b/src/core/hle/service/sm/srv.h index aad839563e..ab58556202 100644 --- a/src/core/hle/service/sm/srv.h +++ b/src/core/hle/service/sm/srv.h @@ -10,7 +10,7 @@ namespace Kernel { class HLERequestContext; class Semaphore; -} +} // namespace Kernel namespace Service { namespace SM { diff --git a/src/core/hle/service/ssl_c.cpp b/src/core/hle/service/ssl_c.cpp index 300acca75e..d71e2cf9c2 100644 --- a/src/core/hle/service/ssl_c.cpp +++ b/src/core/hle/service/ssl_c.cpp @@ -88,5 +88,5 @@ SSL_C::SSL_C() { Register(FunctionTable); } -} // namespace SSL_C +} // namespace SSL } // namespace Service diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp index 88c88dbd70..d7a87f5c76 100644 --- a/src/core/hle/service/y2r_u.cpp +++ b/src/core/hle/service/y2r_u.cpp @@ -230,8 +230,9 @@ void Y2R_U::SetSendingY(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_Y2R, "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " - "src_process_id=%u", + LOG_DEBUG(Service_Y2R, + "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " + "src_process_id=%u", conversion.src_Y.image_size, conversion.src_Y.transfer_unit, conversion.src_Y.gap, process->process_id); } @@ -248,8 +249,9 @@ void Y2R_U::SetSendingU(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_Y2R, "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " - "src_process_id=%u", + LOG_DEBUG(Service_Y2R, + "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " + "src_process_id=%u", conversion.src_U.image_size, conversion.src_U.transfer_unit, conversion.src_U.gap, process->process_id); } @@ -267,8 +269,9 @@ void Y2R_U::SetSendingV(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_Y2R, "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " - "src_process_id=%u", + LOG_DEBUG(Service_Y2R, + "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " + "src_process_id=%u", conversion.src_V.image_size, conversion.src_V.transfer_unit, conversion.src_V.gap, process->process_id); } @@ -286,8 +289,9 @@ void Y2R_U::SetSendingYUYV(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_Y2R, "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " - "src_process_id=%u", + LOG_DEBUG(Service_Y2R, + "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " + "src_process_id=%u", conversion.src_YUYV.image_size, conversion.src_YUYV.transfer_unit, conversion.src_YUYV.gap, process->process_id); } @@ -345,8 +349,9 @@ void Y2R_U::SetReceiving(Kernel::HLERequestContext& ctx) { IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); rb.Push(RESULT_SUCCESS); - LOG_DEBUG(Service_Y2R, "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " - "dst_process_id=%u", + LOG_DEBUG(Service_Y2R, + "called image_size=0x%08X, transfer_unit=%hu, transfer_stride=%hu, " + "dst_process_id=%u", conversion.dst.image_size, conversion.dst.transfer_unit, conversion.dst.gap, static_cast(dst_process->process_id)); } diff --git a/src/core/hw/aes/arithmetic128.h b/src/core/hw/aes/arithmetic128.h index d670e2ce20..1cec365c8d 100644 --- a/src/core/hw/aes/arithmetic128.h +++ b/src/core/hw/aes/arithmetic128.h @@ -13,5 +13,5 @@ AESKey Lrot128(const AESKey& in, u32 rot); AESKey Add128(const AESKey& a, const AESKey& b); AESKey Xor128(const AESKey& a, const AESKey& b); -} // namspace AES +} // namespace AES } // namespace HW diff --git a/src/core/hw/aes/ccm.cpp b/src/core/hw/aes/ccm.cpp index b28b579f3a..dcb6090cd5 100644 --- a/src/core/hw/aes/ccm.cpp +++ b/src/core/hw/aes/ccm.cpp @@ -19,10 +19,10 @@ namespace { // 3DS uses a non-standard AES-CCM algorithm, so we need to derive a sub class from the standard one // and override with the non-standard part. -using CryptoPP::lword; using CryptoPP::AES; -using CryptoPP::CCM_Final; using CryptoPP::CCM_Base; +using CryptoPP::CCM_Final; +using CryptoPP::lword; template class CCM_3DSVariant_Final : public CCM_Final { public: diff --git a/src/core/hw/aes/key.h b/src/core/hw/aes/key.h index c9f1342f4f..1441131c68 100644 --- a/src/core/hw/aes/key.h +++ b/src/core/hw/aes/key.h @@ -33,5 +33,5 @@ void SetNormalKey(size_t slot_id, const AESKey& key); bool IsNormalKeyAvailable(size_t slot_id); AESKey GetNormalKey(size_t slot_id); -} // namspace AES +} // namespace AES } // namespace HW diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 8ba679ea7a..d65af4affb 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -439,16 +439,18 @@ inline void Write(u32 addr, const T data) { if (config.is_texture_copy) { TextureCopy(config); - LOG_TRACE(HW_GPU, "TextureCopy: 0x%X bytes from 0x%08X(%u+%u)-> " - "0x%08X(%u+%u), flags 0x%08X", + LOG_TRACE(HW_GPU, + "TextureCopy: 0x%X bytes from 0x%08X(%u+%u)-> " + "0x%08X(%u+%u), flags 0x%08X", 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: 0x%08x(%ux%u)-> " - "0x%08x(%ux%u), dst format %x, flags 0x%08X", + LOG_TRACE(HW_GPU, + "DisplayTransfer: 0x%08x(%ux%u)-> " + "0x%08x(%ux%u), dst format %x, flags 0x%08X", config.GetPhysicalInputAddress(), config.input_width.Value(), config.input_height.Value(), config.GetPhysicalOutputAddress(), config.output_width.Value(), config.output_height.Value(), diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index e3d0a0e086..04814d4807 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -331,4 +331,4 @@ void Init(); /// Shutdown hardware void Shutdown(); -} // namespace +} // namespace GPU diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 8499f2ce66..8c070a3f83 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -98,4 +98,4 @@ void Shutdown() { LCD::Shutdown(); LOG_DEBUG(HW, "shutdown OK"); } -} +} // namespace HW diff --git a/src/core/hw/hw.h b/src/core/hw/hw.h index a3c5d2ea34..5890d2b5c0 100644 --- a/src/core/hw/hw.h +++ b/src/core/hw/hw.h @@ -47,4 +47,4 @@ void Init(); /// Shutdown hardware void Shutdown(); -} // namespace +} // namespace HW diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp index 2aa89de18e..51f56237ef 100644 --- a/src/core/hw/lcd.cpp +++ b/src/core/hw/lcd.cpp @@ -73,4 +73,4 @@ void Shutdown() { LOG_DEBUG(HW_LCD, "shutdown OK"); } -} // namespace +} // namespace LCD diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h index 191fd44af7..d2db9700f4 100644 --- a/src/core/hw/lcd.h +++ b/src/core/hw/lcd.h @@ -83,4 +83,4 @@ void Init(); /// Shutdown hardware void Shutdown(); -} // namespace +} // namespace LCD diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp index e697f84b34..6cee123998 100644 --- a/src/core/hw/y2r.cpp +++ b/src/core/hw/y2r.cpp @@ -378,5 +378,5 @@ void PerformConversion(ConversionConfiguration& cvt) { cvt.output_format, (u8)cvt.alpha); } } -} -} +} // namespace Y2R +} // namespace HW diff --git a/src/core/hw/y2r.h b/src/core/hw/y2r.h index 25fcd781c2..061879dd49 100644 --- a/src/core/hw/y2r.h +++ b/src/core/hw/y2r.h @@ -8,10 +8,10 @@ namespace Service { namespace Y2R { struct ConversionConfiguration; } -} +} // namespace Service namespace HW { namespace Y2R { void PerformConversion(Service::Y2R::ConversionConfiguration& cvt); } -} +} // namespace HW diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index e36e421200..038b893f8b 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -322,8 +322,9 @@ SharedPtr ElfReader::LoadInto(u32 vaddr) { } if (codeset_segment->size != 0) { - LOG_ERROR(Loader, "ELF has more than one segment of the same type. Skipping extra " - "segment (id %i)", + LOG_ERROR(Loader, + "ELF has more than one segment of the same type. Skipping extra " + "segment (id %i)", i); continue; } diff --git a/src/core/loader/smdh.cpp b/src/core/loader/smdh.cpp index ccbeb79617..f53dab7705 100644 --- a/src/core/loader/smdh.cpp +++ b/src/core/loader/smdh.cpp @@ -48,4 +48,4 @@ std::array SMDH::GetShortTitle(Loader::SMDH::TitleLanguage language) return titles[static_cast(language)].short_title; } -} // namespace +} // namespace Loader diff --git a/src/core/loader/smdh.h b/src/core/loader/smdh.h index ac7726c8ff..8e0b658a0e 100644 --- a/src/core/loader/smdh.h +++ b/src/core/loader/smdh.h @@ -78,4 +78,4 @@ struct SMDH { }; static_assert(sizeof(SMDH) == 0x36C0, "SMDH structure size is wrong"); -} // namespace +} // namespace Loader diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h index c58baa50b6..92d2abfdbe 100644 --- a/src/core/memory_setup.h +++ b/src/core/memory_setup.h @@ -29,4 +29,4 @@ void MapMemoryRegion(PageTable& page_table, VAddr base, u32 size, u8* target); void MapIoRegion(PageTable& page_table, VAddr base, u32 size, MMIORegionPointer mmio_handler); void UnmapRegion(PageTable& page_table, VAddr base, u32 size); -} +} // namespace Memory diff --git a/src/core/mmio.h b/src/core/mmio.h index f45126da8e..5e3cc01af2 100644 --- a/src/core/mmio.h +++ b/src/core/mmio.h @@ -35,4 +35,4 @@ public: }; using MMIORegionPointer = std::shared_ptr; -}; +}; // namespace Memory diff --git a/src/core/movie.h b/src/core/movie.h index c406252a47..1f1ed6158c 100644 --- a/src/core/movie.h +++ b/src/core/movie.h @@ -12,12 +12,12 @@ struct AccelerometerDataEntry; struct GyroscopeDataEntry; struct PadState; struct TouchDataEntry; -} +} // namespace HID namespace IR { struct ExtraHIDResponse; union PadState; -} -} +} // namespace IR +} // namespace Service namespace Core { struct CTMHeader; @@ -27,9 +27,9 @@ enum class PlayMode; class Movie { public: /** - * Gets the instance of the Movie singleton class. - * @returns Reference to the instance of the Movie singleton class. - */ + * Gets the instance of the Movie singleton class. + * @returns Reference to the instance of the Movie singleton class. + */ static Movie& GetInstance() { return s_instance; } @@ -46,33 +46,33 @@ public: s16& circle_pad_y); /** - * When recording: Takes a copy of the given input states so they can be used for playback - * When playing: Replaces the given input states with the ones stored in the playback file - */ + * When recording: Takes a copy of the given input states so they can be used for playback + * When playing: Replaces the given input states with the ones stored in the playback file + */ void HandleTouchStatus(Service::HID::TouchDataEntry& touch_data); /** - * When recording: Takes a copy of the given input states so they can be used for playback - * When playing: Replaces the given input states with the ones stored in the playback file - */ + * When recording: Takes a copy of the given input states so they can be used for playback + * When playing: Replaces the given input states with the ones stored in the playback file + */ void HandleAccelerometerStatus(Service::HID::AccelerometerDataEntry& accelerometer_data); /** - * When recording: Takes a copy of the given input states so they can be used for playback - * When playing: Replaces the given input states with the ones stored in the playback file - */ + * When recording: Takes a copy of the given input states so they can be used for playback + * When playing: Replaces the given input states with the ones stored in the playback file + */ void HandleGyroscopeStatus(Service::HID::GyroscopeDataEntry& gyroscope_data); /** - * When recording: Takes a copy of the given input states so they can be used for playback - * When playing: Replaces the given input states with the ones stored in the playback file - */ + * When recording: Takes a copy of the given input states so they can be used for playback + * When playing: Replaces the given input states with the ones stored in the playback file + */ void HandleIrRst(Service::IR::PadState& pad_state, s16& c_stick_x, s16& c_stick_y); /** - * When recording: Takes a copy of the given input states so they can be used for playback - * When playing: Replaces the given input states with the ones stored in the playback file - */ + * When recording: Takes a copy of the given input states so they can be used for playback + * When playing: Replaces the given input states with the ones stored in the playback file + */ void HandleExtraHidResponse(Service::IR::ExtraHIDResponse& extra_hid_response); private: diff --git a/src/core/settings.h b/src/core/settings.h index 1b639cf460..15751720a7 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -54,9 +54,21 @@ constexpr int NUM_BUTTONS_IR = BUTTON_IR_END - BUTTON_IR_BEGIN; constexpr int NUM_BUTTONS_NS = BUTTON_NS_END - BUTTON_NS_BEGIN; static const std::array mapping = {{ - "button_a", "button_b", "button_x", "button_y", "button_up", "button_down", "button_left", - "button_right", "button_l", "button_r", "button_start", "button_select", "button_zl", - "button_zr", "button_home", + "button_a", + "button_b", + "button_x", + "button_y", + "button_up", + "button_down", + "button_left", + "button_right", + "button_l", + "button_r", + "button_start", + "button_select", + "button_zl", + "button_zr", + "button_home", }}; } // namespace NativeButton @@ -69,7 +81,8 @@ enum Values { }; static const std::array mapping = {{ - "circle_pad", "c_stick", + "circle_pad", + "c_stick", }}; } // namespace NativeAnalog diff --git a/src/core/tracer/citrace.h b/src/core/tracer/citrace.h index 215f863592..21fdc127a8 100644 --- a/src/core/tracer/citrace.h +++ b/src/core/tracer/citrace.h @@ -97,4 +97,4 @@ struct CTStreamElement { }; #pragma pack() -} +} // namespace CiTrace diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp index 55b3b5efcf..f3b0d6a8fa 100644 --- a/src/core/tracer/recorder.cpp +++ b/src/core/tracer/recorder.cpp @@ -205,4 +205,4 @@ template void Recorder::RegisterWritten(u32, u8); template void Recorder::RegisterWritten(u32, u16); template void Recorder::RegisterWritten(u32, u32); template void Recorder::RegisterWritten(u32, u64); -} +} // namespace CiTrace diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h index 39e6ec4fd6..629c2f6d23 100644 --- a/src/core/tracer/recorder.h +++ b/src/core/tracer/recorder.h @@ -63,9 +63,9 @@ private: CTStreamElement data; /** - * Extra data to store along "core" data. - * This is e.g. used for data used in MemoryUpdates. - */ + * Extra data to store along "core" data. + * This is e.g. used for data used in MemoryUpdates. + */ std::vector extra_data; /// Optional CRC hash (e.g. for hashing memory regions) @@ -84,4 +84,4 @@ private: std::unordered_map memory_regions; }; -} // namespace +} // namespace CiTrace diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 95d40f09fe..b12623d555 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -52,7 +52,8 @@ MotionEmu* GetMotionEmu() { std::string GenerateKeyboardParam(int key_code) { Common::ParamPackage param{ - {"engine", "keyboard"}, {"code", std::to_string(key_code)}, + {"engine", "keyboard"}, + {"code", std::to_string(key_code)}, }; return param.Serialize(); } diff --git a/src/tests/common/param_package.cpp b/src/tests/common/param_package.cpp index d5a2159f5c..57fb95df22 100644 --- a/src/tests/common/param_package.cpp +++ b/src/tests/common/param_package.cpp @@ -10,7 +10,9 @@ namespace Common { TEST_CASE("ParamPackage", "[common]") { ParamPackage original{ - {"abc", "xyz"}, {"def", "42"}, {"jkl", "$$:1:$2$,3"}, + {"abc", "xyz"}, + {"def", "42"}, + {"jkl", "$$:1:$2$,3"}, }; original.Set("ghi", 3.14f); ParamPackage copy(original.Serialize()); diff --git a/src/tests/core/hle/kernel/hle_ipc.cpp b/src/tests/core/hle/kernel/hle_ipc.cpp index 9e51666e8d..b9a79f174c 100644 --- a/src/tests/core/hle/kernel/hle_ipc.cpp +++ b/src/tests/core/hle/kernel/hle_ipc.cpp @@ -37,7 +37,10 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel SECTION("translates regular params") { const u32_le input[]{ - IPC::MakeHeader(0, 3, 0), 0x12345678, 0x21122112, 0xAABBCCDD, + IPC::MakeHeader(0, 3, 0), + 0x12345678, + 0x21122112, + 0xAABBCCDD, }; context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -52,7 +55,9 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel auto a = MakeObject(); Handle a_handle = handle_table.Create(a).Unwrap(); const u32_le input[]{ - IPC::MakeHeader(0, 0, 2), IPC::MoveHandleDesc(1), a_handle, + IPC::MakeHeader(0, 0, 2), + IPC::MoveHandleDesc(1), + a_handle, }; context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -66,7 +71,9 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel auto a = MakeObject(); Handle a_handle = handle_table.Create(a).Unwrap(); const u32_le input[]{ - IPC::MakeHeader(0, 0, 2), IPC::CopyHandleDesc(1), a_handle, + IPC::MakeHeader(0, 0, 2), + IPC::CopyHandleDesc(1), + a_handle, }; context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -96,7 +103,9 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel SECTION("translates null handles") { const u32_le input[]{ - IPC::MakeHeader(0, 0, 2), IPC::MoveHandleDesc(1), 0, + IPC::MakeHeader(0, 0, 2), + IPC::MoveHandleDesc(1), + 0, }; auto result = context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -108,7 +117,9 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel SECTION("translates CallingPid descriptors") { const u32_le input[]{ - IPC::MakeHeader(0, 0, 2), IPC::CallingPidDesc(), 0x98989898, + IPC::MakeHeader(0, 0, 2), + IPC::CallingPidDesc(), + 0x98989898, }; context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -126,7 +137,9 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel REQUIRE(result.Code() == RESULT_SUCCESS); const u32_le input[]{ - IPC::MakeHeader(0, 0, 2), IPC::StaticBufferDesc(buffer->size(), 0), target_address, + IPC::MakeHeader(0, 0, 2), + IPC::StaticBufferDesc(buffer->size(), 0), + target_address, }; context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -145,7 +158,9 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel MemoryState::Private); const u32_le input[]{ - IPC::MakeHeader(0, 0, 2), IPC::MappedBufferDesc(buffer->size(), IPC::R), target_address, + IPC::MakeHeader(0, 0, 2), + IPC::MappedBufferDesc(buffer->size(), IPC::R), + target_address, }; context.PopulateFromIncomingCommandBuffer(input, *process, handle_table); @@ -325,7 +340,8 @@ TEST_CASE("HLERequestContext::WriteToOutgoingCommandBuffer", "[core][kernel]") { REQUIRE(result.Code() == RESULT_SUCCESS); const u32_le input_cmdbuff[]{ - IPC::MakeHeader(0, 0, 2), IPC::MappedBufferDesc(output_buffer->size(), IPC::W), + IPC::MakeHeader(0, 0, 2), + IPC::MappedBufferDesc(output_buffer->size(), IPC::W), target_address, }; diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 3ccd1297e1..022d8dee3b 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -311,8 +311,9 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { u8* texture_data = Memory::GetPhysicalPointer(texture.config.GetPhysicalAddress()); g_debug_context->recorder->MemoryAccessed( - texture_data, Pica::TexturingRegs::NibblesPerPixel(texture.format) * - texture.config.width / 2 * texture.config.height, + texture_data, + Pica::TexturingRegs::NibblesPerPixel(texture.format) * texture.config.width / + 2 * texture.config.height, texture.config.GetPhysicalAddress()); } } diff --git a/src/video_core/command_processor.h b/src/video_core/command_processor.h index 62ad2d3f30..c8f639e535 100644 --- a/src/video_core/command_processor.h +++ b/src/video_core/command_processor.h @@ -36,6 +36,6 @@ static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect void ProcessCommandList(const u32* list, u32 size); -} // namespace +} // namespace CommandProcessor -} // namespace +} // namespace Pica diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 118575a94d..ecdbbccf94 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -459,6 +459,6 @@ void DumpTevStageConfig(const std::array& stag LOG_TRACE(HW_GPU, "%s", stage_info.c_str()); } -} // namespace +} // namespace DebugUtils -} // namespace +} // namespace Pica diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index c865a9e80d..def3b1af85 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h @@ -243,6 +243,6 @@ public: std::map ranges; }; -} // namespace +} // namespace DebugUtils -} // namespace +} // namespace Pica diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h index d3a0b57278..ce7aa83ea1 100644 --- a/src/video_core/gpu_debugger.h +++ b/src/video_core/gpu_debugger.h @@ -22,11 +22,11 @@ public: } /** - * Called when a GX command has been processed and is ready for being - * read via GraphicsDebugger::ReadGXCommandHistory. - * @param total_command_count Total number of commands in the GX history - * @note All methods in this class are called from the GSP thread - */ + * Called when a GX command has been processed and is ready for being + * read via GraphicsDebugger::ReadGXCommandHistory. + * @param total_command_count Total number of commands in the GX history + * @note All methods in this class are called from the GSP thread + */ virtual void GXCommandProcessed(int total_command_count) { const Service::GSP::Command& cmd = observed->ReadGXCommandHistory(total_command_count - 1); diff --git a/src/video_core/pica.cpp b/src/video_core/pica.cpp index 218e06883d..df761a896a 100644 --- a/src/video_core/pica.cpp +++ b/src/video_core/pica.cpp @@ -51,4 +51,4 @@ void State::Reset() { Zero(immediate); primitive_assembler.Reconfigure(PipelineRegs::TriangleTopology::List); } -} +} // namespace Pica diff --git a/src/video_core/pica.h b/src/video_core/pica.h index dc8aa66707..6d6ff0f631 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -13,4 +13,4 @@ void Init(); /// Shutdown Pica state void Shutdown(); -} // namespace +} // namespace Pica diff --git a/src/video_core/pica_state.h b/src/video_core/pica_state.h index c6634a0bc3..27f7c2657a 100644 --- a/src/video_core/pica_state.h +++ b/src/video_core/pica_state.h @@ -156,4 +156,4 @@ struct State { extern State g_state; ///< Current Pica state -} // namespace +} // namespace Pica diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp index 9c3dd4cabd..52fc843639 100644 --- a/src/video_core/primitive_assembly.cpp +++ b/src/video_core/primitive_assembly.cpp @@ -74,4 +74,4 @@ void PrimitiveAssembler::Reconfigure(PipelineRegs::TriangleTopology // explicitly instantiate use cases template struct PrimitiveAssembler; -} // namespace +} // namespace Pica diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h index 12de8e3b96..0d62192925 100644 --- a/src/video_core/primitive_assembly.h +++ b/src/video_core/primitive_assembly.h @@ -54,4 +54,4 @@ private: bool winding = false; }; -} // namespace +} // namespace Pica diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 1d4c981898..35a6594ad0 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h @@ -13,7 +13,7 @@ namespace Pica { namespace Shader { struct OutputVertex; } -} +} // namespace Pica namespace VideoCore { @@ -67,4 +67,4 @@ public: return false; } }; -} +} // namespace VideoCore diff --git a/src/video_core/regs.h b/src/video_core/regs.h index 6d5f98cac3..9b0792752a 100644 --- a/src/video_core/regs.h +++ b/src/video_core/regs.h @@ -41,7 +41,7 @@ namespace Pica { // field offset. Otherwise, the compiler will fail to compile this code. #define PICA_REG_INDEX_WORKAROUND(field_name, backup_workaround_index) \ ((typename std::enable_if::type)PICA_REG_INDEX(field_name)) + size_t>::type) PICA_REG_INDEX(field_name)) #endif // _MSC_VER struct Regs { diff --git a/src/video_core/regs_lighting.h b/src/video_core/regs_lighting.h index b89709cfe6..69d1b2b058 100644 --- a/src/video_core/regs_lighting.h +++ b/src/video_core/regs_lighting.h @@ -39,13 +39,13 @@ struct LightingRegs { } /** - * Pica fragment lighting supports using different LUTs for each lighting component: Reflectance - * R, G, and B channels, distribution function for specular components 0 and 1, fresnel factor, - * and spotlight attenuation. Furthermore, which LUTs are used for each channel (or whether a - * channel is enabled at all) is specified by various pre-defined lighting configurations. With - * configurations that require more LUTs, more cycles are required on HW to perform lighting - * computations. - */ + * Pica fragment lighting supports using different LUTs for each lighting component: Reflectance + * R, G, and B channels, distribution function for specular components 0 and 1, fresnel factor, + * and spotlight attenuation. Furthermore, which LUTs are used for each channel (or whether a + * channel is enabled at all) is specified by various pre-defined lighting configurations. With + * configurations that require more LUTs, more cycles are required on HW to perform lighting + * computations. + */ enum class LightingConfig : u32 { Config0 = 0, ///< Reflect Red, Distribution 0, Spotlight Config1 = 1, ///< Reflect Red, Fresnel, Spotlight diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 8d2d1698ac..f028ea0019 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1065,9 +1065,8 @@ bool RasterizerOpenGL::AccelerateTextureCopy(const GPU::Regs::DisplayTransferCon } if (output_gap != 0 && - (output_width != - src_surface->BytesInPixels(src_rect.GetWidth() / src_surface->res_scale) * - (src_surface->is_tiled ? 8 : 1) || + (output_width != src_surface->BytesInPixels(src_rect.GetWidth() / src_surface->res_scale) * + (src_surface->is_tiled ? 8 : 1) || output_gap % src_surface->BytesInPixels(src_surface->is_tiled ? 64 : 1) != 0)) { return false; } @@ -1075,9 +1074,8 @@ bool RasterizerOpenGL::AccelerateTextureCopy(const GPU::Regs::DisplayTransferCon SurfaceParams dst_params = *src_surface; dst_params.addr = config.GetPhysicalOutputAddress(); dst_params.width = src_rect.GetWidth() / src_surface->res_scale; - dst_params.stride = - dst_params.width + - src_surface->PixelsInBytes(src_surface->is_tiled ? output_gap / 8 : output_gap); + dst_params.stride = dst_params.width + src_surface->PixelsInBytes( + src_surface->is_tiled ? output_gap / 8 : output_gap); dst_params.height = src_rect.GetHeight() / src_surface->res_scale; dst_params.res_scale = src_surface->res_scale; dst_params.UpdateParams(); @@ -1396,7 +1394,8 @@ void RasterizerOpenGL::SyncBlendColor() { void RasterizerOpenGL::SyncFogColor() { const auto& regs = Pica::g_state.regs; uniform_block_data.data.fog_color = { - regs.texturing.fog_color.r.Value() / 255.0f, regs.texturing.fog_color.g.Value() / 255.0f, + regs.texturing.fog_color.r.Value() / 255.0f, + regs.texturing.fog_color.g.Value() / 255.0f, regs.texturing.fog_color.b.Value() / 255.0f, }; uniform_block_data.dirty = true; @@ -1424,7 +1423,8 @@ void RasterizerOpenGL::SyncProcTexNoise() { Pica::float16::FromRaw(regs.proctex_noise_frequency.v).ToFloat32(), }; uniform_block_data.data.proctex_noise_a = { - regs.proctex_noise_u.amplitude / 4095.0f, regs.proctex_noise_v.amplitude / 4095.0f, + regs.proctex_noise_u.amplitude / 4095.0f, + regs.proctex_noise_v.amplitude / 4095.0f, }; uniform_block_data.data.proctex_noise_p = { Pica::float16::FromRaw(regs.proctex_noise_u.phase).ToFloat32(), diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index 7e01fe0b0f..a9f7ecbfe7 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -662,7 +662,6 @@ static void WriteLighting(std::string& out, const PicaShaderConfig& config) { // LUT index is in the range of (-1.0, 1.0) return "LookupLightingLUTSigned(" + sampler_string + ", " + index + ")"; } - }; // Write the code to emulate each enabled light diff --git a/src/video_core/renderer_opengl/gl_shader_util.h b/src/video_core/renderer_opengl/gl_shader_util.h index c66e8acd33..a4bcffdfa3 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.h +++ b/src/video_core/renderer_opengl/gl_shader_util.h @@ -16,4 +16,4 @@ namespace GLShader { */ GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader); -} // namespace +} // namespace GLShader diff --git a/src/video_core/renderer_opengl/pica_to_gl.h b/src/video_core/renderer_opengl/pica_to_gl.h index 640c6ea51b..7733f05f23 100644 --- a/src/video_core/renderer_opengl/pica_to_gl.h +++ b/src/video_core/renderer_opengl/pica_to_gl.h @@ -221,15 +221,19 @@ inline GLenum StencilOp(Pica::FramebufferRegs::StencilAction action) { inline GLvec4 ColorRGBA8(const u32 color) { return {{ - (color >> 0 & 0xFF) / 255.0f, (color >> 8 & 0xFF) / 255.0f, (color >> 16 & 0xFF) / 255.0f, + (color >> 0 & 0xFF) / 255.0f, + (color >> 8 & 0xFF) / 255.0f, + (color >> 16 & 0xFF) / 255.0f, (color >> 24 & 0xFF) / 255.0f, }}; } inline std::array LightColor(const Pica::LightingRegs::LightColor& color) { return {{ - color.r / 255.0f, color.g / 255.0f, color.b / 255.0f, + color.r / 255.0f, + color.g / 255.0f, + color.b / 255.0f, }}; } -} // namespace +} // namespace PicaToGL diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 194c9df119..443923eae1 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -66,8 +66,9 @@ OutputVertex OutputVertex::FromAttributeBuffer(const RasterizerRegs& regs, ret.color[i] = float24::FromFloat32(c < 1.0f ? c : 1.0f); } - LOG_TRACE(HW_GPU, "Output vertex: pos(%.2f, %.2f, %.2f, %.2f), quat(%.2f, %.2f, %.2f, %.2f), " - "col(%.2f, %.2f, %.2f, %.2f), tc0(%.2f, %.2f), view(%.2f, %.2f, %.2f)", + LOG_TRACE(HW_GPU, + "Output vertex: pos(%.2f, %.2f, %.2f, %.2f), quat(%.2f, %.2f, %.2f, %.2f), " + "col(%.2f, %.2f, %.2f, %.2f), tc0(%.2f, %.2f), view(%.2f, %.2f, %.2f)", 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(), diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h index 21ac010649..dc50727139 100644 --- a/src/video_core/shader/shader.h +++ b/src/video_core/shader/shader.h @@ -17,9 +17,9 @@ #include "video_core/regs_rasterizer.h" #include "video_core/regs_shader.h" +using nihstro::DestRegister; using nihstro::RegisterType; using nihstro::SourceRegister; -using nihstro::DestRegister; namespace Pica { diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index 9d4da4904a..033a0f3321 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -19,8 +19,8 @@ #include "video_core/shader/shader.h" #include "video_core/shader/shader_interpreter.h" -using nihstro::OpCode; using nihstro::Instruction; +using nihstro::OpCode; using nihstro::RegisterType; using nihstro::SourceRegister; using nihstro::SwizzlePattern; @@ -696,6 +696,6 @@ DebugData InterpreterEngine::ProduceDebugInfo(const ShaderSetup& setup, return debug_data; } -} // namespace +} // namespace Shader -} // namespace +} // namespace Pica diff --git a/src/video_core/shader/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h index 50fd7c69de..c2a7121ce0 100644 --- a/src/video_core/shader/shader_interpreter.h +++ b/src/video_core/shader/shader_interpreter.h @@ -27,6 +27,6 @@ public: const ShaderRegs& config) const; }; -} // namespace +} // namespace Shader -} // namespace +} // namespace Pica diff --git a/src/video_core/shader/shader_jit_x64_compiler.cpp b/src/video_core/shader/shader_jit_x64_compiler.cpp index fff9abbf76..f497990f13 100644 --- a/src/video_core/shader/shader_jit_x64_compiler.cpp +++ b/src/video_core/shader/shader_jit_x64_compiler.cpp @@ -139,13 +139,20 @@ static const Xmm NEGBIT = xmm15; // Scratch registers, e.g., SRC1 and SCRATCH, have to be saved on the side if needed static const BitSet32 persistent_regs = BuildRegSet({ // Pointers to register blocks - SETUP, STATE, + SETUP, + STATE, // Cached registers - ADDROFFS_REG_0, ADDROFFS_REG_1, LOOPCOUNT_REG, COND0, COND1, + ADDROFFS_REG_0, + ADDROFFS_REG_1, + LOOPCOUNT_REG, + COND0, + COND1, // Constants - ONE, NEGBIT, + ONE, + NEGBIT, // Loop variables - LOOPCOUNT, LOOPINC, + LOOPCOUNT, + LOOPINC, }); /// Raw constant for the source register selector that indicates no swizzling is performed diff --git a/src/video_core/shader/shader_jit_x64_compiler.h b/src/video_core/shader/shader_jit_x64_compiler.h index 4e4123374e..93e65fe264 100644 --- a/src/video_core/shader/shader_jit_x64_compiler.h +++ b/src/video_core/shader/shader_jit_x64_compiler.h @@ -132,6 +132,6 @@ private: Xbyak::Label exp2_subroutine; }; -} // Shader +} // namespace Shader -} // Pica +} // namespace Pica diff --git a/src/video_core/swrasterizer/rasterizer.cpp b/src/video_core/swrasterizer/rasterizer.cpp index 424fd45ada..b34261e4f6 100644 --- a/src/video_core/swrasterizer/rasterizer.cpp +++ b/src/video_core/swrasterizer/rasterizer.cpp @@ -197,9 +197,9 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve } else { // check if vertex is on our left => right side // TODO: Not sure how likely this is to overflow - return (int)vtx.x < (int)line1.x + - ((int)line2.x - (int)line1.x) * ((int)vtx.y - (int)line1.y) / - ((int)line2.y - (int)line1.y); + return (int)vtx.x < (int)line1.x + ((int)line2.x - (int)line1.x) * + ((int)vtx.y - (int)line1.y) / + ((int)line2.y - (int)line1.y); } }; int bias0 = @@ -423,12 +423,14 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve Math::Vec4 secondary_fragment_color = {0, 0, 0, 0}; if (!g_state.regs.lighting.disable) { - Math::Quaternion normquat = Math::Quaternion{ - {GetInterpolatedAttribute(v0.quat.x, v1.quat.x, v2.quat.x).ToFloat32(), - GetInterpolatedAttribute(v0.quat.y, v1.quat.y, v2.quat.y).ToFloat32(), - GetInterpolatedAttribute(v0.quat.z, v1.quat.z, v2.quat.z).ToFloat32()}, - GetInterpolatedAttribute(v0.quat.w, v1.quat.w, v2.quat.w).ToFloat32(), - }.Normalized(); + Math::Quaternion normquat = + Math::Quaternion{ + {GetInterpolatedAttribute(v0.quat.x, v1.quat.x, v2.quat.x).ToFloat32(), + GetInterpolatedAttribute(v0.quat.y, v1.quat.y, v2.quat.y).ToFloat32(), + GetInterpolatedAttribute(v0.quat.z, v1.quat.z, v2.quat.z).ToFloat32()}, + GetInterpolatedAttribute(v0.quat.w, v1.quat.w, v2.quat.w).ToFloat32(), + } + .Normalized(); Math::Vec3 view{ GetInterpolatedAttribute(v0.view.x, v1.view.x, v2.view.x).ToFloat32(), @@ -620,8 +622,9 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve u8 new_stencil = PerformStencilAction(action, old_stencil, stencil_test.reference_value); if (g_state.regs.framebuffer.framebuffer.allow_depth_stencil_write != 0) - SetStencil(x >> 4, y >> 4, (new_stencil & stencil_test.write_mask) | - (old_stencil & ~stencil_test.write_mask)); + SetStencil(x >> 4, y >> 4, + (new_stencil & stencil_test.write_mask) | + (old_stencil & ~stencil_test.write_mask)); }; if (stencil_action_enable) { diff --git a/src/video_core/texture/etc1.cpp b/src/video_core/texture/etc1.cpp index 43f7f56dba..485ed3934a 100644 --- a/src/video_core/texture/etc1.cpp +++ b/src/video_core/texture/etc1.cpp @@ -16,7 +16,14 @@ namespace Texture { namespace { constexpr std::array, 8> etc1_modifier_table = {{ - {2, 8}, {5, 17}, {9, 29}, {13, 42}, {18, 60}, {24, 80}, {33, 106}, {47, 183}, + {2, 8}, + {5, 17}, + {9, 29}, + {13, 42}, + {18, 60}, + {24, 80}, + {33, 106}, + {47, 183}, }}; union ETC1Tile { diff --git a/src/video_core/utils.h b/src/video_core/utils.h index aa4e1bd38c..5ad06ef398 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h @@ -49,4 +49,4 @@ static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) { return (i + offset) * bytes_per_pixel; } -} // namespace +} // namespace VideoCore diff --git a/src/video_core/vertex_loader.cpp b/src/video_core/vertex_loader.cpp index 37c5224a91..3eb6e66780 100644 --- a/src/video_core/vertex_loader.cpp +++ b/src/video_core/vertex_loader.cpp @@ -136,8 +136,9 @@ void VertexLoader::LoadVertex(u32 base_address, int index, int vertex, comp == 3 ? float24::FromFloat32(1.0f) : float24::FromFloat32(0.0f); } - LOG_TRACE(HW_GPU, "Loaded %d components of attribute %x for vertex %x (index %x) from " - "0x%08x + 0x%08x + 0x%04x: %f %f %f %f", + LOG_TRACE(HW_GPU, + "Loaded %d components of attribute %x for vertex %x (index %x) from " + "0x%08x + 0x%08x + 0x%04x: %f %f %f %f", 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(),