Merge 50b95516bd into 0568346cc3

.travis.yml

@@ -24,7 +24,7 @@ matrix:
     - os: osx
       env: NAME="macos build"
       sudo: false
-      osx_image: xcode9.2
+      osx_image: xcode7.3
       install: "./.travis/macos/deps.sh"
       script: "./.travis/macos/build.sh"
       after_success: "./.travis/macos/upload.sh"
@@ -32,7 +32,7 @@ matrix:
 deploy:
   provider: releases
   api_key:
-    secure: ElsIAlbvVXBNKsP31nVPysh+mf0GQA4DiL/y5iJeQxKQYR6iRoNo+RfzOBmdswdo0bE/PGeBAlfzCkp15gjhWf6Je0N6dRpczmcmLq6SSQFn1Mpq00xMJB2AgQIlaHs6KFgoUA173EBKbPwgU/NubTFpJFm/Wa+NcSWAHQXKL9KT2M3qKpxNkPl3mKEVsbch4REP+T/46vsa+ikw0VE0kIs6V93LqUQZpI2F0Dhihx8Cxr5iedkE1QsNK+QSX9iItMHbfek9OH980gP7L3lkZltyAA1Pk0c37OAgz2PwczwNKwCT8jg9PMzdcKmWouvLyAkZFuA806ElzwHY3oEd91Zm6+Bk5n24yBKZ9027AZzw38NK2Z2m9Akb8+ar8PdsKU6N5pDutX9qSLayr0oMgJ0s7/xnGBGdL3gfkPCFc50xO/2DxlsOR+zAhPNM9Y76hhGy6A7/40+9uzrJvd4nAuDvIXRzi2Yl2L7mKBE4suMKbFLtk2LlgM0qY5JMVTQ8NliaEtqopfPur2KWFVJUpWDNLtNX8xGqhfwg7cLjIiGmnxSaJBTDuZI6dpEjkWkU0n1xYhGqEqit8DbehYzazozMJ+Vsr8hku7jGlUtlw+U6HG1e19O2y4aGeSwYPROcCNz+BLwmVM8oZE3Roy3qoaa2yiFf+sy6rUHznrhsfEM=
+    secure: IuTT8DjxzNgOtaEsyOpz1JaSmtDtHSsWZnJKmSBwXAzgP2ZU4Ja3/q0z5PwbC5Ql7kuFahuYTE5oi7lbJBuu2P3y1Wj2zvFozGUkA3JUvEXDNOPS9QTJ1EYd6O+wenZoj7d/Pn+ZeIgyEafnnZsGBb8lMQnV9MfIHgYlZQ5EyF3n4XikT2h1UbDBYx74ciXZIxFEulx68kDr9Q4/U+zIYQmYv2N+lgXSLDkFrCJ046gRcujPYGPqE6jVw0kKni80CTTpuDF5prU8yIBeiffjkJ3Qx1a17G07eZ4r83P4XUOlaHbRBmA/8ywZvLF2Gep3wGKfSFgMWbPxBJk5ZSYcOOAgMsEcg0+gBK9gLTwO4pbmc2GvqP21yRQBzgtbFoEtAHLu5lVPBkZU7kZuRMJtRdqvFIwOLhpnRS8IknFOD5vjtaFiNdGWaK9ePdsGvplijnXcPafkumakc4+eVEiXb6/KzdX1zXdur5tuUPFytm0Oy6IJcGIf8FHXGvUlmWsnPzwfusij9JgeQOP+uegc9PdBfL+h7L5rk+ilELt3cXD5K7wgov/4hkl5istNJ2bm0IioIstWss8QQQTkyscGoeh/oXmUpOL4FdsTvsWhDR3QKeq8nSzgDkqLe0iSbplQGnC7o7ytNbldmxJvf3nylwglA8w3HlqLHtZLkUOcuQ0=
   file_glob: true
   file: "artifacts/*"
   skip_cleanup: true

CMakeLists.txt

@@ -323,14 +323,12 @@ 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_target_directory_groups target_name)
+function(create_directory_groups)
     # 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 ".")
 
-    get_target_property(target_sources "${target_name}" SOURCES)
-
-    foreach(file_name IN LISTS target_sources)
+    foreach(file_name ${ARGV})
         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

@@ -13,8 +13,8 @@ environment:
   # Tell msys2 to inherit the current directory when starting the shell
   CHERE_INVOKING: 1
   matrix:
-    - BUILD_TYPE: msvc
     - BUILD_TYPE: mingw
+    - BUILD_TYPE: msvc
 
 platform:
   - x64
@@ -80,19 +80,12 @@ after_build:
           $env:BUILD_SYMBOLS = $MSVC_BUILD_PDB
           $env:BUILD_UPDATE = $MSVC_SEVENZIP
 
-          $BUILD_DIR = ".\msvc_build\bin\Release"
-
-          # Make a debug symbol upload
           mkdir pdb
-          Get-ChildItem "$BUILD_DIR\" -Recurse -Filter "*.pdb" | Copy-Item -destination .\pdb
+          Get-ChildItem ".\msvc_build\bin\" -Recurse -Filter "*.pdb" | Copy-Item -destination .\pdb
           7z a -tzip $MSVC_BUILD_PDB .\pdb\*.pdb
-          rm "$BUILD_DIR\*.pdb"
 
           mkdir $RELEASE_DIST
-          # get rid of extra exes by copying everything over, then deleting all the exes, then copying just the exes we want
-          Copy-Item "$BUILD_DIR\*" -Destination $RELEASE_DIST -Recurse
-          rm "$RELEASE_DIST\*.exe"
-          Get-ChildItem "$BUILD_DIR" -Recurse -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
+          Get-ChildItem ".\msvc_build\bin\" -Recurse -Filter "yuzu*.exe" | Copy-Item -destination $RELEASE_DIST
           Copy-Item .\license.txt -Destination $RELEASE_DIST
           Copy-Item .\README.md -Destination $RELEASE_DIST
           7z a -tzip $MSVC_BUILD_ZIP $RELEASE_DIST\*
@@ -170,7 +163,7 @@ deploy:
   provider: GitHub
   release: $(appveyor_repo_tag_name)
   auth_token:
-    secure: QqePPnXbkzmXct5c8hZ2X5AbsthbI6cS1Sr+VBzcD8oUOIjfWJJKXVAQGUbQAbb0
+    secure: "argb6oi2TYLB4wDy+HoCC8PuGAmsnocSk12CQ5614XAPO+NVPndlkLv1utnDFfg2"
   artifact: update,build
   draft: false
   prerelease: false

externals/getopt/CMakeLists.txt

@@ -1,9 +1,11 @@
-add_library(getopt
-    getopt.c
-    getopt.h
-)
-
-create_target_directory_groups(getopt)
+set(SRCS
+            getopt.c
+            )
+set(HEADERS
+            getopt.h
+            )
 
+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,10 +1,13 @@
-add_library(glad STATIC
-    src/glad.c
-    include/KHR/khrplatform.h
-    include/glad/glad.h
-)
+set(SRCS
+            src/glad.c
+            )
+set(HEADERS
+            include/KHR/khrplatform.h
+            include/glad/glad.h
+            )
 
-create_target_directory_groups(glad)
+create_directory_groups(${SRCS} ${HEADERS})
+add_library(glad STATIC ${SRCS} ${HEADERS})
 target_include_directories(glad PUBLIC "include/")
 
 if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")

externals/inih/CMakeLists.txt

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

src/common/CMakeLists.txt

@@ -24,72 +24,78 @@ if ($ENV{CI})
 endif()
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY)
 
-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
-)
+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
+            )
 
 if(ARCHITECTURE_x86_64)
-    target_sources(common
-        PRIVATE
+    set(SRCS ${SRCS}
             x64/cpu_detect.cpp
+            )
+
+    set(HEADERS ${HEADERS}
             x64/cpu_detect.h
             x64/xbyak_abi.h
             x64/xbyak_util.h
-    )
+            )
 endif()
 
-create_target_directory_groups(common)
+create_directory_groups(${SRCS} ${HEADERS})
 
+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/common/telemetry.h

@@ -53,10 +53,10 @@ template <typename T>
 class Field : public FieldInterface {
 public:
     Field(FieldType type, std::string name, const T& value)
-        : name(std::move(name)), type(type), value(value) {}
+        : type(type), name(std::move(name)), value(value) {}
 
     Field(FieldType type, std::string name, T&& value)
-        : name(std::move(name)), type(type), value(std::move(value)) {}
+        : type(type), name(std::move(name)), value(std::move(value)) {}
 
     Field(const Field& other) : Field(other.type, other.name, other.value) {}
 

src/core/CMakeLists.txt

@@ -1,180 +1,175 @@
-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/sockets/bsd_u.cpp
-    hle/service/sockets/bsd_u.h
-    hle/service/sockets/sfdnsres.h
-    hle/service/sockets/sockets.cpp
-    hle/service/sockets/sockets.h
-    hle/service/time/time.cpp
-    hle/service/time/time.h
-    hle/service/time/time_s.cpp
-    hle/service/time/time_s.h
-    hle/service/time/time_u.cpp
-    hle/service/time/time_u.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(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/time/time_s.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
+            )
 
-create_target_directory_groups(core)
+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
+            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/time/time_s.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_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/file_sys/title_metadata.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <array>
 #include <string>
 #include <vector>
 #include "common/common_types.h"

src/core/hle/ipc.h

@@ -133,10 +133,6 @@ struct BufferDescriptorC {
         address |= static_cast<VAddr>(address_bits_32_47) << 32;
         return address;
     }
-
-    u64 Size() const {
-        return static_cast<u64>(size);
-    }
 };
 static_assert(sizeof(BufferDescriptorC) == 8, "BufferDescriptorC size is incorrect");
 

src/core/hle/ipc_helpers.h

@@ -54,10 +54,6 @@ public:
     unsigned GetCurrentOffset() const {
         return static_cast<unsigned>(index);
     }
-
-    void SetCurrentOffset(unsigned offset) {
-        index = static_cast<ptrdiff_t>(offset);
-    }
 };
 
 class RequestBuilder : public RequestHelperBase {

src/core/hle/kernel/hle_ipc.cpp

@@ -81,8 +81,13 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) {
     for (unsigned i = 0; i < command_header->num_buf_w_descriptors; ++i) {
         buffer_w_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorABW>());
     }
-
-    buffer_c_offset = rp.GetCurrentOffset() + command_header->data_size;
+    if (command_header->buf_c_descriptor_flags !=
+        IPC::CommandHeader::BufferDescriptorCFlag::Disabled) {
+        if (command_header->buf_c_descriptor_flags !=
+            IPC::CommandHeader::BufferDescriptorCFlag::OneDescriptor) {
+            UNIMPLEMENTED();
+        }
+    }
 
     // Padding to align to 16 bytes
     rp.AlignWithPadding();
@@ -112,31 +117,6 @@ void HLERequestContext::ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming) {
         ASSERT(data_payload_header->magic == Common::MakeMagic('S', 'F', 'C', 'O'));
     }
 
-    rp.SetCurrentOffset(buffer_c_offset);
-
-    // For Inline buffers, the response data is written directly to buffer_c_offset
-    // and in this case we don't have any BufferDescriptorC on the request.
-    if (command_header->buf_c_descriptor_flags >
-        IPC::CommandHeader::BufferDescriptorCFlag::InlineDescriptor) {
-        if (command_header->buf_c_descriptor_flags ==
-            IPC::CommandHeader::BufferDescriptorCFlag::OneDescriptor) {
-            buffer_c_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorC>());
-        } else {
-            unsigned num_buf_c_descriptors =
-                static_cast<unsigned>(command_header->buf_c_descriptor_flags.Value()) - 2;
-
-            // This is used to detect possible underflows, in case something is broken
-            // with the two ifs above and the flags value is == 0 || == 1.
-            ASSERT(num_buf_c_descriptors < 14);
-
-            for (unsigned i = 0; i < num_buf_c_descriptors; ++i) {
-                buffer_c_desciptors.push_back(rp.PopRaw<IPC::BufferDescriptorC>());
-            }
-        }
-    }
-
-    rp.SetCurrentOffset(data_payload_offset);
-
     command = rp.Pop<u32_le>();
     rp.Skip(1, false); // The command is actually an u64, but we don't use the high part.
 }

src/core/hle/kernel/hle_ipc.h

@@ -143,10 +143,6 @@ public:
         return buffer_b_desciptors;
     }
 
-    const std::vector<IPC::BufferDescriptorC>& BufferDescriptorC() const {
-        return buffer_c_desciptors;
-    }
-
     const std::unique_ptr<IPC::DomainMessageHeader>& GetDomainMessageHeader() const {
         return domain_message_header;
     }
@@ -204,10 +200,8 @@ private:
     std::vector<IPC::BufferDescriptorABW> buffer_a_desciptors;
     std::vector<IPC::BufferDescriptorABW> buffer_b_desciptors;
     std::vector<IPC::BufferDescriptorABW> buffer_w_desciptors;
-    std::vector<IPC::BufferDescriptorC> buffer_c_desciptors;
 
     unsigned data_payload_offset{};
-    unsigned buffer_c_offset{};
     u32_le command{};
 };
 

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 ConnectToNamedPort(Handle* out_handle, VAddr port_name_address) {
+static ResultCode ConnectToPort(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 ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr,
-                                Handle requesting_thread_handle) {
+static ResultCode LockMutex(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 ArbitrateLock(Handle holding_thread_handle, VAddr mutex_addr,
 }
 
 /// Unlock a mutex
-static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
+static ResultCode UnlockMutex(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<ArbitrateLock>, "ArbitrateLock"},
-    {0x1B, SvcWrap<ArbitrateUnlock>, "ArbitrateUnlock"},
+    {0x1A, SvcWrap<LockMutex>, "LockMutex"},
+    {0x1B, SvcWrap<UnlockMutex>, "UnlockMutex"},
     {0x1C, SvcWrap<WaitProcessWideKeyAtomic>, "WaitProcessWideKeyAtomic"},
     {0x1D, SvcWrap<SignalProcessWideKey>, "SignalProcessWideKey"},
     {0x1E, SvcWrap<GetSystemTick>, "GetSystemTick"},
-    {0x1F, SvcWrap<ConnectToNamedPort>, "ConnectToNamedPort"},
+    {0x1F, SvcWrap<ConnectToPort>, "ConnectToPort"},
     {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, "CreateJitMemory"},
-    {0x4C, nullptr, "MapJitMemory"},
+    {0x4B, nullptr, "Unknown"},
+    {0x4C, nullptr, "Unknown"},
     {0x4D, nullptr, "SleepSystem"},
     {0x4E, nullptr, "ReadWriteRegister"},
     {0x4F, nullptr, "SetProcessActivity"},

src/core/hle/service/am/applet_oe.cpp

@@ -201,76 +201,10 @@ private:
     Kernel::SharedPtr<Kernel::Event> event;
 };
 
-class IStorageAccessor final : public ServiceFramework<IStorageAccessor> {
-public:
-    explicit IStorageAccessor(std::vector<u8> buffer)
-        : ServiceFramework("IStorageAccessor"), buffer(std::move(buffer)) {
-        static const FunctionInfo functions[] = {
-            {0, &IStorageAccessor::GetSize, "GetSize"},
-            {11, &IStorageAccessor::Read, "Read"},
-        };
-        RegisterHandlers(functions);
-    }
-
-private:
-    std::vector<u8> buffer;
-
-    void GetSize(Kernel::HLERequestContext& ctx) {
-        IPC::RequestBuilder rb{ctx, 4};
-
-        rb.Push(RESULT_SUCCESS);
-        rb.Push(static_cast<u64>(buffer.size()));
-
-        LOG_DEBUG(Service, "called");
-    }
-
-    void Read(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-
-        u64 offset = rp.Pop<u64>();
-
-        const auto& output_buffer = ctx.BufferDescriptorC()[0];
-
-        ASSERT(offset + output_buffer.Size() <= buffer.size());
-
-        Memory::WriteBlock(output_buffer.Address(), buffer.data() + offset, output_buffer.Size());
-
-        IPC::RequestBuilder rb{ctx, 2};
-
-        rb.Push(RESULT_SUCCESS);
-
-        LOG_DEBUG(Service, "called");
-    }
-};
-
-class IStorage final : public ServiceFramework<IStorage> {
-public:
-    explicit IStorage(std::vector<u8> buffer)
-        : ServiceFramework("IStorage"), buffer(std::move(buffer)) {
-        static const FunctionInfo functions[] = {
-            {0, &IStorage::Open, "Open"},
-        };
-        RegisterHandlers(functions);
-    }
-
-private:
-    std::vector<u8> buffer;
-
-    void Open(Kernel::HLERequestContext& ctx) {
-        IPC::RequestBuilder rb{ctx, 2, 0, 0, 1};
-
-        rb.Push(RESULT_SUCCESS);
-        rb.PushIpcInterface<AM::IStorageAccessor>(buffer);
-
-        LOG_DEBUG(Service, "called");
-    }
-};
-
 class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
 public:
     IApplicationFunctions() : ServiceFramework("IApplicationFunctions") {
         static const FunctionInfo functions[] = {
-            {1, &IApplicationFunctions::PopLaunchParameter, "PopLaunchParameter"},
             {22, &IApplicationFunctions::SetTerminateResult, "SetTerminateResult"},
             {66, &IApplicationFunctions::InitializeGamePlayRecording,
              "InitializeGamePlayRecording"},
@@ -281,26 +215,6 @@ public:
     }
 
 private:
-    void PopLaunchParameter(Kernel::HLERequestContext& ctx) {
-        constexpr u8 data[0x88] = {
-            0xca, 0x97, 0x94, 0xc7, // Magic
-            1,    0,    0,    0,    // IsAccountSelected (bool)
-            1,    0,    0,    0,    // User Id (word 0)
-            0,    0,    0,    0,    // User Id (word 1)
-            0,    0,    0,    0,    // User Id (word 2)
-            0,    0,    0,    0     // User Id (word 3)
-        };
-
-        std::vector<u8> buffer(data, data + sizeof(data));
-
-        IPC::RequestBuilder rb{ctx, 2, 0, 0, 1};
-
-        rb.Push(RESULT_SUCCESS);
-        rb.PushIpcInterface<AM::IStorage>(buffer);
-
-        LOG_DEBUG(Service, "called");
-    }
-
     void SetTerminateResult(Kernel::HLERequestContext& ctx) {
         // Takes an input u32 Result, no output.
         // For example, in some cases official apps use this with error 0x2A2 then uses svcBreak.

src/core/hle/service/lm/lm.cpp

@@ -47,7 +47,6 @@ private:
 
     /// Log field type
     enum class Field : u8 {
-        Skip = 1,
         Message = 2,
         Line = 3,
         Filename = 4,
@@ -86,11 +85,6 @@ private:
         while (addr < end_addr) {
             const Field field{static_cast<Field>(Memory::Read8(addr++))};
             size_t length{Memory::Read8(addr++)};
-
-            if (static_cast<Field>(Memory::Read8(addr)) == Field::Skip) {
-                ++addr;
-            }
-
             switch (field) {
             case Field::Message:
                 message = Memory::ReadCString(addr, length);
@@ -105,7 +99,6 @@ private:
                 function = Memory::ReadCString(addr, length);
                 break;
             }
-
             addr += length;
         }
 

src/core/hle/service/service.cpp

@@ -26,7 +26,6 @@
 #include "core/hle/service/service.h"
 #include "core/hle/service/sm/controller.h"
 #include "core/hle/service/sm/sm.h"
-#include "core/hle/service/sockets/sockets.h"
 #include "core/hle/service/time/time.h"
 #include "core/hle/service/vi/vi.h"
 
@@ -175,7 +174,6 @@ void Init() {
     LM::InstallInterfaces(*SM::g_service_manager);
     Nvidia::InstallInterfaces(*SM::g_service_manager);
     PCTL::InstallInterfaces(*SM::g_service_manager);
-    Sockets::InstallInterfaces(*SM::g_service_manager);
     Time::InstallInterfaces(*SM::g_service_manager);
     VI::InstallInterfaces(*SM::g_service_manager);
 

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

@@ -32,12 +32,6 @@ 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);
@@ -52,7 +46,7 @@ Controller::Controller() : ServiceFramework("IpcController") {
         {0x00000001, nullptr, "ConvertDomainToSession"},
         {0x00000002, &Controller::DuplicateSession, "DuplicateSession"},
         {0x00000003, &Controller::QueryPointerBufferSize, "QueryPointerBufferSize"},
-        {0x00000004, &Controller::DuplicateSessionEx, "DuplicateSessionEx"},
+        {0x00000004, nullptr, "DuplicateSessionEx"},
     };
     RegisterHandlers(functions);
 }

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

@@ -17,7 +17,6 @@ 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/sockets/bsd_u.cpp

@@ -1,67 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/ipc_helpers.h"
-#include "core/hle/service/sockets/bsd_u.h"
-
-namespace Service {
-namespace Sockets {
-
-void BSD_U::RegisterClient(Kernel::HLERequestContext& ctx) {
-    LOG_WARNING(Service, "(STUBBED) called");
-
-    IPC::RequestBuilder rb{ctx, 3};
-
-    rb.Push(RESULT_SUCCESS);
-    rb.Push<u32>(0); // bsd errno
-}
-
-void BSD_U::Socket(Kernel::HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-
-    u32 domain = rp.Pop<u32>();
-    u32 type = rp.Pop<u32>();
-    u32 protocol = rp.Pop<u32>();
-
-    LOG_WARNING(Service, "(STUBBED) called domain=%u type=%u protocol=%u", domain, type, protocol);
-
-    u32 fd = next_fd++;
-
-    IPC::RequestBuilder rb{ctx, 4};
-
-    rb.Push(RESULT_SUCCESS);
-    rb.Push<u32>(fd);
-    rb.Push<u32>(0); // bsd errno
-}
-
-void BSD_U::Connect(Kernel::HLERequestContext& ctx) {
-    LOG_WARNING(Service, "(STUBBED) called");
-
-    IPC::RequestBuilder rb{ctx, 4};
-
-    rb.Push(RESULT_SUCCESS);
-    rb.Push<u32>(0); // ret
-    rb.Push<u32>(0); // bsd errno
-}
-
-void BSD_U::SendTo(Kernel::HLERequestContext& ctx) {
-    LOG_WARNING(Service, "(STUBBED) called");
-
-    IPC::RequestBuilder rb{ctx, 4};
-
-    rb.Push(RESULT_SUCCESS);
-    rb.Push<u32>(0); // ret
-    rb.Push<u32>(0); // bsd errno
-}
-
-BSD_U::BSD_U() : ServiceFramework("bsd:u") {
-    static const FunctionInfo functions[] = {{0, &BSD_U::RegisterClient, "RegisterClient"},
-                                             {2, &BSD_U::Socket, "Socket"},
-                                             {11, &BSD_U::SendTo, "SendTo"},
-                                             {14, &BSD_U::Connect, "Connect"}};
-    RegisterHandlers(functions);
-}
-
-} // namespace Sockets
-} // namespace Service

src/core/hle/service/sockets/bsd_u.h

@@ -1,29 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace Sockets {
-
-class BSD_U final : public ServiceFramework<BSD_U> {
-public:
-    BSD_U();
-    ~BSD_U() = default;
-
-private:
-    void RegisterClient(Kernel::HLERequestContext& ctx);
-    void Socket(Kernel::HLERequestContext& ctx);
-    void Connect(Kernel::HLERequestContext& ctx);
-    void SendTo(Kernel::HLERequestContext& ctx);
-
-    /// Id to use for the next open file descriptor.
-    u32 next_fd = 1;
-};
-
-} // namespace Sockets
-} // namespace Service

src/core/hle/service/sockets/sfdnsres.h

@@ -1,22 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace Sockets {
-
-class SFDNSRES final : public ServiceFramework<SFDNSRES> {
-public:
-    SFDNSRES() : ServiceFramework("sfdnsres") {}
-    ~SFDNSRES() = default;
-
-private:
-};
-
-} // namespace Sockets
-} // namespace Service

src/core/hle/service/sockets/sockets.cpp

@@ -1,18 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/sockets/bsd_u.h"
-#include "core/hle/service/sockets/sfdnsres.h"
-#include "core/hle/service/sockets/sockets.h"
-
-namespace Service {
-namespace Sockets {
-
-void InstallInterfaces(SM::ServiceManager& service_manager) {
-    std::make_shared<BSD_U>()->InstallAsService(service_manager);
-    std::make_shared<SFDNSRES>()->InstallAsService(service_manager);
-}
-
-} // namespace Sockets
-} // namespace Service

src/core/hle/service/sockets/sockets.h

@@ -1,16 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/service/service.h"
-
-namespace Service {
-namespace Sockets {
-
-/// Registers all Sockets services with the specified service manager.
-void InstallInterfaces(SM::ServiceManager& service_manager);
-
-} // namespace Sockets
-} // namespace Service

src/core/hle/service/time/time.cpp

@@ -2,134 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <chrono>
-#include "common/logging/log.h"
-#include "core/hle/ipc_helpers.h"
-#include "core/hle/kernel/client_port.h"
-#include "core/hle/kernel/client_session.h"
 #include "core/hle/service/time/time.h"
 #include "core/hle/service/time/time_s.h"
-#include "core/hle/service/time/time_u.h"
 
 namespace Service {
 namespace Time {
 
-class ISystemClock final : public ServiceFramework<ISystemClock> {
-public:
-    ISystemClock() : ServiceFramework("ISystemClock") {
-        static const FunctionInfo functions[] = {
-            {0, &ISystemClock::GetCurrentTime, "GetCurrentTime"},
-        };
-        RegisterHandlers(functions);
-    }
-
-private:
-    void GetCurrentTime(Kernel::HLERequestContext& ctx) {
-        const s64 time_since_epoch{std::chrono::duration_cast<std::chrono::milliseconds>(
-                                       std::chrono::system_clock::now().time_since_epoch())
-                                       .count()};
-        IPC::RequestBuilder rb{ctx, 4};
-        rb.Push(RESULT_SUCCESS);
-        rb.Push<u64>(time_since_epoch);
-        LOG_DEBUG(Service, "called");
-    }
-};
-
-class ISteadyClock final : public ServiceFramework<ISteadyClock> {
-public:
-    ISteadyClock() : ServiceFramework("ISteadyClock") {}
-};
-
-class ITimeZoneService final : public ServiceFramework<ITimeZoneService> {
-public:
-    ITimeZoneService() : ServiceFramework("ITimeZoneService") {
-        static const FunctionInfo functions[] = {
-            {0, &ITimeZoneService::GetDeviceLocationName, "GetDeviceLocationName"},
-            {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
-        };
-        RegisterHandlers(functions);
-    }
-
-private:
-    void GetDeviceLocationName(Kernel::HLERequestContext& ctx) {
-        LOG_WARNING(Service, "(STUBBED) called");
-        LocationName name{};
-        IPC::RequestBuilder rb{ctx, 11};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushRaw(name);
-    }
-
-    void ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx) {
-        IPC::RequestParser rp{ctx};
-        u64 posix_time = rp.Pop<u64>();
-
-        LOG_WARNING(Service, "(STUBBED) called, posix_time=0x%016llX", posix_time);
-
-        CalendarTime calendar_time{2018, 1, 1, 0, 0, 0};
-        CalendarAdditionalInfo additional_info{};
-        IPC::RequestBuilder rb{ctx, 10};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushRaw(calendar_time);
-        rb.PushRaw(additional_info);
-    }
-};
-
-void Module::Interface::GetStandardUserSystemClock(Kernel::HLERequestContext& ctx) {
-    auto client_port = std::make_shared<ISystemClock>()->CreatePort();
-    auto session = client_port->Connect();
-    if (session.Succeeded()) {
-        LOG_DEBUG(Service, "called, initialized ISystemClock -> session=%u",
-                  (*session)->GetObjectId());
-        IPC::RequestBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushMoveObjects(std::move(session).Unwrap());
-    } else {
-        UNIMPLEMENTED();
-    }
-}
-
-void Module::Interface::GetStandardNetworkSystemClock(Kernel::HLERequestContext& ctx) {
-    auto client_port = std::make_shared<ISystemClock>()->CreatePort();
-    auto session = client_port->Connect();
-    if (session.Succeeded()) {
-        LOG_DEBUG(Service, "called, initialized ISystemClock -> session=%u",
-                  (*session)->GetObjectId());
-        IPC::RequestBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushMoveObjects(std::move(session).Unwrap());
-    } else {
-        UNIMPLEMENTED();
-    }
-}
-
-void Module::Interface::GetStandardSteadyClock(Kernel::HLERequestContext& ctx) {
-    auto client_port = std::make_shared<ISteadyClock>()->CreatePort();
-    auto session = client_port->Connect();
-    if (session.Succeeded()) {
-        LOG_DEBUG(Service, "called, initialized ISteadyClock -> session=%u",
-                  (*session)->GetObjectId());
-        IPC::RequestBuilder rb{ctx, 2, 0, 1};
-        rb.Push(RESULT_SUCCESS);
-        rb.PushMoveObjects(std::move(session).Unwrap());
-    } else {
-        UNIMPLEMENTED();
-    }
-}
-
-void Module::Interface::GetTimeZoneService(Kernel::HLERequestContext& ctx) {
-    IPC::RequestBuilder rb{ctx, 2, 0, 0, 1};
-    rb.Push(RESULT_SUCCESS);
-    rb.PushIpcInterface<ITimeZoneService>();
-    LOG_DEBUG(Service, "called");
-}
-
-Module::Interface::Interface(std::shared_ptr<Module> time, const char* name)
-    : ServiceFramework(name), time(std::move(time)) {}
-
 void InstallInterfaces(SM::ServiceManager& service_manager) {
-    auto time = std::make_shared<Module>();
-    std::make_shared<TIME_S>(time)->InstallAsService(service_manager);
-    std::make_shared<TIME_U>(time)->InstallAsService(service_manager);
+    std::make_shared<TimeS>()->InstallAsService(service_manager);
 }
 
 } // namespace Time

src/core/hle/service/time/time.h

@@ -9,46 +9,6 @@
 namespace Service {
 namespace Time {
 
-// TODO(Rozelette) RE this structure
-struct LocationName {
-    INSERT_PADDING_BYTES(0x24);
-};
-static_assert(sizeof(LocationName) == 0x24, "LocationName structure has incorrect size");
-
-struct CalendarTime {
-    u16_le year;
-    u8 month; // Starts at 1
-    u8 day;   // Starts at 1
-    u8 hour;
-    u8 minute;
-    u8 second;
-    INSERT_PADDING_BYTES(1);
-};
-static_assert(sizeof(CalendarTime) == 0x8, "CalendarTime structure has incorrect size");
-
-// TODO(Rozelette) RE this structure
-struct CalendarAdditionalInfo {
-    INSERT_PADDING_BYTES(0x18);
-};
-static_assert(sizeof(CalendarAdditionalInfo) == 0x18,
-              "CalendarAdditionalInfo structure has incorrect size");
-
-class Module final {
-public:
-    class Interface : public ServiceFramework<Interface> {
-    public:
-        Interface(std::shared_ptr<Module> time, const char* name);
-
-        void GetStandardUserSystemClock(Kernel::HLERequestContext& ctx);
-        void GetStandardNetworkSystemClock(Kernel::HLERequestContext& ctx);
-        void GetStandardSteadyClock(Kernel::HLERequestContext& ctx);
-        void GetTimeZoneService(Kernel::HLERequestContext& ctx);
-
-    protected:
-        std::shared_ptr<Module> time;
-    };
-};
-
 /// Registers all Time services with the specified service manager.
 void InstallInterfaces(SM::ServiceManager& service_manager);
 

src/core/hle/service/time/time_s.cpp

@@ -2,19 +2,57 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#pragma once
-
+#include <chrono>
+#include "common/logging/log.h"
+#include "core/hle/ipc_helpers.h"
+#include "core/hle/kernel/client_port.h"
+#include "core/hle/kernel/client_session.h"
 #include "core/hle/service/time/time_s.h"
 
 namespace Service {
 namespace Time {
 
-TIME_S::TIME_S(std::shared_ptr<Module> time) : Module::Interface(std::move(time), "time:s") {
+class ISystemClock final : public ServiceFramework<ISystemClock> {
+public:
+    ISystemClock() : ServiceFramework("ISystemClock") {
+        static const FunctionInfo functions[] = {
+            {0, &ISystemClock::GetCurrentTime, "GetCurrentTime"},
+        };
+        RegisterHandlers(functions);
+    }
+
+private:
+    void GetCurrentTime(Kernel::HLERequestContext& ctx) {
+        const s64 time_since_epoch{std::chrono::duration_cast<std::chrono::milliseconds>(
+                                       std::chrono::system_clock::now().time_since_epoch())
+                                       .count()};
+        IPC::RequestBuilder rb{ctx, 4};
+        rb.Push(RESULT_SUCCESS);
+        rb.Push<u64>(time_since_epoch);
+        LOG_DEBUG(Service, "called");
+    }
+};
+
+void TimeS::GetStandardUserSystemClock(Kernel::HLERequestContext& ctx) {
+    auto client_port = std::make_shared<ISystemClock>()->CreatePort();
+    auto session = client_port->Connect();
+    if (session.Succeeded()) {
+        LOG_DEBUG(Service, "called, initialized ISystemClock -> session=%u",
+                  (*session)->GetObjectId());
+        IPC::RequestBuilder rb{ctx, 2, 0, 1};
+        rb.Push(RESULT_SUCCESS);
+        rb.PushMoveObjects(std::move(session).Unwrap());
+    } else {
+        UNIMPLEMENTED();
+    }
+}
+
+TimeS::TimeS() : ServiceFramework("time:s") {
     static const FunctionInfo functions[] = {
-        {0, &TIME_S::GetStandardUserSystemClock, "GetStandardUserSystemClock"},
+        {0x00000000, &TimeS::GetStandardUserSystemClock, "GetStandardUserSystemClock"},
     };
     RegisterHandlers(functions);
 }
 
 } // namespace Time
-} // namespace Service
+} // namespace Service

src/core/hle/service/time/time_s.h

@@ -4,15 +4,20 @@
 
 #pragma once
 
-#include "core/hle/service/time/time.h"
+#include "core/hle/kernel/hle_ipc.h"
+#include "core/hle/service/service.h"
 
 namespace Service {
 namespace Time {
 
-class TIME_S final : public Module::Interface {
+class TimeS final : public ServiceFramework<TimeS> {
 public:
-    explicit TIME_S(std::shared_ptr<Module> time);
+    TimeS();
+    ~TimeS() = default;
+
+private:
+    void GetStandardUserSystemClock(Kernel::HLERequestContext& ctx);
 };
 
 } // namespace Time
-} // namespace Service
+} // namespace Service

src/core/hle/service/time/time_u.cpp

@@ -1,23 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/service/time/time_u.h"
-
-namespace Service {
-namespace Time {
-
-TIME_U::TIME_U(std::shared_ptr<Module> time) : Module::Interface(std::move(time), "time:u") {
-    static const FunctionInfo functions[] = {
-        {0, &TIME_U::GetStandardUserSystemClock, "GetStandardUserSystemClock"},
-        {1, &TIME_U::GetStandardNetworkSystemClock, "GetStandardNetworkSystemClock"},
-        {2, &TIME_U::GetStandardSteadyClock, "GetStandardSteadyClock"},
-        {3, &TIME_U::GetTimeZoneService, "GetTimeZoneService"},
-    };
-    RegisterHandlers(functions);
-}
-
-} // namespace Time
-} // namespace Service

src/core/hle/service/time/time_u.h

@@ -1,18 +0,0 @@
-// Copyright 2018 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "core/hle/service/time/time.h"
-
-namespace Service {
-namespace Time {
-
-class TIME_U final : public Module::Interface {
-public:
-    explicit TIME_U(std::shared_ptr<Module> time);
-};
-
-} // namespace Time
-} // namespace Service

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) {}
-    explicit Parcel(std::vector<u8> data) : buffer(std::move(data)) {}
+    Parcel(std::vector<u8> data) : buffer(std::move(data)) {}
     virtual ~Parcel() = default;
 
     template <typename T>
@@ -47,9 +47,8 @@ public:
     }
 
     std::vector<u8> ReadBlock(size_t length) {
-        const u8* const begin = buffer.data() + read_index;
-        const u8* const end = begin + length;
-        std::vector<u8> data(begin, end);
+        std::vector<u8> data(length);
+        std::memcpy(data.data(), buffer.data() + read_index, length);
         read_index += length;
         read_index = Common::AlignUp(read_index, 4);
         return data;
@@ -102,9 +101,9 @@ public:
     }
 
 protected:
-    virtual void SerializeData() {}
+    virtual void SerializeData(){};
 
-    virtual void DeserializeData() {}
+    virtual void DeserializeData(){};
 
 private:
     struct Header {
@@ -122,7 +121,7 @@ private:
 
 class NativeWindow : public Parcel {
 public:
-    explicit NativeWindow(u32 id) : Parcel() {
+    NativeWindow(u32 id) : Parcel() {
         data.id = id;
     }
     ~NativeWindow() override = default;
@@ -138,7 +137,7 @@ private:
         u32_le process_id;
         u32_le id;
         INSERT_PADDING_BYTES(0xC);
-        std::array<u8, 8> dispdrv = {'d', 'i', 's', 'p', 'd', 'r', 'v', '\0'};
+        std::array<u8, 8> dspdrv = {'d', 's', 'p', 'd', 'r', 'v'};
         INSERT_PADDING_BYTES(8);
     };
     static_assert(sizeof(Data) == 0x28, "ParcelData has wrong size");
@@ -148,12 +147,12 @@ private:
 
 class IGBPConnectRequestParcel : public Parcel {
 public:
-    explicit IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPConnectRequestParcel() override = default;
 
-    void DeserializeData() override {
+    void DeserializeData() {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
     }
@@ -169,7 +168,7 @@ public:
 
 class IGBPConnectResponseParcel : public Parcel {
 public:
-    explicit IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() {
+    IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() {
         data.width = width;
         data.height = height;
     }
@@ -195,13 +194,12 @@ private:
 
 class IGBPSetPreallocatedBufferRequestParcel : public Parcel {
 public:
-    explicit IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer)
-        : Parcel(buffer) {
+    IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPSetPreallocatedBufferRequestParcel() override = default;
 
-    void DeserializeData() override {
+    void DeserializeData() {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
         ASSERT(data.graphic_buffer_length == sizeof(IGBPBuffer));
@@ -233,12 +231,12 @@ protected:
 
 class IGBPDequeueBufferRequestParcel : public Parcel {
 public:
-    explicit IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPDequeueBufferRequestParcel() override = default;
 
-    void DeserializeData() override {
+    void DeserializeData() {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
     }
@@ -256,7 +254,7 @@ public:
 
 class IGBPDequeueBufferResponseParcel : public Parcel {
 public:
-    explicit IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {}
+    IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {}
     ~IGBPDequeueBufferResponseParcel() override = default;
 
 protected:
@@ -273,12 +271,12 @@ protected:
 
 class IGBPRequestBufferRequestParcel : public Parcel {
 public:
-    explicit IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPRequestBufferRequestParcel() override = default;
 
-    void DeserializeData() override {
+    void DeserializeData() {
         std::u16string token = ReadInterfaceToken();
         slot = Read<u32_le>();
     }
@@ -288,7 +286,7 @@ public:
 
 class IGBPRequestBufferResponseParcel : public Parcel {
 public:
-    explicit IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {}
+    IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {}
     ~IGBPRequestBufferResponseParcel() override = default;
 
 protected:
@@ -309,12 +307,12 @@ protected:
 
 class IGBPQueueBufferRequestParcel : public Parcel {
 public:
-    explicit IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
+    IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
         Deserialize();
     }
     ~IGBPQueueBufferRequestParcel() override = default;
 
-    void DeserializeData() override {
+    void DeserializeData() {
         std::u16string token = ReadInterfaceToken();
         data = Read<Data>();
     }
@@ -332,7 +330,7 @@ public:
 
 class IGBPQueueBufferResponseParcel : public Parcel {
 public:
-    explicit IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() {
+    IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() {
         data.width = width;
         data.height = height;
     }
@@ -358,7 +356,7 @@ private:
 
 class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> {
 public:
-    explicit IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger)
+    IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger)
         : ServiceFramework("IHOSBinderDriver"), nv_flinger(std::move(nv_flinger)) {
         static const FunctionInfo functions[] = {
             {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"},
@@ -508,7 +506,7 @@ private:
 
 class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> {
 public:
-    explicit IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger)
+    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,6 +62,20 @@ 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()) {
@@ -81,7 +95,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));
+    program_image.resize(PageAlignSize(nro_header.file_size + nro_header.bss_size));
     file.Seek(0, SEEK_SET);
     file.ReadBytes(program_image.data(), nro_header.file_size);
 
@@ -93,18 +107,24 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
 
     // Read MOD header
     ModHeader mod_header{};
-    // Default .bss to NRO header bss size if MOD0 section doesn't exist
-    u32 bss_size{PageAlignSize(nro_header.bss_size)};
+    u32 bss_size{Memory::PAGE_SIZE}; // Default .bss to page size if MOD0 section doesn't exist
     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));
 
+    // Relocate symbols if there was a proper MOD header - This must happen after the image has been
+    // loaded into memory
+    if (has_mod_header) {
+        Relocate(program_image, nro_header.module_header_offset + mod_header.dynamic_offset,
+                 load_base);
+    }
+
     // Load codeset for current process
     codeset->name = path;
     codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));
@@ -121,11 +141,9 @@ ResultStatus AppLoader_NRO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
         return ResultStatus::Error;
     }
 
-    process = Kernel::Process::Create("main");
-
-    // Load NRO
+    // Load and relocate "main" and "sdk" NSO
     static constexpr VAddr base_addr{Memory::PROCESS_IMAGE_VADDR};
-
+    process = Kernel::Process::Create("main");
     if (!LoadNro(filepath, base_addr)) {
         return ResultStatus::ErrorInvalidFormat;
     }
@@ -134,7 +152,9 @@ 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 + sizeof(NroHeader), 48, Kernel::DEFAULT_STACK_SIZE);
+    process->Run(base_addr, 48, Kernel::DEFAULT_STACK_SIZE);
+
+    ResolveImports();
 
     is_loaded = true;
     return ResultStatus::Success;

src/core/loader/nso.cpp

@@ -88,7 +88,7 @@ static constexpr u32 PageAlignSize(u32 size) {
     return (size + Memory::PAGE_MASK) & ~Memory::PAGE_MASK;
 }
 
-VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base) {
+VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base, bool relocate) {
     FileUtil::IOFile file(path, "rb");
     if (!file.IsOpen()) {
         return {};
@@ -135,6 +135,12 @@ VAddr AppLoader_NSO::LoadNso(const std::string& path, VAddr load_base) {
     const u32 image_size{PageAlignSize(static_cast<u32>(program_image.size()) + bss_size)};
     program_image.resize(image_size);
 
+    // Relocate symbols if there was a proper MOD header - This must happen after the image has been
+    // loaded into memory
+    if (has_mod_header && relocate) {
+        Relocate(program_image, module_offset + mod_header.dynamic_offset, load_base);
+    }
+
     // Load codeset for current process
     codeset->name = path;
     codeset->memory = std::make_shared<std::vector<u8>>(std::move(program_image));
@@ -175,6 +181,8 @@ ResultStatus AppLoader_NSO::Load(Kernel::SharedPtr<Kernel::Process>& process) {
         Kernel::ResourceLimit::GetForCategory(Kernel::ResourceLimitCategory::APPLICATION);
     process->Run(Memory::PROCESS_IMAGE_VADDR, 48, Kernel::DEFAULT_STACK_SIZE);
 
+    ResolveImports();
+
     is_loaded = true;
     return ResultStatus::Success;
 }

src/core/loader/nso.h

@@ -34,7 +34,7 @@ public:
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
 
 private:
-    VAddr LoadNso(const std::string& path, VAddr load_base);
+    VAddr LoadNso(const std::string& path, VAddr load_base, bool relocate = false);
 
     std::string filepath;
 };

src/input_common/CMakeLists.txt

@@ -1,18 +1,25 @@
-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(SRCS
+            analog_from_button.cpp
+            keyboard.cpp
+            main.cpp
+            motion_emu.cpp
+            )
 
-    $<$<BOOL:${SDL2_FOUND}>:sdl/sdl.cpp sdl/sdl.h>
-)
+set(HEADERS
+            analog_from_button.h
+            keyboard.h
+            main.h
+            motion_emu.h
+            )
 
-create_target_directory_groups(input_common)
+if(SDL2_FOUND)
+    set(SRCS ${SRCS} sdl/sdl.cpp)
+    set(HEADERS ${HEADERS} sdl/sdl.h)
+endif()
 
+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 pollers;
+    return std::move(pollers);
 }
 } // namespace Polling
 } // namespace SDL

src/tests/CMakeLists.txt

@@ -1,16 +1,20 @@
-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(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
+            )
 
-create_target_directory_groups(tests)
+set(HEADERS
+            core/arm/arm_test_common.h
+            )
 
+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,19 +1,23 @@
-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(SRCS
+            renderer_base.cpp
+            renderer_opengl/gl_shader_util.cpp
+            renderer_opengl/gl_state.cpp
+            renderer_opengl/renderer_opengl.cpp
+            video_core.cpp
+            )
 
-create_target_directory_groups(video_core)
+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_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,84 +3,83 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-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(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
+            )
 
 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/*)
 
-qt5_wrap_ui(UI_HDRS ${UIS})
+create_directory_groups(${SRCS} ${HEADERS} ${UIS})
 
-target_sources(yuzu
-    PRIVATE
-        ${ICONS}
-        ${THEMES}
-        ${UI_HDRS}
-        ${UIS}
-)
+if (Qt5_FOUND)
+    qt5_wrap_ui(UI_HDRS ${UIS})
+else()
+    qt4_wrap_ui(UI_HDRS ${UIS})
+endif()
 
 if (APPLE)
     set(MACOSX_ICON "../../dist/yuzu.icns")
     set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    target_sources(yuzu PRIVATE ${MACOSX_ICON})
-    set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
+    add_executable(yuzu MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON} ${ICONS})
     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

@@ -1,8 +1,12 @@
 #include <QApplication>
 #include <QHBoxLayout>
 #include <QKeyEvent>
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+// Required for screen DPI information
 #include <QScreen>
 #include <QWindow>
+#endif
 
 #include "common/microprofile.h"
 #include "common/scm_rev.h"
@@ -15,7 +19,8 @@
 #include "input_common/motion_emu.h"
 #include "yuzu/bootmanager.h"
 
-EmuThread::EmuThread(GRenderWindow* render_window) : render_window(render_window) {}
+EmuThread::EmuThread(GRenderWindow* render_window)
+    : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
 
 void EmuThread::run() {
     render_window->MakeCurrent();
@@ -115,13 +120,15 @@ GRenderWindow::~GRenderWindow() {
 
 void GRenderWindow::moveContext() {
     DoneCurrent();
-
+// We need to move GL context to the swapping thread in Qt5
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
     // If the thread started running, move the GL Context to the new thread. Otherwise, move it
     // back.
     auto thread = (QThread::currentThread() == qApp->thread() && emu_thread != nullptr)
                       ? emu_thread
                       : qApp->thread();
     child->context()->moveToThread(thread);
+#endif
 }
 
 void GRenderWindow::SwapBuffers() {
@@ -184,8 +191,12 @@ QByteArray GRenderWindow::saveGeometry() {
 }
 
 qreal GRenderWindow::windowPixelRatio() {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     // windowHandle() might not be accessible until the window is displayed to screen.
     return windowHandle() ? windowHandle()->screen()->devicePixelRatio() : 1.0f;
+#else
+    return 1.0f;
+#endif
 }
 
 void GRenderWindow::closeEvent(QCloseEvent* event) {
@@ -288,7 +299,9 @@ void GRenderWindow::OnEmulationStopping() {
 void GRenderWindow::showEvent(QShowEvent* event) {
     QWidget::showEvent(event);
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     // windowHandle() is not initialized until the Window is shown, so we connect it here.
-    connect(windowHandle(), &QWindow::screenChanged, this, &GRenderWindow::OnFramebufferSizeChanged,
-            Qt::UniqueConnection);
+    connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this,
+            SLOT(OnFramebufferSizeChanged()), Qt::UniqueConnection);
+#endif
 }

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() const {
+    bool IsRunning() {
         return running;
     }
 
@@ -68,12 +68,12 @@ public:
     void RequestStop() {
         stop_run = true;
         SetRunning(false);
-    }
+    };
 
 private:
-    bool exec_step = false;
-    bool running = false;
-    std::atomic<bool> stop_run{false};
+    bool exec_step;
+    bool running;
+    std::atomic<bool> stop_run;
     std::mutex running_mutex;
     std::condition_variable running_cv;
 

src/yuzu/configuration/configure.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>461</width>
+    <width>740</width>
     <height>500</height>
    </rect>
   </property>

src/yuzu/configuration/configure_input.ui

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

src/yuzu/configuration/configure_system.cpp

@@ -72,6 +72,5 @@ void ConfigureSystem::refreshConsoleID() {
     if (reply == QMessageBox::No)
         return;
     u64 console_id{};
-    ui->label_console_id->setText(
-        tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper()));
+    ui->label_console_id->setText("Console ID: 0x" + QString::number(console_id, 16).toUpper());
 }

src/yuzu/debugger/profiler.cpp

@@ -74,7 +74,7 @@ QAction* MicroProfileDialog::toggleViewAction() {
         toggle_view_action = new QAction(windowTitle(), this);
         toggle_view_action->setCheckable(true);
         toggle_view_action->setChecked(isVisible());
-        connect(toggle_view_action, &QAction::toggled, this, &MicroProfileDialog::setVisible);
+        connect(toggle_view_action, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
     }
 
     return toggle_view_action;
@@ -107,8 +107,7 @@ MicroProfileWidget::MicroProfileWidget(QWidget* parent) : QWidget(parent) {
     MicroProfileSetDisplayMode(1); // Timers screen
     MicroProfileInitUI();
 
-    connect(&update_timer, &QTimer::timeout, this,
-            static_cast<void (MicroProfileWidget::*)()>(&MicroProfileWidget::update));
+    connect(&update_timer, SIGNAL(timeout()), SLOT(update()));
 }
 
 void MicroProfileWidget::paintEvent(QPaintEvent* ev) {

src/yuzu/game_list.cpp

@@ -114,7 +114,8 @@ GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} {
     edit_filter->setPlaceholderText(tr("Enter pattern to filter"));
     edit_filter->installEventFilter(keyReleaseEater);
     edit_filter->setClearButtonEnabled(true);
-    connect(edit_filter, &QLineEdit::textChanged, parent, &GameList::onTextChanged);
+    connect(edit_filter, SIGNAL(textChanged(const QString&)), parent,
+            SLOT(onTextChanged(const QString&)));
     label_filter_result = new QLabel;
     button_filter_close = new QToolButton(this);
     button_filter_close->setText("X");
@@ -123,7 +124,7 @@ GameList::SearchField::SearchField(GameList* parent) : QWidget{parent} {
                                        "#000000; font-weight: bold; background: #F0F0F0; }"
                                        "QToolButton:hover{ border: none; padding: 0px; color: "
                                        "#EEEEEE; font-weight: bold; background: #E81123}");
-    connect(button_filter_close, &QToolButton::clicked, parent, &GameList::onFilterCloseClicked);
+    connect(button_filter_close, SIGNAL(clicked()), parent, SLOT(onFilterCloseClicked()));
     layout_filter->setSpacing(10);
     layout_filter->addWidget(label_filter);
     layout_filter->addWidget(edit_filter);
@@ -136,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 haystack String that gets checked if it contains all words of the userinput string
- * @param userinput String containing all words getting checked
+ * @param String that gets checked if it contains all words of the userinput string
+ * @param 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) override;
+            bool eventFilter(QObject* obj, QEvent* event);
         };
         QHBoxLayout* layout_filter = nullptr;
         QTreeView* tree_view = nullptr;

src/yuzu/hotkeys.cpp

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

src/yuzu/main.cpp

@@ -86,6 +86,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
 
     setWindowTitle(QString("yuzu %1| %2-%3")
                        .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
+    setWindowIcon(QIcon(QStringLiteral(":/icons/yuzu.png")));
     show();
 
     game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan);
@@ -175,7 +176,7 @@ void GMainWindow::InitializeRecentFileMenuActions() {
     for (int i = 0; i < max_recent_files_item; ++i) {
         actions_recent_files[i] = new QAction(this);
         actions_recent_files[i]->setVisible(false);
-        connect(actions_recent_files[i], &QAction::triggered, this, &GMainWindow::OnMenuRecentFile);
+        connect(actions_recent_files[i], SIGNAL(triggered()), this, SLOT(OnMenuRecentFile()));
 
         ui.menu_recent_files->addAction(actions_recent_files[i]);
     }
@@ -190,10 +191,10 @@ void GMainWindow::InitializeHotkeys() {
     RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence::Cancel, Qt::ApplicationShortcut);
     LoadHotkeys();
 
-    connect(GetHotkey("Main Window", "Load File", this), &QShortcut::activated, this,
-            &GMainWindow::OnMenuLoadFile);
-    connect(GetHotkey("Main Window", "Start Emulation", this), &QShortcut::activated, this,
-            &GMainWindow::OnStartGame);
+    connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this,
+            SLOT(OnMenuLoadFile()));
+    connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
+            SLOT(OnStartGame()));
     connect(GetHotkey("Main Window", "Fullscreen", render_window), &QShortcut::activated,
             ui.action_Fullscreen, &QAction::trigger);
     connect(GetHotkey("Main Window", "Fullscreen", render_window), &QShortcut::activatedAmbiguously,
@@ -245,14 +246,13 @@ void GMainWindow::RestoreUIState() {
 }
 
 void GMainWindow::ConnectWidgetEvents() {
-    connect(game_list, &GameList::GameChosen, this, &GMainWindow::OnGameListLoadFile);
-    connect(game_list, &GameList::OpenSaveFolderRequested, this,
-            &GMainWindow::OnGameListOpenSaveFolder);
+    connect(game_list, SIGNAL(GameChosen(QString)), this, SLOT(OnGameListLoadFile(QString)));
+    connect(game_list, SIGNAL(OpenSaveFolderRequested(u64)), this,
+            SLOT(OnGameListOpenSaveFolder(u64)));
 
-    connect(this, &GMainWindow::EmulationStarting, render_window,
-            &GRenderWindow::OnEmulationStarting);
-    connect(this, &GMainWindow::EmulationStopping, render_window,
-            &GRenderWindow::OnEmulationStopping);
+    connect(this, SIGNAL(EmulationStarting(EmuThread*)), render_window,
+            SLOT(OnEmulationStarting(EmuThread*)));
+    connect(this, SIGNAL(EmulationStopping()), render_window, SLOT(OnEmulationStopping()));
 
     connect(&status_bar_update_timer, &QTimer::timeout, this, &GMainWindow::UpdateStatusBar);
 }
@@ -399,17 +399,17 @@ void GMainWindow::BootGame(const QString& filename) {
     render_window->moveContext();
     emu_thread->start();
 
-    connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
+    connect(render_window, SIGNAL(Closed()), this, SLOT(OnStopGame()));
     // BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
     // before the CPU continues
-    connect(emu_thread.get(), &EmuThread::DebugModeEntered, registersWidget,
-            &RegistersWidget::OnDebugModeEntered, Qt::BlockingQueuedConnection);
-    connect(emu_thread.get(), &EmuThread::DebugModeEntered, waitTreeWidget,
-            &WaitTreeWidget::OnDebugModeEntered, Qt::BlockingQueuedConnection);
-    connect(emu_thread.get(), &EmuThread::DebugModeLeft, registersWidget,
-            &RegistersWidget::OnDebugModeLeft, Qt::BlockingQueuedConnection);
-    connect(emu_thread.get(), &EmuThread::DebugModeLeft, waitTreeWidget,
-            &WaitTreeWidget::OnDebugModeLeft, Qt::BlockingQueuedConnection);
+    connect(emu_thread.get(), SIGNAL(DebugModeEntered()), registersWidget,
+            SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection);
+    connect(emu_thread.get(), SIGNAL(DebugModeEntered()), waitTreeWidget,
+            SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection);
+    connect(emu_thread.get(), SIGNAL(DebugModeLeft()), registersWidget, SLOT(OnDebugModeLeft()),
+            Qt::BlockingQueuedConnection);
+    connect(emu_thread.get(), SIGNAL(DebugModeLeft()), waitTreeWidget, SLOT(OnDebugModeLeft()),
+            Qt::BlockingQueuedConnection);
 
     // Update the GUI
     registersWidget->OnDebugModeEntered();
@@ -438,7 +438,7 @@ void GMainWindow::ShutdownGame() {
     emu_thread = nullptr;
 
     // The emulation is stopped, so closing the window or not does not matter anymore
-    disconnect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
+    disconnect(render_window, SIGNAL(Closed()), this, SLOT(OnStopGame()));
 
     // Update the GUI
     ui.action_Start->setEnabled(false);
@@ -549,7 +549,8 @@ void GMainWindow::OnStartGame() {
     emu_thread->SetRunning(true);
     qRegisterMetaType<Core::System::ResultStatus>("Core::System::ResultStatus");
     qRegisterMetaType<std::string>("std::string");
-    connect(emu_thread.get(), &EmuThread::ErrorThrown, this, &GMainWindow::OnCoreError);
+    connect(emu_thread.get(), SIGNAL(ErrorThrown(Core::System::ResultStatus, std::string)), this,
+            SLOT(OnCoreError(Core::System::ResultStatus, std::string)));
 
     ui.action_Start->setEnabled(false);
     ui.action_Start->setText(tr("Continue"));

src/yuzu/util/spinbox.cpp

@@ -39,7 +39,7 @@ CSpinBox::CSpinBox(QWidget* parent)
     // TODO: Might be nice to not immediately call the slot.
     //       Think of an address that is being replaced by a different one, in which case a lot
     //       invalid intermediate addresses would be read from during editing.
-    connect(lineEdit(), &QLineEdit::textEdited, this, &CSpinBox::OnEditingFinished);
+    connect(lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(OnEditingFinished()));
 
     UpdateText();
 }

src/yuzu_cmd/CMakeLists.txt

@@ -1,18 +1,21 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
-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
-)
+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
+            )
 
-create_target_directory_groups(yuzu-cmd)
+create_directory_groups(${SRCS} ${HEADERS})
 
+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)