Rename almost all classes.

CMakeLists: Derive the source directory grouping from targets themselves

.travis.yml

@@ -32,7 +32,7 @@ matrix:
 deploy:
   provider: releases
   api_key:
-    secure: IuTT8DjxzNgOtaEsyOpz1JaSmtDtHSsWZnJKmSBwXAzgP2ZU4Ja3/q0z5PwbC5Ql7kuFahuYTE5oi7lbJBuu2P3y1Wj2zvFozGUkA3JUvEXDNOPS9QTJ1EYd6O+wenZoj7d/Pn+ZeIgyEafnnZsGBb8lMQnV9MfIHgYlZQ5EyF3n4XikT2h1UbDBYx74ciXZIxFEulx68kDr9Q4/U+zIYQmYv2N+lgXSLDkFrCJ046gRcujPYGPqE6jVw0kKni80CTTpuDF5prU8yIBeiffjkJ3Qx1a17G07eZ4r83P4XUOlaHbRBmA/8ywZvLF2Gep3wGKfSFgMWbPxBJk5ZSYcOOAgMsEcg0+gBK9gLTwO4pbmc2GvqP21yRQBzgtbFoEtAHLu5lVPBkZU7kZuRMJtRdqvFIwOLhpnRS8IknFOD5vjtaFiNdGWaK9ePdsGvplijnXcPafkumakc4+eVEiXb6/KzdX1zXdur5tuUPFytm0Oy6IJcGIf8FHXGvUlmWsnPzwfusij9JgeQOP+uegc9PdBfL+h7L5rk+ilELt3cXD5K7wgov/4hkl5istNJ2bm0IioIstWss8QQQTkyscGoeh/oXmUpOL4FdsTvsWhDR3QKeq8nSzgDkqLe0iSbplQGnC7o7ytNbldmxJvf3nylwglA8w3HlqLHtZLkUOcuQ0=
+    secure: ElsIAlbvVXBNKsP31nVPysh+mf0GQA4DiL/y5iJeQxKQYR6iRoNo+RfzOBmdswdo0bE/PGeBAlfzCkp15gjhWf6Je0N6dRpczmcmLq6SSQFn1Mpq00xMJB2AgQIlaHs6KFgoUA173EBKbPwgU/NubTFpJFm/Wa+NcSWAHQXKL9KT2M3qKpxNkPl3mKEVsbch4REP+T/46vsa+ikw0VE0kIs6V93LqUQZpI2F0Dhihx8Cxr5iedkE1QsNK+QSX9iItMHbfek9OH980gP7L3lkZltyAA1Pk0c37OAgz2PwczwNKwCT8jg9PMzdcKmWouvLyAkZFuA806ElzwHY3oEd91Zm6+Bk5n24yBKZ9027AZzw38NK2Z2m9Akb8+ar8PdsKU6N5pDutX9qSLayr0oMgJ0s7/xnGBGdL3gfkPCFc50xO/2DxlsOR+zAhPNM9Y76hhGy6A7/40+9uzrJvd4nAuDvIXRzi2Yl2L7mKBE4suMKbFLtk2LlgM0qY5JMVTQ8NliaEtqopfPur2KWFVJUpWDNLtNX8xGqhfwg7cLjIiGmnxSaJBTDuZI6dpEjkWkU0n1xYhGqEqit8DbehYzazozMJ+Vsr8hku7jGlUtlw+U6HG1e19O2y4aGeSwYPROcCNz+BLwmVM8oZE3Roy3qoaa2yiFf+sy6rUHznrhsfEM=
   file_glob: true
   file: "artifacts/*"
   skip_cleanup: true

CMakeLists.txt

@@ -323,12 +323,14 @@ endif()
 # This function should be passed a list of all files in a target. It will automatically generate
 # file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
 # one in the filesystem.
-function(create_directory_groups)
+function(create_target_directory_groups target_name)
     # Place any files that aren't in the source list in a separate group so that they don't get in
     # the way.
     source_group("Other Files" REGULAR_EXPRESSION ".")
 
-    foreach(file_name ${ARGV})
+    get_target_property(target_sources "${target_name}" SOURCES)
+
+    foreach(file_name IN LISTS target_sources)
         get_filename_component(dir_name "${file_name}" PATH)
         # Group names use '\' as a separator even though the entire rest of CMake uses '/'...
         string(REPLACE "/" "\\" group_name "${dir_name}")

appveyor.yml

@@ -163,7 +163,7 @@ deploy:
   provider: GitHub
   release: $(appveyor_repo_tag_name)
   auth_token:
-    secure: "argb6oi2TYLB4wDy+HoCC8PuGAmsnocSk12CQ5614XAPO+NVPndlkLv1utnDFfg2"
+    secure: QqePPnXbkzmXct5c8hZ2X5AbsthbI6cS1Sr+VBzcD8oUOIjfWJJKXVAQGUbQAbb0
   artifact: update,build
   draft: false
   prerelease: false

externals/getopt/CMakeLists.txt

@@ -1,11 +1,9 @@
-set(SRCS
-            getopt.c
-            )
-set(HEADERS
-            getopt.h
-            )
+add_library(getopt
+    getopt.c
+    getopt.h
+)
+
+create_target_directory_groups(getopt)
 
-create_directory_groups(${SRCS} ${HEADERS})
-add_library(getopt ${SRCS} ${HEADERS})
 target_compile_definitions(getopt PUBLIC STATIC_GETOPT)
 target_include_directories(getopt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

externals/glad/CMakeLists.txt

@@ -1,13 +1,10 @@
-set(SRCS
-            src/glad.c
-            )
-set(HEADERS
-            include/KHR/khrplatform.h
-            include/glad/glad.h
-            )
+add_library(glad STATIC
+    src/glad.c
+    include/KHR/khrplatform.h
+    include/glad/glad.h
+)
 
-create_directory_groups(${SRCS} ${HEADERS})
-add_library(glad STATIC ${SRCS} ${HEADERS})
+create_target_directory_groups(glad)
 target_include_directories(glad PUBLIC "include/")
 
 if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")

externals/inih/CMakeLists.txt

@@ -1,12 +1,9 @@
-set(SRCS
-            inih/ini.c
-            inih/cpp/INIReader.cpp
-            )
-set(HEADERS
-            inih/ini.h
-            inih/cpp/INIReader.h
-            )
+add_library(inih
+    inih/ini.c
+    inih/ini.h
+    inih/cpp/INIReader.cpp
+    inih/cpp/INIReader.h
+)
 
-create_directory_groups(${SRCS} ${HEADERS})
-add_library(inih ${SRCS} ${HEADERS})
+create_target_directory_groups(inih)
 target_include_directories(inih INTERFACE .)

src/common/CMakeLists.txt

@@ -24,78 +24,72 @@ if ($ENV{CI})
 endif()
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY)
 
-set(SRCS
-            break_points.cpp
-            file_util.cpp
-            hash.cpp
-            logging/filter.cpp
-            logging/text_formatter.cpp
-            logging/backend.cpp
-            memory_util.cpp
-            microprofile.cpp
-            misc.cpp
-            param_package.cpp
-            scm_rev.cpp
-            string_util.cpp
-            telemetry.cpp
-            thread.cpp
-            timer.cpp
-            )
-
-set(HEADERS
-            alignment.h
-            assert.h
-            bit_field.h
-            bit_set.h
-            break_points.h
-            chunk_file.h
-            code_block.h
-            color.h
-            common_funcs.h
-            common_paths.h
-            common_types.h
-            file_util.h
-            hash.h
-            linear_disk_cache.h
-            logging/text_formatter.h
-            logging/filter.h
-            logging/log.h
-            logging/backend.h
-            math_util.h
-            memory_util.h
-            microprofile.h
-            microprofileui.h
-            param_package.h
-            platform.h
-            quaternion.h
-            scm_rev.h
-            scope_exit.h
-            string_util.h
-            swap.h
-            synchronized_wrapper.h
-            telemetry.h
-            thread.h
-            thread_queue_list.h
-            threadsafe_queue.h
-            timer.h
-            vector_math.h
-            )
+add_library(common STATIC
+    alignment.h
+    assert.h
+    bit_field.h
+    bit_set.h
+    break_points.cpp
+    break_points.h
+    chunk_file.h
+    code_block.h
+    color.h
+    common_funcs.h
+    common_paths.h
+    common_types.h
+    file_util.cpp
+    file_util.h
+    hash.cpp
+    hash.h
+    linear_disk_cache.h
+    logging/backend.cpp
+    logging/backend.h
+    logging/filter.cpp
+    logging/filter.h
+    logging/log.h
+    logging/text_formatter.cpp
+    logging/text_formatter.h
+    math_util.h
+    memory_util.cpp
+    memory_util.h
+    microprofile.cpp
+    microprofile.h
+    microprofileui.h
+    misc.cpp
+    param_package.cpp
+    param_package.h
+    platform.h
+    quaternion.h
+    scm_rev.cpp
+    scm_rev.h
+    scope_exit.h
+    string_util.cpp
+    string_util.h
+    swap.h
+    synchronized_wrapper.h
+    telemetry.cpp
+    telemetry.h
+    thread.cpp
+    thread.h
+    thread_queue_list.h
+    threadsafe_queue.h
+    timer.cpp
+    timer.h
+    vector_math.h
+)
 
 if(ARCHITECTURE_x86_64)
-    set(SRCS ${SRCS}
+    target_sources(common
+        PRIVATE
             x64/cpu_detect.cpp
-            )
-
-    set(HEADERS ${HEADERS}
             x64/cpu_detect.h
             x64/xbyak_abi.h
             x64/xbyak_util.h
-            )
+    )
 endif()
 
-create_directory_groups(${SRCS} ${HEADERS})
+create_target_directory_groups(common)
 
-add_library(common STATIC ${SRCS} ${HEADERS})
 target_link_libraries(common PUBLIC Boost::boost microprofile)
 if (ARCHITECTURE_x86_64)
     target_link_libraries(common PRIVATE xbyak)

src/core/CMakeLists.txt

@@ -1,174 +1,171 @@
-set(SRCS
-            arm/dynarmic/arm_dynarmic.cpp
-            arm/unicorn/arm_unicorn.cpp
-            core.cpp
-            core_timing.cpp
-            file_sys/archive_backend.cpp
-            file_sys/disk_archive.cpp
-            file_sys/ivfc_archive.cpp
-            file_sys/path_parser.cpp
-            file_sys/savedata_archive.cpp
-            file_sys/title_metadata.cpp
-            frontend/emu_window.cpp
-            frontend/framebuffer_layout.cpp
-            gdbstub/gdbstub.cpp
-            hle/config_mem.cpp
-            hle/kernel/address_arbiter.cpp
-            hle/kernel/client_port.cpp
-            hle/kernel/client_session.cpp
-            hle/kernel/condition_variable.cpp
-            hle/kernel/domain.cpp
-            hle/kernel/event.cpp
-            hle/kernel/handle_table.cpp
-            hle/kernel/hle_ipc.cpp
-            hle/kernel/kernel.cpp
-            hle/kernel/memory.cpp
-            hle/kernel/mutex.cpp
-            hle/kernel/object_address_table.cpp
-            hle/kernel/process.cpp
-            hle/kernel/resource_limit.cpp
-            hle/kernel/server_port.cpp
-            hle/kernel/server_session.cpp
-            hle/kernel/shared_memory.cpp
-            hle/kernel/svc.cpp
-            hle/kernel/thread.cpp
-            hle/kernel/timer.cpp
-            hle/kernel/vm_manager.cpp
-            hle/kernel/wait_object.cpp
-            hle/lock.cpp
-            hle/romfs.cpp
-            hle/service/acc/acc.cpp
-            hle/service/acc/acc_u0.cpp
-            hle/service/am/am.cpp
-            hle/service/am/applet_oe.cpp
-            hle/service/aoc/aoc_u.cpp
-            hle/service/apm/apm.cpp
-            hle/service/audio/audio.cpp
-            hle/service/audio/audout_u.cpp
-            hle/service/hid/hid.cpp
-            hle/service/lm/lm.cpp
-            hle/service/nvdrv/devices/nvdisp_disp0.cpp
-            hle/service/nvdrv/devices/nvhost_as_gpu.cpp
-            hle/service/nvdrv/devices/nvmap.cpp
-            hle/service/nvdrv/interface.cpp
-            hle/service/nvdrv/nvdrv.cpp
-            hle/service/pctl/pctl.cpp
-            hle/service/pctl/pctl_a.cpp
-            hle/service/service.cpp
-            hle/service/sm/controller.cpp
-            hle/service/sm/sm.cpp
-            hle/service/time/time.cpp
-            hle/service/vi/vi.cpp
-            hle/service/vi/vi_m.cpp
-            hle/shared_page.cpp
-            hw/hw.cpp
-            hw/lcd.cpp
-            loader/elf.cpp
-            loader/linker.cpp
-            loader/loader.cpp
-            loader/nro.cpp
-            loader/nso.cpp
-            tracer/recorder.cpp
-            memory.cpp
-            perf_stats.cpp
-            settings.cpp
-            telemetry_session.cpp
-            )
+add_library(core STATIC
+    arm/arm_interface.h
+    arm/dynarmic/arm_dynarmic.cpp
+    arm/dynarmic/arm_dynarmic.h
+    arm/unicorn/arm_unicorn.cpp
+    arm/unicorn/arm_unicorn.h
+    core.cpp
+    core.h
+    core_timing.cpp
+    core_timing.h
+    file_sys/archive_backend.cpp
+    file_sys/archive_backend.h
+    file_sys/directory_backend.h
+    file_sys/disk_archive.cpp
+    file_sys/disk_archive.h
+    file_sys/errors.h
+    file_sys/file_backend.h
+    file_sys/ivfc_archive.cpp
+    file_sys/ivfc_archive.h
+    file_sys/path_parser.cpp
+    file_sys/path_parser.h
+    file_sys/savedata_archive.cpp
+    file_sys/savedata_archive.h
+    file_sys/title_metadata.cpp
+    file_sys/title_metadata.h
+    frontend/emu_window.cpp
+    frontend/emu_window.h
+    frontend/framebuffer_layout.cpp
+    frontend/framebuffer_layout.h
+    frontend/input.h
+    gdbstub/gdbstub.cpp
+    gdbstub/gdbstub.h
+    hle/config_mem.cpp
+    hle/config_mem.h
+    hle/ipc.h
+    hle/ipc_helpers.h
+    hle/kernel/address_arbiter.cpp
+    hle/kernel/address_arbiter.h
+    hle/kernel/client_port.cpp
+    hle/kernel/client_port.h
+    hle/kernel/client_session.cpp
+    hle/kernel/client_session.h
+    hle/kernel/condition_variable.cpp
+    hle/kernel/condition_variable.h
+    hle/kernel/domain.cpp
+    hle/kernel/domain.h
+    hle/kernel/errors.h
+    hle/kernel/event.cpp
+    hle/kernel/event.h
+    hle/kernel/handle_table.cpp
+    hle/kernel/handle_table.h
+    hle/kernel/hle_ipc.cpp
+    hle/kernel/hle_ipc.h
+    hle/kernel/kernel.cpp
+    hle/kernel/kernel.h
+    hle/kernel/memory.cpp
+    hle/kernel/memory.h
+    hle/kernel/mutex.cpp
+    hle/kernel/mutex.h
+    hle/kernel/object_address_table.cpp
+    hle/kernel/object_address_table.h
+    hle/kernel/process.cpp
+    hle/kernel/process.h
+    hle/kernel/resource_limit.cpp
+    hle/kernel/resource_limit.h
+    hle/kernel/server_port.cpp
+    hle/kernel/server_port.h
+    hle/kernel/server_session.cpp
+    hle/kernel/server_session.h
+    hle/kernel/session.h
+    hle/kernel/shared_memory.cpp
+    hle/kernel/shared_memory.h
+    hle/kernel/svc.cpp
+    hle/kernel/svc.h
+    hle/kernel/svc_wrap.h
+    hle/kernel/sync_object.h
+    hle/kernel/thread.cpp
+    hle/kernel/thread.h
+    hle/kernel/timer.cpp
+    hle/kernel/timer.h
+    hle/kernel/vm_manager.cpp
+    hle/kernel/vm_manager.h
+    hle/kernel/wait_object.cpp
+    hle/kernel/wait_object.h
+    hle/lock.cpp
+    hle/lock.h
+    hle/result.h
+    hle/romfs.cpp
+    hle/romfs.h
+    hle/service/acc/acc.cpp
+    hle/service/acc/acc.h
+    hle/service/acc/acc_u0.cpp
+    hle/service/acc/acc_u0.h
+    hle/service/am/am.cpp
+    hle/service/am/am.h
+    hle/service/am/applet_oe.cpp
+    hle/service/am/applet_oe.h
+    hle/service/aoc/aoc_u.cpp
+    hle/service/aoc/aoc_u.h
+    hle/service/apm/apm.cpp
+    hle/service/apm/apm.h
+    hle/service/audio/audio.cpp
+    hle/service/audio/audio.h
+    hle/service/audio/audout_u.cpp
+    hle/service/audio/audout_u.h
+    hle/service/hid/hid.cpp
+    hle/service/hid/hid.h
+    hle/service/lm/lm.cpp
+    hle/service/lm/lm.h
+    hle/service/nvdrv/devices/nvdevice.h
+    hle/service/nvdrv/devices/nvdisp_disp0.cpp
+    hle/service/nvdrv/devices/nvdisp_disp0.h
+    hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+    hle/service/nvdrv/devices/nvhost_as_gpu.h
+    hle/service/nvdrv/devices/nvmap.cpp
+    hle/service/nvdrv/devices/nvmap.h
+    hle/service/nvdrv/interface.cpp
+    hle/service/nvdrv/interface.h
+    hle/service/nvdrv/nvdrv.cpp
+    hle/service/nvdrv/nvdrv.h
+    hle/service/pctl/pctl.cpp
+    hle/service/pctl/pctl.h
+    hle/service/pctl/pctl_a.cpp
+    hle/service/pctl/pctl_a.h
+    hle/service/service.cpp
+    hle/service/service.h
+    hle/service/sm/controller.cpp
+    hle/service/sm/controller.h
+    hle/service/sm/sm.cpp
+    hle/service/sm/sm.h
+    hle/service/time/time.cpp
+    hle/service/time/time.h
+    hle/service/vi/vi.cpp
+    hle/service/vi/vi.h
+    hle/service/vi/vi_m.cpp
+    hle/service/vi/vi_m.h
+    hle/shared_page.cpp
+    hle/shared_page.h
+    hw/hw.cpp
+    hw/hw.h
+    hw/lcd.cpp
+    hw/lcd.h
+    loader/elf.cpp
+    loader/elf.h
+    loader/linker.cpp
+    loader/linker.h
+    loader/loader.cpp
+    loader/loader.h
+    loader/nro.cpp
+    loader/nro.h
+    loader/nso.cpp
+    loader/nso.h
+    memory.cpp
+    memory.h
+    memory_setup.h
+    mmio.h
+    perf_stats.cpp
+    perf_stats.h
+    settings.cpp
+    settings.h
+    telemetry_session.cpp
+    telemetry_session.h
+    tracer/citrace.h
+    tracer/recorder.cpp
+    tracer/recorder.h
+)
 
-set(HEADERS
-            arm/arm_interface.h
-            arm/dynarmic/arm_dynarmic.h
-            arm/unicorn/arm_unicorn.h
-            core.h
-            core_timing.h
-            file_sys/archive_backend.h
-            file_sys/directory_backend.h
-            file_sys/disk_archive.h
-            file_sys/errors.h
-            file_sys/file_backend.h
-            file_sys/ivfc_archive.h
-            file_sys/path_parser.h
-            file_sys/savedata_archive.h
-            file_sys/title_metadata.h
-            frontend/emu_window.h
-            frontend/framebuffer_layout.h
-            frontend/input.h
-            gdbstub/gdbstub.h
-            hle/config_mem.h
-            hle/ipc.h
-            hle/ipc_helpers.h
-            hle/kernel/address_arbiter.h
-            hle/kernel/client_port.h
-            hle/kernel/client_session.h
-            hle/kernel/condition_variable.h
-            hle/kernel/domain.h
-            hle/kernel/errors.h
-            hle/kernel/event.h
-            hle/kernel/handle_table.h
-            hle/kernel/hle_ipc.h
-            hle/kernel/kernel.h
-            hle/kernel/memory.h
-            hle/kernel/mutex.h
-            hle/kernel/object_address_table.h
-            hle/kernel/process.h
-            hle/kernel/resource_limit.h
-            hle/kernel/server_port.h
-            hle/kernel/server_session.h
-            hle/kernel/session.h
-            hle/kernel/shared_memory.h
-            hle/kernel/sync_object.h
-            hle/kernel/svc.h
-            hle/kernel/svc_wrap.h
-            hle/kernel/thread.h
-            hle/kernel/timer.h
-            hle/kernel/vm_manager.h
-            hle/kernel/wait_object.h
-            hle/lock.h
-            hle/result.h
-            hle/romfs.h
-            hle/service/acc/acc.h
-            hle/service/acc/acc_u0.h
-            hle/service/am/am.h
-            hle/service/am/applet_oe.h
-            hle/service/aoc/aoc_u.h
-            hle/service/apm/apm.h
-            hle/service/audio/audio.h
-            hle/service/audio/audout_u.h
-            hle/service/hid/hid.h
-            hle/service/lm/lm.h
-            hle/service/nvdrv/devices/nvdevice.h
-            hle/service/nvdrv/devices/nvdisp_disp0.h
-            hle/service/nvdrv/devices/nvhost_as_gpu.h
-            hle/service/nvdrv/devices/nvmap.h
-            hle/service/nvdrv/interface.h
-            hle/service/nvdrv/nvdrv.h
-            hle/service/pctl/pctl.h
-            hle/service/pctl/pctl_a.h
-            hle/service/service.h
-            hle/service/sm/controller.h
-            hle/service/sm/sm.h
-            hle/service/time/time.h
-            hle/service/vi/vi.h
-            hle/service/vi/vi_m.h
-            hle/shared_page.h
-            hw/hw.h
-            hw/lcd.h
-            loader/elf.h
-            loader/linker.h
-            loader/loader.h
-            loader/nro.h
-            loader/nso.h
-            tracer/recorder.h
-            tracer/citrace.h
-            memory.h
-            memory_setup.h
-            mmio.h
-            perf_stats.h
-            settings.h
-            telemetry_session.h
-            )
+create_target_directory_groups(core)
 
-create_directory_groups(${SRCS} ${HEADERS})
-add_library(core STATIC ${SRCS} ${HEADERS})
 target_link_libraries(core PUBLIC common PRIVATE dynarmic video_core)
 target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static unicorn)

src/core/hle/kernel/svc.cpp

@@ -57,7 +57,7 @@ static ResultCode UnmapMemory(VAddr dst_addr, VAddr src_addr, u64 size) {
 }
 
 /// Connect to an OS service given the port name, returns the handle to the port to out
-static ResultCode ConnectToPort(Handle* out_handle, VAddr port_name_address) {
+static ResultCode ConnectToNamedPort(Handle* out_handle, VAddr port_name_address) {
     if (!Memory::IsValidVirtualAddress(port_name_address))
         return ERR_NOT_FOUND;
 
@@ -253,8 +253,8 @@ static ResultCode CancelSynchronization(Handle thread_handle) {
 }
 
 /// Attempts to locks a mutex, creating it if it does not already exist
-static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr,
-                            Handle requesting_thread_handle) {
+static ResultCode ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr,
+                                Handle requesting_thread_handle) {
     LOG_TRACE(Kernel_SVC, "called holding_thread_handle=0x%08X, mutex_addr=0x%llx, "
                           "requesting_current_thread_handle=0x%08X",
               holding_thread_handle, mutex_addr, requesting_thread_handle);
@@ -277,7 +277,7 @@ static ResultCode LockMutex(Handle holding_thread_handle, VAddr mutex_addr,
 }
 
 /// Unlock a mutex
-static ResultCode UnlockMutex(VAddr mutex_addr) {
+static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
     LOG_TRACE(Kernel_SVC, "called mutex_addr=0x%llx", mutex_addr);
 
     SharedPtr<Mutex> mutex = g_object_address_table.Get<Mutex>(mutex_addr);
@@ -774,12 +774,12 @@ static const FunctionDef SVC_Table[] = {
     {0x17, SvcWrap<ResetSignal>, "ResetSignal"},
     {0x18, SvcWrap<WaitSynchronization>, "WaitSynchronization"},
     {0x19, SvcWrap<CancelSynchronization>, "CancelSynchronization"},
-    {0x1A, SvcWrap<LockMutex>, "LockMutex"},
-    {0x1B, SvcWrap<UnlockMutex>, "UnlockMutex"},
+    {0x1A, SvcWrap<ArbitrateLock>, "ArbitrateLock"},
+    {0x1B, SvcWrap<ArbitrateUnlock>, "ArbitrateUnlock"},
     {0x1C, SvcWrap<WaitProcessWideKeyAtomic>, "WaitProcessWideKeyAtomic"},
     {0x1D, SvcWrap<SignalProcessWideKey>, "SignalProcessWideKey"},
     {0x1E, SvcWrap<GetSystemTick>, "GetSystemTick"},
-    {0x1F, SvcWrap<ConnectToPort>, "ConnectToPort"},
+    {0x1F, SvcWrap<ConnectToNamedPort>, "ConnectToNamedPort"},
     {0x20, nullptr, "SendSyncRequestLight"},
     {0x21, SvcWrap<SendSyncRequest>, "SendSyncRequest"},
     {0x22, nullptr, "SendSyncRequestWithUserBuffer"},
@@ -823,8 +823,8 @@ static const FunctionDef SVC_Table[] = {
     {0x48, nullptr, "Unknown"},
     {0x49, nullptr, "Unknown"},
     {0x4A, nullptr, "Unknown"},
-    {0x4B, nullptr, "Unknown"},
-    {0x4C, nullptr, "Unknown"},
+    {0x4B, nullptr, "CreateJitMemory"},
+    {0x4C, nullptr, "MapJitMemory"},
     {0x4D, nullptr, "SleepSystem"},
     {0x4E, nullptr, "ReadWriteRegister"},
     {0x4F, nullptr, "SetProcessActivity"},

src/core/hle/service/sm/controller.cpp

@@ -32,6 +32,12 @@ void Controller::DuplicateSession(Kernel::HLERequestContext& ctx) {
     LOG_DEBUG(Service, "called");
 }
 
+void Controller::DuplicateSessionEx(Kernel::HLERequestContext& ctx) {
+    DuplicateSession(ctx);
+
+    LOG_WARNING(Service, "(STUBBED) called, using DuplicateSession");
+}
+
 void Controller::QueryPointerBufferSize(Kernel::HLERequestContext& ctx) {
     IPC::RequestBuilder rb{ctx, 3};
     rb.Push(RESULT_SUCCESS);
@@ -46,7 +52,7 @@ Controller::Controller() : ServiceFramework("IpcController") {
         {0x00000001, nullptr, "ConvertDomainToSession"},
         {0x00000002, &Controller::DuplicateSession, "DuplicateSession"},
         {0x00000003, &Controller::QueryPointerBufferSize, "QueryPointerBufferSize"},
-        {0x00000004, nullptr, "DuplicateSessionEx"},
+        {0x00000004, &Controller::DuplicateSessionEx, "DuplicateSessionEx"},
     };
     RegisterHandlers(functions);
 }

src/core/hle/service/sm/controller.h

@@ -17,6 +17,7 @@ public:
 private:
     void ConvertSessionToDomain(Kernel::HLERequestContext& ctx);
     void DuplicateSession(Kernel::HLERequestContext& ctx);
+    void DuplicateSessionEx(Kernel::HLERequestContext& ctx);
     void QueryPointerBufferSize(Kernel::HLERequestContext& ctx);
 };
 

src/core/hle/service/vi/vi.cpp

@@ -26,7 +26,7 @@ public:
     // This default size was chosen arbitrarily.
     static constexpr size_t DefaultBufferSize = 0x40;
     Parcel() : buffer(DefaultBufferSize) {}
-    Parcel(std::vector<u8> data) : buffer(std::move(data)) {}
+    explicit Parcel(std::vector<u8> data) : buffer(std::move(data)) {}
     virtual ~Parcel() = default;
 
     template <typename T>
@@ -47,8 +47,9 @@ public:
     }
 
     std::vector<u8> ReadBlock(size_t length) {
-        std::vector<u8> data(length);
-        std::memcpy(data.data(), buffer.data() + read_index, length);
+        const u8* const begin = buffer.data() + read_index;
+        const u8* const end = begin + length;
+        std::vector<u8> data(begin, end);
         read_index += length;
         read_index = Common::AlignUp(read_index, 4);
         return data;
@@ -101,9 +102,9 @@ public:
     }
 
 protected:
-    virtual void SerializeData(){};
+    virtual void SerializeData() {}
 
-    virtual void DeserializeData(){};
+    virtual void DeserializeData() {}
 
 private:
     struct Header {
@@ -121,7 +122,7 @@ private:
 
 class NativeWindow : public Parcel {
 public:
-    NativeWindow(u32 id) : Parcel() {
+    explicit NativeWindow(u32 id) : Parcel() {
         data.id = id;
     }
     ~NativeWindow() override = default;
@@ -147,12 +148,12 @@ private:
 
 class IGBPConnectRequestParcel : public Parcel {
 public:
-    IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    explicit IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPConnectRequestParcel() override = default;
 
-    void DeserializeData() {
+    void DeserializeData() override {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
     }
@@ -168,7 +169,7 @@ public:
 
 class IGBPConnectResponseParcel : public Parcel {
 public:
-    IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() {
+    explicit IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() {
         data.width = width;
         data.height = height;
     }
@@ -194,12 +195,13 @@ private:
 
 class IGBPSetPreallocatedBufferRequestParcel : public Parcel {
 public:
-    IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    explicit IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer)
+        : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPSetPreallocatedBufferRequestParcel() override = default;
 
-    void DeserializeData() {
+    void DeserializeData() override {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
         ASSERT(data.graphic_buffer_length == sizeof(IGBPBuffer));
@@ -231,12 +233,12 @@ protected:
 
 class IGBPDequeueBufferRequestParcel : public Parcel {
 public:
-    IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    explicit IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPDequeueBufferRequestParcel() override = default;
 
-    void DeserializeData() {
+    void DeserializeData() override {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
     }
@@ -254,7 +256,7 @@ public:
 
 class IGBPDequeueBufferResponseParcel : public Parcel {
 public:
-    IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {}
+    explicit IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {}
     ~IGBPDequeueBufferResponseParcel() override = default;
 
 protected:
@@ -271,12 +273,12 @@ protected:
 
 class IGBPRequestBufferRequestParcel : public Parcel {
 public:
-    IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    explicit IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPRequestBufferRequestParcel() override = default;
 
-    void DeserializeData() {
+    void DeserializeData() override {
         std::u16string token = ReadInterfaceToken();
         slot = Read<u32_le>();
     }
@@ -286,7 +288,7 @@ public:
 
 class IGBPRequestBufferResponseParcel : public Parcel {
 public:
-    IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {}
+    explicit IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {}
     ~IGBPRequestBufferResponseParcel() override = default;
 
 protected:
@@ -307,12 +309,12 @@ protected:
 
 class IGBPQueueBufferRequestParcel : public Parcel {
 public:
-    IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    explicit IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPQueueBufferRequestParcel() override = default;
 
-    void DeserializeData() {
+    void DeserializeData() override {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
     }
@@ -330,7 +332,7 @@ public:
 
 class IGBPQueueBufferResponseParcel : public Parcel {
 public:
-    IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() {
+    explicit IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() {
         data.width = width;
         data.height = height;
     }
@@ -356,7 +358,7 @@ private:
 
 class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> {
 public:
-    IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger)
+    explicit IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger)
         : ServiceFramework("IHOSBinderDriver"), nv_flinger(std::move(nv_flinger)) {
         static const FunctionInfo functions[] = {
             {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"},
@@ -506,7 +508,7 @@ private:
 
 class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> {
 public:
-    IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger)
+    explicit IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger)
         : ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) {
         static const FunctionInfo functions[] = {
             {1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"},

src/core/loader/nro.cpp

@@ -62,20 +62,6 @@ static constexpr u32 PageAlignSize(u32 size) {
     return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
 }
 
-static std::vector<u8> ReadSegment(FileUtil::IOFile& file, const NroSegmentHeader& header) {
-    std::vector<u8> data;
-    data.resize(header.size);
-
-    file.Seek(header.offset + sizeof(NroHeader), SEEK_SET);
-    size_t bytes_read{file.ReadBytes(data.data(), header.size)};
-    if (header.size != PageAlignSize(static_cast<u32>(bytes_read))) {
-        LOG_CRITICAL(Loader, "Failed to read NRO segment bytes", header.size);
-        return {};
-    }
-
-    return data;
-}
-
 bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
     FileUtil::IOFile file(path, "rb");
     if (!file.IsOpen()) {
@@ -95,7 +81,7 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
     // Build program image
     Kernel::SharedPtr<Kernel::CodeSet> codeset = Kernel::CodeSet::Create("", 0);
     std::vector<u8> program_image;
-    program_image.resize(PageAlignSize(nro_header.file_size + nro_header.bss_size));
+    program_image.resize(PageAlignSize(nro_header.file_size));
     file.Seek(0, SEEK_SET);
     file.ReadBytes(program_image.data(), nro_header.file_size);
 
@@ -107,15 +93,16 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
 
     // Read MOD header
     ModHeader mod_header{};
-    u32 bss_size{Memory::PAGE_SIZE}; // Default .bss to page size if MOD0 section doesn't exist
+    // Default .bss to NRO header bss size if MOD0 section doesn't exist
+    u32 bss_size{PageAlignSize(nro_header.bss_size)};
     std::memcpy(&mod_header, program_image.data() + nro_header.module_header_offset,
                 sizeof(ModHeader));
     const bool has_mod_header{mod_header.magic == Common::MakeMagic('M', 'O', 'D', '0')};
     if (has_mod_header) {
         // Resize program image to include .bss section and page align each section
         bss_size = PageAlignSize(mod_header.bss_end_offset - mod_header.bss_start_offset);
-        codeset->data.size += bss_size;
     }
+    codeset->data.size += bss_size;
     program_image.resize(PageAlignSize(static_cast<u32>(program_image.size()) + bss_size));
 
     // Load codeset for current process
@@ -134,9 +121,11 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
         return ResultStatus::Error;
     }
 
-    // Load and relocate "main" and "sdk" NSO
-    static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR};
     process = Kernel::Process::Create("main");
+
+    // Load NRO
+    static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR};
+
     if (!LoadNro(filepath, base_addr)) {
         return ResultStatus::ErrorInvalidFormat;
     }
@@ -145,7 +134,7 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
     process->address_mappings = default_address_mappings;
     process->resource_limit =
         Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
-    process->Run(base_addr, 48, Kernel::DEFAULT_STACK_SIZE);
+    process->Run(base_addr + sizeof(NroHeader), 48, Kernel::DEFAULT_STACK_SIZE);
 
     is_loaded = true;
     return ResultStatus::Success;

src/input_common/CMakeLists.txt

@@ -1,25 +1,18 @@
-set(SRCS
-            analog_from_button.cpp
-            keyboard.cpp
-            main.cpp
-            motion_emu.cpp
-            )
+add_library(input_common STATIC
+    analog_from_button.cpp
+    analog_from_button.h
+    keyboard.cpp
+    keyboard.h
+    main.cpp
+    main.h
+    motion_emu.cpp
+    motion_emu.h
 
-set(HEADERS
-            analog_from_button.h
-            keyboard.h
-            main.h
-            motion_emu.h
-            )
+    $<$<BOOL:${SDL2_FOUND}>:sdl/sdl.cpp sdl/sdl.h>
+)
 
-if(SDL2_FOUND)
-    set(SRCS ${SRCS} sdl/sdl.cpp)
-    set(HEADERS ${HEADERS} sdl/sdl.h)
-endif()
+create_target_directory_groups(input_common)
 
-create_directory_groups(${SRCS} ${HEADERS})
-
-add_library(input_common STATIC ${SRCS} ${HEADERS})
 target_link_libraries(input_common PUBLIC core PRIVATE common)
 
 if(SDL2_FOUND)

src/input_common/sdl/sdl.cpp

@@ -425,7 +425,7 @@ std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> GetPollers(
         pollers.push_back(std::make_unique<SDLButtonPoller>());
         break;
     }
-    return std::move(pollers);
+    return pollers;
 }
 } // namespace Polling
 } // namespace SDL

src/tests/CMakeLists.txt

@@ -1,20 +1,16 @@
-set(SRCS
-            common/param_package.cpp
-            core/arm/arm_test_common.cpp
-            core/core_timing.cpp
-            core/file_sys/path_parser.cpp
-            core/memory/memory.cpp
-            glad.cpp
-            tests.cpp
-            )
+add_executable(tests
+    common/param_package.cpp
+    core/arm/arm_test_common.cpp
+    core/arm/arm_test_common.h
+    core/core_timing.cpp
+    core/file_sys/path_parser.cpp
+    core/memory/memory.cpp
+    glad.cpp
+    tests.cpp
+)
 
-set(HEADERS
-            core/arm/arm_test_common.h
-            )
+create_target_directory_groups(tests)
 
-create_directory_groups(${SRCS} ${HEADERS})
-
-add_executable(tests ${SRCS} ${HEADERS})
 target_link_libraries(tests PRIVATE common core)
 target_link_libraries(tests PRIVATE glad) # To support linker work-around
 target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch-single-include Threads::Threads)

src/video_core/CMakeLists.txt

@@ -1,23 +1,19 @@
-set(SRCS
-            renderer_base.cpp
-            renderer_opengl/gl_shader_util.cpp
-            renderer_opengl/gl_state.cpp
-            renderer_opengl/renderer_opengl.cpp
-            video_core.cpp
-            )
+add_library(video_core STATIC
+    renderer_base.cpp
+    renderer_base.h
+    renderer_opengl/gl_resource_manager.h
+    renderer_opengl/gl_shader_util.cpp
+    renderer_opengl/gl_shader_util.h
+    renderer_opengl/gl_state.cpp
+    renderer_opengl/gl_state.h
+    renderer_opengl/renderer_opengl.cpp
+    renderer_opengl/renderer_opengl.h
+    utils.h
+    video_core.cpp
+    video_core.h
+)
 
-set(HEADERS
-            renderer_base.h
-            renderer_opengl/gl_resource_manager.h
-            renderer_opengl/gl_shader_util.h
-            renderer_opengl/gl_state.h
-            renderer_opengl/renderer_opengl.h
-            utils.h
-            video_core.h
-            )
+create_target_directory_groups(video_core)
 
-create_directory_groups(${SRCS} ${HEADERS})
-
-add_library(video_core STATIC ${SRCS} ${HEADERS})
 target_link_libraries(video_core PUBLIC common core)
 target_link_libraries(video_core PRIVATE glad)

src/yuzu/CMakeLists.txt

@@ -3,79 +3,84 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-set(SRCS
-            about_dialog.cpp
-            configuration/config.cpp
-            configuration/configure_debug.cpp
-            configuration/configure_dialog.cpp
-            configuration/configure_general.cpp
-            configuration/configure_graphics.cpp
-            configuration/configure_input.cpp
-            configuration/configure_system.cpp
-            debugger/profiler.cpp
-            debugger/registers.cpp
-            debugger/wait_tree.cpp
-            util/spinbox.cpp
-            util/util.cpp
-            bootmanager.cpp
-            game_list.cpp
-            hotkeys.cpp
-            main.cpp
-            ui_settings.cpp
-            yuzu.rc
-            Info.plist
-            )
-
-set(HEADERS
-            about_dialog.h
-            configuration/config.h
-            configuration/configure_debug.h
-            configuration/configure_dialog.h
-            configuration/configure_general.h
-            configuration/configure_graphics.h
-            configuration/configure_input.h
-            configuration/configure_system.h
-            debugger/profiler.h
-            debugger/registers.h
-            debugger/wait_tree.h
-            util/spinbox.h
-            util/util.h
-            bootmanager.h
-            game_list.h
-            game_list_p.h
-            hotkeys.h
-            main.h
-            ui_settings.h
-            )
+add_executable(yuzu
+    Info.plist
+    about_dialog.cpp
+    about_dialog.h
+    bootmanager.cpp
+    bootmanager.h
+    configuration/config.cpp
+    configuration/config.h
+    configuration/configure_debug.cpp
+    configuration/configure_debug.h
+    configuration/configure_dialog.cpp
+    configuration/configure_dialog.h
+    configuration/configure_general.cpp
+    configuration/configure_general.h
+    configuration/configure_graphics.cpp
+    configuration/configure_graphics.h
+    configuration/configure_input.cpp
+    configuration/configure_input.h
+    configuration/configure_system.cpp
+    configuration/configure_system.h
+    debugger/profiler.cpp
+    debugger/profiler.h
+    debugger/registers.cpp
+    debugger/registers.h
+    debugger/wait_tree.cpp
+    debugger/wait_tree.h
+    game_list.cpp
+    game_list.h
+    game_list_p.h
+    hotkeys.cpp
+    hotkeys.h
+    main.cpp
+    main.h
+    ui_settings.cpp
+    ui_settings.h
+    util/spinbox.cpp
+    util/spinbox.h
+    util/util.cpp
+    util/util.h
+    yuzu.rc
+)
 
 set(UIS
-            aboutdialog.ui
-            configuration/configure.ui
-            configuration/configure_debug.ui
-            configuration/configure_general.ui
-            configuration/configure_graphics.ui
-            configuration/configure_input.ui
-            configuration/configure_system.ui
-            debugger/registers.ui
-            hotkeys.ui
-            main.ui
-            )
+    aboutdialog.ui
+    configuration/configure.ui
+    configuration/configure_debug.ui
+    configuration/configure_general.ui
+    configuration/configure_graphics.ui
+    configuration/configure_input.ui
+    configuration/configure_system.ui
+    debugger/registers.ui
+    hotkeys.ui
+    main.ui
+)
 
 file(GLOB_RECURSE ICONS ${CMAKE_SOURCE_DIR}/dist/icons/*)
 file(GLOB_RECURSE THEMES ${CMAKE_SOURCE_DIR}/dist/qt_themes/*)
 
-create_directory_groups(${SRCS} ${HEADERS} ${UIS})
-
 qt5_wrap_ui(UI_HDRS ${UIS})
 
+target_sources(yuzu
+    PRIVATE
+        ${ICONS}
+        ${THEMES}
+        ${UI_HDRS}
+        ${UIS}
+)
+
 if (APPLE)
     set(MACOSX_ICON "../../dist/yuzu.icns")
     set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    add_executable(yuzu MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON} ${ICONS})
+    target_sources(yuzu PRIVATE ${MACOSX_ICON})
+    set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
     set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
-else()
-    add_executable(yuzu ${SRCS} ${HEADERS} ${UI_HDRS} ${ICONS})
 endif()
+
+create_target_directory_groups(yuzu)
+
 target_link_libraries(yuzu PRIVATE common core input_common video_core)
 target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets)
 target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)

src/yuzu/bootmanager.cpp

@@ -15,8 +15,7 @@
 #include "input_common/motion_emu.h"
 #include "yuzu/bootmanager.h"
 
-EmuThread::EmuThread(GRenderWindow* render_window)
-    : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
+EmuThread::EmuThread(GRenderWindow* render_window) : render_window(render_window) {}
 
 void EmuThread::run() {
     render_window->MakeCurrent();

src/yuzu/bootmanager.h

@@ -58,7 +58,7 @@ public:
      * @return True if the emulation thread is running, otherwise false
      * @note This function is thread-safe
      */
-    bool IsRunning() {
+    bool IsRunning() const {
         return running;
     }
 
@@ -68,12 +68,12 @@ public:
     void RequestStop() {
         stop_run = true;
         SetRunning(false);
-    };
+    }
 
 private:
-    bool exec_step;
-    bool running;
-    std::atomic<bool> stop_run;
+    bool exec_step = false;
+    bool running = false;
+    std::atomic<bool> stop_run{false};
     std::mutex running_mutex;
     std::condition_variable running_cv;
 

src/yuzu/configuration/configure_input.ui

@@ -15,9 +15,9 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
-    <layout class="QGridLayout" name="gridLayout_7">
+    <layout class="QGridLayout" name="buttons">
      <item row="3" column="1">
-      <widget class="QGroupBox" name="faceButtons_6">
+      <widget class="QGroupBox" name="misc">
        <property name="title">
         <string>Misc.</string>
        </property>
@@ -29,9 +29,9 @@
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_25">
+         <layout class="QVBoxLayout" name="buttonMiscPlusVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_29">
+           <widget class="QLabel" name="labelPlus">
             <property name="text">
              <string>Plus:</string>
             </property>
@@ -47,9 +47,9 @@
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_26">
+         <layout class="QVBoxLayout" name="buttonMiscMinusVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_30">
+           <widget class="QLabel" name="labelMinus">
             <property name="text">
              <string>Minus:</string>
             </property>
@@ -65,9 +65,9 @@
          </layout>
         </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_27">
+         <layout class="QVBoxLayout" name="buttonMiscHomeVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_31">
+           <widget class="QLabel" name="labelHome">
             <property name="text">
              <string>Home:</string>
             </property>
@@ -83,9 +83,9 @@
          </layout>
         </item>
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_28">
+         <layout class="QVBoxLayout" name="buttonMiscScrCapVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_11">
+           <widget class="QLabel" name="labelScrCap">
             <property name="text">
              <string>Screen
 Capture:</string>
@@ -130,9 +130,9 @@ Capture:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QVBoxLayout" name="buttonFaceButtonsAVerticalLayout">
           <item>
-           <widget class="QLabel" name="label">
+           <widget class="QLabel" name="labelA">
             <property name="text">
              <string>A:</string>
             </property>
@@ -148,9 +148,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_2">
+         <layout class="QVBoxLayout" name="buttonFaceButtonsBVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_2">
+           <widget class="QLabel" name="labelB">
             <property name="text">
              <string>B:</string>
             </property>
@@ -166,9 +166,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_3">
+         <layout class="QVBoxLayout" name="buttonFaceButtonsXVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_3">
+           <widget class="QLabel" name="labelX">
             <property name="text">
              <string>X:</string>
             </property>
@@ -184,9 +184,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_4">
+         <layout class="QVBoxLayout" name="buttonFaceButtonsYVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_4">
+           <widget class="QLabel" name="labelY">
             <property name="text">
              <string>Y:</string>
             </property>
@@ -205,7 +205,7 @@ Capture:</string>
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QGroupBox" name="faceButtons_2">
+      <widget class="QGroupBox" name="Dpad">
        <property name="title">
         <string>Directional Pad</string>
        </property>
@@ -217,9 +217,9 @@ Capture:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_12">
+         <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_34">
+           <widget class="QLabel" name="labelDpadUp">
             <property name="text">
              <string>Up:</string>
             </property>
@@ -235,9 +235,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_9">
+         <layout class="QVBoxLayout" name="buttonDpadDownVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_35">
+           <widget class="QLabel" name="labelDpadDown">
             <property name="text">
              <string>Down:</string>
             </property>
@@ -253,9 +253,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_10">
+         <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_32">
+           <widget class="QLabel" name="labelDpadLeft">
             <property name="text">
              <string>Left:</string>
             </property>
@@ -271,9 +271,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_11">
+         <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_33">
+           <widget class="QLabel" name="labelDpadRight">
             <property name="text">
              <string>Right:</string>
             </property>
@@ -292,7 +292,7 @@ Capture:</string>
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QGroupBox" name="faceButtons_3">
+      <widget class="QGroupBox" name="shoulderButtons">
        <property name="title">
         <string>Shoulder Buttons</string>
        </property>
@@ -304,9 +304,9 @@ Capture:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_3">
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_13">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_17">
+           <widget class="QLabel" name="labelL">
             <property name="text">
              <string>L:</string>
             </property>
@@ -322,9 +322,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_14">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_19">
+           <widget class="QLabel" name="labelR">
             <property name="text">
              <string>R:</string>
             </property>
@@ -340,9 +340,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_15">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_20">
+           <widget class="QLabel" name="labelZL">
             <property name="text">
              <string>ZL:</string>
             </property>
@@ -358,9 +358,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_16">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_18">
+           <widget class="QLabel" name="labelZR">
             <property name="text">
              <string>ZR:</string>
             </property>
@@ -376,9 +376,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="2" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_8">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsSLVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_7">
+           <widget class="QLabel" name="labelSL">
             <property name="text">
              <string>SL:</string>
             </property>
@@ -394,9 +394,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="2" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_29">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsSRVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_8">
+           <widget class="QLabel" name="labelSR">
             <property name="text">
              <string>SR:</string>
             </property>
@@ -415,7 +415,7 @@ Capture:</string>
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="QGroupBox" name="faceButtons_5">
+      <widget class="QGroupBox" name="RStick">
        <property name="title">
         <string>Right Stick</string>
        </property>
@@ -430,9 +430,9 @@ Capture:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_24">
+         <layout class="QVBoxLayout" name="buttonRStickDownVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_26">
+           <widget class="QLabel" name="labelRStickDown">
             <property name="text">
              <string>Down:</string>
             </property>
@@ -448,9 +448,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_22">
+         <layout class="QVBoxLayout" name="buttonRStickRightVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_27">
+           <widget class="QLabel" name="labelRStickRight">
             <property name="text">
              <string>Right:</string>
             </property>
@@ -473,9 +473,9 @@ Capture:</string>
          </widget>
         </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_21">
+         <layout class="QVBoxLayout" name="buttonRStickLeftVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_25">
+           <widget class="QLabel" name="labelRStickLeft">
             <property name="text">
              <string>Left:</string>
             </property>
@@ -491,9 +491,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_25">
+         <layout class="QVBoxLayout" name="buttonRStickUpVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_28">
+           <widget class="QLabel" name="labelRStickUp">
             <property name="text">
              <string>Up:</string>
             </property>
@@ -509,9 +509,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="2" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_6">
+         <layout class="QVBoxLayout" name="buttonRStickPressedVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_5">
+           <widget class="QLabel" name="labelRStickPressed">
             <property name="text">
              <string>Pressed:</string>
             </property>
@@ -527,9 +527,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="2" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_32">
+         <layout class="QVBoxLayout" name="buttonRStickModVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_10">
+           <widget class="QLabel" name="labelRStickMod">
             <property name="text">
              <string>Modifier:</string>
             </property>
@@ -548,7 +548,7 @@ Capture:</string>
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QGroupBox" name="faceButtons_4">
+      <widget class="QGroupBox" name="LStick">
        <property name="title">
         <string>Left Stick</string>
        </property>
@@ -560,9 +560,9 @@ Capture:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_4">
         <item row="1" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_20">
+         <layout class="QVBoxLayout" name="buttonLStickDownVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_22">
+           <widget class="QLabel" name="labelLStickDown">
             <property name="text">
              <string>Down:</string>
             </property>
@@ -585,9 +585,9 @@ Capture:</string>
          </widget>
         </item>
         <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_18">
+         <layout class="QVBoxLayout" name="buttonLStickRightVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_23">
+           <widget class="QLabel" name="labelLStickRight">
             <property name="text">
              <string>Right:</string>
             </property>
@@ -603,9 +603,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_17">
+         <layout class="QVBoxLayout" name="buttonLStickLeftVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_21">
+           <widget class="QLabel" name="labelLStickLeft">
             <property name="text">
              <string>Left:</string>
             </property>
@@ -621,9 +621,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="1" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_19">
+         <layout class="QVBoxLayout" name="buttonLStickUpVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_24">
+           <widget class="QLabel" name="labelLStickUp">
             <property name="text">
              <string>Up:</string>
             </property>
@@ -639,9 +639,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="3" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout_31">
+         <layout class="QVBoxLayout" name="buttonLStickModVerticalLayout">
           <item>
-           <widget class="QLabel" name="label_9">
+           <widget class="QLabel" name="labelLStickMod">
             <property name="text">
              <string>Modifier:</string>
             </property>
@@ -657,9 +657,9 @@ Capture:</string>
          </layout>
         </item>
         <item row="3" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0">
+         <layout class="QVBoxLayout" name="buttonLStickPressedVerticalLayout" stretch="0,0">
           <item>
-           <widget class="QLabel" name="label_6">
+           <widget class="QLabel" name="labelLStickPressed">
             <property name="text">
              <string>Pressed:</string>
             </property>

src/yuzu/game_list.cpp

@@ -137,8 +137,8 @@ GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} {
  * Checks if all words separated by spaces are contained in another string
  * This offers a word order insensitive search function
  *
- * @param String that gets checked if it contains all words of the userinput string
- * @param String containing all words getting checked
+ * @param haystack String that gets checked if it contains all words of the userinput string
+ * @param userinput String containing all words getting checked
  * @return true if the haystack contains all words of userinput
  */
 bool GameList::containsAllWords(QString haystack, QString userinput) {

src/yuzu/game_list.h

@@ -49,7 +49,7 @@ public:
             QString edit_filter_text_old;
 
         protected:
-            bool eventFilter(QObject* obj, QEvent* event);
+            bool eventFilter(QObject* obj, QEvent* event) override;
         };
         QHBoxLayout* layout_filter = nullptr;
         QTreeView* tree_view = nullptr;

src/yuzu/hotkeys.cpp

@@ -5,6 +5,7 @@
 #include <map>
 #include <QKeySequence>
 #include <QShortcut>
+#include <QTreeWidgetItem>
 #include <QtGlobal>
 #include "yuzu/hotkeys.h"
 #include "yuzu/ui_settings.h"

src/yuzu_cmd/CMakeLists.txt

@@ -1,21 +1,18 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-set(SRCS
-            emu_window/emu_window_sdl2.cpp
-            config.cpp
-            yuzu.cpp
-            yuzu.rc
-            )
-set(HEADERS
-            emu_window/emu_window_sdl2.h
-            config.h
-            default_ini.h
-            resource.h
-            )
+add_executable(yuzu-cmd
+    config.cpp
+    config.h
+    default_ini.h
+    emu_window/emu_window_sdl2.cpp
+    emu_window/emu_window_sdl2.h
+    resource.h
+    yuzu.cpp
+    yuzu.rc
+)
 
-create_directory_groups(${SRCS} ${HEADERS})
+create_target_directory_groups(yuzu-cmd)
 
-add_executable(yuzu-cmd ${SRCS} ${HEADERS})
 target_link_libraries(yuzu-cmd PRIVATE common core input_common)
 target_link_libraries(yuzu-cmd PRIVATE inih glad)
 if (MSVC)