pcv + better oob for hle

ga
bsd:s and bsd:u enforce socket() distinctions
2026-08-15 13:16:43 +00:00 · 2026-08-15 09:25:52 +00:00 · 2026-08-15 08:53:05 +00:00 · 2026-08-15 08:43:06 +00:00 · 2026-08-15 08:17:38 +00:00 · 2026-08-12 18:10:24 +02:00
83 changed files with 1140 additions and 725 deletions
@@ -1,9 +1,9 @@
 name: tx-pull

 on:
-  #  tuesday, saturday at 2pm
+  #  monday at 4pm
  schedule:
-    - cron: '0 14 * * 2,6'
+    - cron: '0 16 * * 1'
  workflow_dispatch:

 jobs:
@@ -3,7 +3,7 @@ description: File a bug report
 body:
  - type: markdown
    attributes:
-      value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with yuzu.
+      value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with Eden.
  - type: checkboxes
    attributes:
      label: Is there an existing issue for this?
@@ -43,7 +43,7 @@ body:
    id: log
    attributes:
      label: Log File
-      description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://yuzu-emu.org/help/reference/log-files).
+      description: A log file will help our developers to better diagnose and fix the issue. Instructions can be found [here](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/HowToAccessLogs.md).
    validations:
      required: true
  - type: textarea
@@ -4,7 +4,7 @@ labels: "request"
 body:
  - type: markdown
    attributes:
-      value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make yuzu better.
+      value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make Eden better.
  - type: checkboxes
    attributes:
      label: Is there an existing issue for this?
@@ -23,6 +23,6 @@ body:
    id: why-feature
    attributes:
      label: Why would this feature be useful?
-      description: A brief description of why this feature would make yuzu better.
+      description: A brief description of why this feature would make Eden better.
    validations:
      required: true
@@ -28,23 +28,23 @@ if (NOT DEFINED ARCHITECTURE)
 endif()

 # Needed for FFmpeg w/ VAAPI and DRM
-if (PLATFORM_OPENBSD)
+if (OPENBSD)
    # OpenBSD 7.8 broke libcxx when upgrading, so we must define the PSTL backend manually
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R6/lib")
-elseif (PLATFORM_NETBSD)
+elseif (NETBSD)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R7/lib")
 endif()

 # NetBSD: Fun for the whole family!
-if (PLATFORM_NETBSD)
+if (NETBSD)
    set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()

-cmake_dependent_option(YUZU_STATIC_ROOM "Build a static room executable only (CI only)" OFF "PLATFORM_LINUX" OFF)
+cmake_dependent_option(YUZU_STATIC_ROOM "Build a static room executable only (CI only)" OFF "LINUX" OFF)
 if (YUZU_STATIC_ROOM)
    set(YUZU_ROOM ON)
    set(YUZU_ROOM_STANDALONE ON)
@@ -79,6 +79,7 @@ set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundl
 cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)

 option(ENABLE_DEBUG_TOOLS "Enable debugging tools (maxwell disassembler, SPIRV translator, etc)" OFF)
+option(ENABLE_WERROR "Enable -Werror diagnostics" ON)

 # non-linux bundled qt are static
 if (YUZU_USE_BUNDLED_QT AND (APPLE OR NOT UNIX))
@@ -157,6 +158,19 @@ if (CXX_CLANG_CL)
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c99-extensions>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++17-compat>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat-reserved-user-defined-literal>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat-deprecated-writable-strings>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat-pedantic>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++11-compat>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++0x-compat>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++98-c++11-compat-binary-literal>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++98-compat-pedantic>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c++98-compat>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c99-compat>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c98-compat>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-c99-extensions>
        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>)
    # REQUIRED CPU features IN Windows-amd64
    if (ARCHITECTURE_x86_64)
@@ -210,7 +224,7 @@ endif()

 # ffmpeg
 option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external source" "${SOLARIS}" "NOT WIN32 AND NOT ANDROID" OFF)

 # sirit
 set(BUNDLED_SIRIT_DEFAULT OFF)
@@ -221,7 +235,7 @@ endif()
 option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})

 # FreeBSD 15+ has libusb, versions below should disable it
-cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR PLATFORM_FREEBSD OR APPLE" OFF)
+cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR LINUX OR FREEBSD OR APPLE" OFF)

 cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT (WIN32 AND ARCHITECTURE_arm64) AND NOT APPLE" OFF)
 mark_as_advanced(FORCE ENABLE_OPENGL)
@@ -235,7 +249,7 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")

 # Install udev rules on Linux (mainly for gyros)
 # Only acts on joysticks and nothing else.
-cmake_dependent_option(YUZU_INSTALL_UDEV_RULES "Install udev rules for gyro access" OFF "PLATFORM_LINUX" OFF)
+cmake_dependent_option(YUZU_INSTALL_UDEV_RULES "Install udev rules for gyro access" OFF "LINUX" OFF)

 option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)

@@ -248,7 +262,7 @@ cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable"

 cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF)

-cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR PLATFORM_LINUX" OFF)
+cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)

 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)
 set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")
@@ -258,7 +272,7 @@ cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib"
 option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)

 set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
-if (EXT_DEFAULT OR PLATFORM_SUN OR PLATFORM_OPENBSD)
+if (EXT_DEFAULT OR SOLARIS OR OPENBSD)
    set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL ON)
 endif()

@@ -281,7 +295,7 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE
    endif()
 endif()

-if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
+if (ARCHITECTURE_arm64 AND (ANDROID OR LINUX))
    set(HAS_NCE 1)
    add_compile_definitions(HAS_NCE=1)
 endif()
@@ -290,7 +304,7 @@ if (YUZU_ROOM)
    add_compile_definitions(YUZU_ROOM)
 endif()

-if (UNIX AND NOT (PLATFORM_LINUX OR WIN32))
+if (UNIX AND NOT (LINUX OR WIN32))
    if(CXX_APPLE OR CXX_CLANG)
        # libc++ has stop_token and jthread as experimental
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
@@ -404,7 +418,7 @@ if (Boost_ADDED)

    if (NOT MSVC OR CXX_CLANG)
        # boost sucks
-        if (PLATFORM_SUN)
+        if (SOLARIS)
            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-pthreads>)
        endif()

@@ -508,9 +522,9 @@ elseif (WIN32)
        # PSAPI is the Process Status API
        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version crypt32 rpcrt4 gdi32 wldap32 mswsock)
    endif()
-elseif (PLATFORM_MANAGARM)
+elseif (MANAGARM)
    set(PLATFORM_LIBRARIES iconv intl)
-elseif (PLATFORM_HAIKU)
+elseif (HAIKUOS)
    # Haiku is so special :)
    set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
@@ -604,7 +618,7 @@ if (ENABLE_QT)

    # Best practice is to ask for all components at once, so they are from the same version
    set(YUZU_QT_COMPONENTS Core Widgets Charts Concurrent Gui)
-    if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
+    if (LINUX OR FREEBSD)
        list(APPEND YUZU_QT_COMPONENTS DBus)
        # yes Qt, we get it
        set(QT_NO_PRIVATE_MODULE_WARNING ON)
@@ -13,7 +13,7 @@ find_package_handle_standard_args(Opus
    VERSION_VAR OPUS_VERSION
 )

-if (PLATFORM_MSYS)
+if (MSYS2)
    FixMsysPath(PkgConfig::OPUS)
 endif()

@@ -14,7 +14,7 @@ find_package_handle_standard_args(enet
    VERSION_VAR ENET_VERSION
 )

-if (PLATFORM_MSYS)
+if (MSYS2)
    FixMsysPath(PkgConfig::ENET)
 endif()

@@ -14,7 +14,7 @@ find_package_handle_standard_args(libusb
    VERSION_VAR LIBUSB_VERSION
 )

-if (PLATFORM_MSYS)
+if (MSYS2)
    FixMsysPath(PkgConfig::LIBUSB)
 endif()

@@ -13,7 +13,7 @@ else()
    find_package(PkgConfig QUIET)
    pkg_search_module(LZ4 QUIET IMPORTED_TARGET liblz4)

-    if (PLATFORM_MSYS)
+    if (MSYS2)
        FixMsysPath(PkgConfig::LZ4)
    endif()

@@ -22,9 +22,13 @@ Eden is free, open-source, copyleft software, licensed under the terms of the [G

 - No LLM or AI usage, *period*, for patches, pull requests, issues, comments, debugging, brainstorming, etc.
  - For details on why, see the [detailed AI policy](docs/policies/AI.md).
+- Usage of any form of profanity or otherwise unsavory language is generally discouraged.
+  - This is primarily because it rarely helps to actually understand what's going on.
+  - Remember that your comments should be focused and actually address what's happening. With very few exceptions, expletives are actively detrimental at best.
 - New code must follow the same general style as the surrounding codebase. Exceptions may be granted in certain cases.
 - Maintainers reserve the right to change your patches and pull requests at will. We will try to avoid this.
-  - You should respect all decisions made by the [code owners](docs/CODEOWNERS) in your particular subsystem. If you feel they are overstepping or are incorrect, don't be afraid to stand your ground!
+  - You should generally respect all decisions made by the [code owners](docs/CODEOWNERS) in your particular subsystem.
+  - However, if you feel they are overstepping or are incorrect, don't be afraid to stand your ground! Maintainers are not always correct.
 - While we do *not* adhere to the terms of a formal code of conduct, you will generally be expected to respect other developers, contributors, and community members.
 - You **must** have basic knowledge of [Git](https://git-scm.com/learn). Knowing how to manage your branches and follow proper fork policies is a necessity.

@@ -46,6 +46,8 @@ These options control dependencies.
 - `YUZU_INSTALL_UDEV_RULES` (OFF) Install udev rules to enable hidraw access
  - Needed for gyroscopes
  - Only available on Linux
+- `ENABLE_DEBUG_TOOLS` (OFF) Enables debugging and development tools, see [tools](../tools/README.md).
+- `ENABLE_WERROR` (ON) Enables warnings as errors (-Werror).

 ### Flavors

@@ -34,7 +34,7 @@ Everyone has their own way of viewing good/bad C++ practices, my general outline
  - The reason is because the project has `-fno-rtti` disabled by default, due to the costs of dynamic polymorphism.
 - Always copy-on-value for objects with `sizeof(void *) >= sizeof(T) * 2`, i.e objects sized as 2 pointers or less, for bigger objects you can use ref/pointer as usual.
 - Try using move semantics instead of references, whenever possible.
- Remember function parameters are extremelly cheap as fuck, don't be afraid to place upto 8 parameters on a given function.
+- Function parameters are cheap. Don't be afraid to use as many as needed (API usability permitting).
 - Don't save a reference in structures of a parent object, i.e:

    ```c++
@@ -164,7 +164,7 @@ if (NOT ANDROID)
        AddJsonPackage(sdl3)
    else()
        message(STATUS "Using bundled SDL3")
-        if (PLATFORM_FREEBSD)
+        if (FREEBSD)
            set(BUILD_SHARED_LIBS ON)
        endif()
        AddJsonPackage(sdl3-ci)
@@ -1,45 +1,46 @@
-# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later

 ## DetectPlatform ##

-# This is a small helper that sets PLATFORM_<platform> variables for various
+# This is a small helper that sets platform variables for various
 # operating systems and distributions. Note that Apple, Windows, Android, etc.
 # are not covered, as CMake already does that for us.

 # It also sets CXX_<compiler> for the C++ compiler.

-# Furthermore, some platforms have really silly requirements/quirks, so this
-# also does a few of those.
-
 # This module contains contributions from the Eden Emulator Project,
 # notably from crueter and Lizzie.

 if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
-    set(PLATFORM_SUN ON)
+    set(SOLARIS ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenOrbis")
-    set(PLATFORM_PS4 ON)
+    set(OPENORBIS ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "managarm")
-    set(PLATFORM_MANAGARM ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-    set(PLATFORM_FREEBSD ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-    set(PLATFORM_OPENBSD ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
-    set(PLATFORM_NETBSD ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "DragonFly")
-    set(PLATFORM_DRAGONFLYBSD ON)
+    set(MANAGARM ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
-    set(PLATFORM_HAIKU ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    set(PLATFORM_LINUX ON)
+    set(HAIKUOS ON)
+endif()
+
+# BSD
+if (DEFINED BSD)
+    if ("${BSD}" STREQUAL "DragonFlyBSD")
+        set(DRAGONFLYBSD ON)
+    elseif ("${BSD}" STREQUAL "FreeBSD")
+        set(FREEBSD ON)
+    elseif ("${BSD}" STREQUAL "OpenBSD")
+        set(OPENBSD ON)
+    elseif ("${BSD}" STREQUAL "NetBSD")
+        set(NETBSD ON)
+    endif()
 endif()

 # dumb heuristic to detect msys2
 if (CMAKE_COMMAND MATCHES "msys64")
-    set(PLATFORM_MSYS ON)
+    set(MSYS2 ON)
 endif()

+# compiler checks
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    set(CXX_CLANG ON)
    if (MSVC)
@@ -47,8 +48,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
    endif()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
    set(CXX_GCC ON)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    set(CXX_CL ON)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
    set(CXX_ICC ON)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
@@ -61,37 +60,13 @@ if(MINGW AND CXX_CLANG)
    set(CMAKE_SYSTEM_VERSION 10.0.0)
 endif()

-# NB: this does not account for SPARC
-if (PLATFORM_SUN)
-    # Terrific OpenIndiana pkg shenanigans
-    list(APPEND CMAKE_PREFIX_PATH
-        "${CMAKE_SYSROOT}/usr/lib/qt/6.6/lib/amd64/cmake")
-    list(APPEND CMAKE_MODULE_PATH
-        "${CMAKE_SYSROOT}/usr/lib/qt/6.6/lib/amd64/cmake")
-
-    # Amazing - absolutely incredible
-    list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SYSROOT}/usr/lib/amd64/cmake")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SYSROOT}/usr/lib/amd64/cmake")
-
-    # For some mighty reason, doing a normal release build sometimes
-    # may not trigger the proper -O3 switch to materialize
-    if (CMAKE_BUILD_TYPE MATCHES "Release")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
-    endif()
-    if (CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-    endif()
-endif()
-
 # MSYS2 utilities

 # Sometimes, PkgConfig modules will incorrectly reference / when CMake
 # wants you to reference it as C:/msys64/. This function corrects that.
 # Example in a Find module:
 #[[
-    if (PLATFORM_MSYS)
+    if (MSYS2)
        FixMsysPath(PkgConfig::OPUS)
    endif()
 ]]
@@ -116,41 +91,9 @@ function(FixMsysPath target)
        INTERFACE_INCLUDE_DIRECTORIES ${include_dir})
 endfunction()

-# MSYSTEM handling + program_path
-if (PLATFORM_MSYS)
-    # really, really dumb heuristic to detect what environment we are in
-    macro(system var)
-        if (CMAKE_COMMAND MATCHES ${var})
-            set(MSYSTEM ${var})
-        endif()
-    endmacro()
-
-    system(mingw64)
-    system(clang64)
-    system(clangarm64)
-    system(ucrt64)
-
-    if (NOT DEFINED MSYSTEM)
-        set(MSYSTEM msys2)
-    endif()
-
-    # We generally want to prioritize environment-specific binaries if possible
-    # some, like autoconf, are not present on environments besides msys2 though
-    set(CMAKE_PROGRAM_PATH C:/msys64/${MSYSTEM}/bin C:/msys64/usr/bin)
-    set(ENV{PKG_CONFIG_PATH} C:/msys64/${MSYSTEM}/lib/pkgconfig)
-endif()
-
-# This saves a truly ridiculous amount of time during linking
-# In my tests, without this, Eden takes 2 mins, with this, it takes 3-5 seconds
-# or on GitHub Actions, 10 minutes -> 3 seconds
+# Saves linking time
 if (MINGW)
    set(MINGW_FLAGS "-Wl,--strip-all -Wl,--gc-sections")
    set(CMAKE_EXE_LINKER_FLAGS_RELEASE
        "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${MINGW_FLAGS}")
 endif()
-
-# awesome
-if (PLATFORM_FREEBSD OR PLATFORM_DRAGONFLYBSD)
-    set(CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/local/lib")
-endif()
@@ -56,7 +56,7 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG)
    endif()
 endif()

-if (PLATFORM_PS4 OR PLATFORM_MANAGARM)
+if (OPENORBIS OR MANAGARM)
    # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it
    list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
 elseif (ANDROID)
@@ -75,7 +75,7 @@ elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID)
    if(X11_FOUND)
        if (NOT APPLE)
            # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
-            if(PLATFORM_SUN)
+            if(SOLARIS)
                list(APPEND FFmpeg_HWACCEL_LIBRARIES
                    X11
                    "${CMAKE_SYSROOT}/usr/lib/xorg/amd64/libdrm.so")
@@ -158,7 +158,7 @@ elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING AND NOT ANDROID)
    endif()
 endif()

-if (PLATFORM_PS4)
+if (OPENORBIS)
    list(APPEND FFmpeg_CROSS_COMPILE_LIBS
        -lkernel
        -lSceUserService
@@ -172,7 +172,7 @@ if (PLATFORM_PS4)
        --extra-cxxflags=${CMAKE_SYSROOT}/usr/include
        --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
    )
-elseif (PLATFORM_MANAGARM)
+elseif (MANAGARM)
    # Required for proper stuff
    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
        --disable-pthreads
@@ -299,7 +299,7 @@ else()
    set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})

    # BSD make or Solaris make don't support ffmpeg make-j8
-    if (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD)
+    if (LINUX OR ANDROID OR APPLE OR WIN32 OR FREEBSD)
        set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS})
    else()
        set(FFmpeg_MAKE_ARGS "")
@@ -11,7 +11,7 @@ if (NOT libusb_ADDED)
 endif()

 # TODO: *BSD fails to compile--may need different configs/symbols
-if (MINGW OR PLATFORM_LINUX OR APPLE)
+if (MINGW OR LINUX OR APPLE)
    set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE)
    set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE)

@@ -1177,7 +1177,7 @@ static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int re
   #endif

   #ifndef STBI_NO_TGA
-   // test tga last because it's a crappy test!
+   // test tga last because it's a bad test!
   if (stbi__tga_test(s))
      return stbi__tga_load(s,x,y,comp,req_comp, ri);
   #endif
@@ -7662,7 +7662,7 @@ static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
   if (stbi__hdr_info(s, x, y, comp))  return 1;
   #endif

-   // test tga last because it's a crappy test!
+   // test tga last because it's a bad test!
   #ifndef STBI_NO_TGA
   if (stbi__tga_info(s, x, y, comp))
       return 1;
@@ -155,12 +155,24 @@ else()
            $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
    endif()

+    if (ENABLE_WERROR)
+        add_compile_options(
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=all>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=extra>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=missing-declarations>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unused>)
+    else()
+        add_compile_options(
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wall>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wextra>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wmissing-declarations>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wshadow>
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wunused>
+            # Some compilers could particularly misbehave :)
+            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-error-all>)
+    endif()
    add_compile_options(
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=all>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=extra>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=missing-declarations>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unused>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-attributes>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-invalid-offsetof>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-parameter>
@@ -169,9 +181,9 @@ else()
    if (CXX_CLANG OR CXX_ICC OR CXX_APPLE) # Clang, AppleClang, or Intel C++
        if (NOT MSVC)
            add_compile_options(
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=shadow-uncaptured-local>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=implicit-fallthrough>
-                $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=type-limits>)
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Wshadow-uncaptured-local>
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Wimplicit-fallthrough>
+                $<$<COMPILE_LANGUAGE:C,CXX>:-Wtype-limits>)
        endif()
        add_compile_options(
            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-braced-scalar-init>
@@ -181,7 +193,7 @@ else()

    if (ARCHITECTURE_x86_64)
        add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>)
-        if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
+        if (LINUX OR FREEBSD)
            add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:-mtls-dialect=gnu2>)
        endif()
    endif()
@@ -222,7 +222,7 @@ if (MSVC)
    )
 else()
    target_compile_options(audio_core PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wconversion>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>)
 endif()

@@ -220,7 +220,7 @@ endif()
 if(CXX_CLANG)
    target_compile_options(common PRIVATE
        $<$<COMPILE_LANGUAGE:C,CXX>:-fsized-deallocation>
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=unreachable-code-aggressive>)
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wunreachable-code-aggressive>)
    target_compile_definitions(
        common
        PRIVATE
@@ -702,7 +702,15 @@ struct Values {

    // Controls
    InputSetting<std::array<PlayerInput, 10>> players;
-
+    Setting<bool> disable_wgi_xinput{
+        linkage, false, "disable_wgi_xinput", Category::Controls, Specialization::Default,
+// Only read/write disable_wgi_xinput on Windows platforms
+#ifdef _WIN32
+        true
+#else
+        false
+#endif
+    };
    Setting<bool> enable_raw_input{
        linkage, false, "enable_raw_input", Category::Controls, Specialization::Default,
 // Only read/write enable_raw_input on Windows platforms
@@ -388,14 +388,6 @@ add_library(core STATIC
    hle/result.h
    hle/service/acc/acc.cpp
    hle/service/acc/acc.h
-    hle/service/acc/acc_aa.cpp
-    hle/service/acc/acc_aa.h
-    hle/service/acc/acc_su.cpp
-    hle/service/acc/acc_su.h
-    hle/service/acc/acc_u0.cpp
-    hle/service/acc/acc_u0.h
-    hle/service/acc/acc_u1.cpp
-    hle/service/acc/acc_u1.h
    hle/service/acc/async_context.cpp
    hle/service/acc/async_context.h
    hle/service/acc/errors.h
@@ -768,8 +760,8 @@ add_library(core STATIC
    hle/service/mii/types/ver3_store_data.h
    hle/service/mm/mm_u.cpp
    hle/service/mm/mm_u.h
-    hle/service/mnpp/mnpp_app.cpp
-    hle/service/mnpp/mnpp_app.h
+    hle/service/mnpp/mnpp.cpp
+    hle/service/mnpp/mnpp.h
    hle/service/ncm/ncm.cpp
    hle/service/ncm/ncm.h
    hle/service/nfc/common/amiibo_crypto.cpp
@@ -1173,7 +1165,7 @@ add_library(core STATIC

 if (ENABLE_WIFI_SCAN)
    target_sources(core PRIVATE internal_network/wifi_scanner.cpp)
-    if (PLATFORM_LINUX)
+    if (LINUX)
        target_link_libraries(core PRIVATE iw)
    endif()
 else()
@@ -1199,7 +1191,7 @@ if (MSVC)
    )
 else()
    target_compile_options(core PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wconversion>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type>
        $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>)
@@ -28,7 +28,7 @@ Result CloseHandle(Core::System& system, Handle handle) {

 /// Clears the signaled state of an event or process.
 Result ResetSignal(Core::System& system, Handle handle) {
-    LOG_DEBUG(Kernel_SVC, "called handle {:#08x}", handle);
+    LOG_TRACE(Kernel_SVC, "called handle {:#08x}", handle);

    // Get the current handle table.
    const auto& handle_table = GetCurrentProcess(system.Kernel()).GetHandleTable();
@@ -21,10 +21,6 @@
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/hle/service/acc/acc.h"
-#include "core/hle/service/acc/acc_aa.h"
-#include "core/hle/service/acc/acc_su.h"
-#include "core/hle/service/acc/acc_u0.h"
-#include "core/hle/service/acc/acc_u1.h"
 #include "core/hle/service/acc/async_context.h"
 #include "core/hle/service/acc/errors.h"
 #include "core/hle/service/acc/profile_manager.h"
@@ -1244,19 +1240,416 @@ Module::Interface::Interface(std::shared_ptr<Module> module_,

 Module::Interface::~Interface() = default;

+class ACC_AA final : public Module::Interface {
+public:
+    explicit ACC_AA(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:aa") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "EnsureCacheAsync"},
+            {1, nullptr, "LoadCache"},
+            {2, nullptr, "GetDeviceAccountId"},
+            {50, nullptr, "RegisterNotificationTokenAsync"},   // 1.0.0 - 6.2.0
+            {51, nullptr, "UnregisterNotificationTokenAsync"}, // 1.0.0 - 6.2.0
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+    ~ACC_AA() override = default;
+};
+
+class ACC_SU final : public Module::Interface {
+public:
+    explicit ACC_SU(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:su") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &ACC_SU::GetUserCount, "GetUserCount"},
+            {1, &ACC_SU::GetUserExistence, "GetUserExistence"},
+            {2, &ACC_SU::ListAllUsers, "ListAllUsers"},
+            {3, &ACC_SU::ListOpenUsers, "ListOpenUsers"},
+            {4, &ACC_SU::GetLastOpenedUser, "GetLastOpenedUser"},
+            {5, &ACC_SU::GetProfile, "GetProfile"},
+            {6, nullptr, "GetProfileDigest"},
+            {50, &ACC_SU::IsUserRegistrationRequestPermitted, "IsUserRegistrationRequestPermitted"},
+            {51, &ACC_SU::TrySelectUserWithoutInteractionDeprecated, "TrySelectUserWithoutInteractionDeprecated"},
+            {52, &ACC_SU::TrySelectUserWithoutInteraction, "TrySelectUserWithoutInteraction"}, // 19.0.0+
+            {60, &ACC_SU::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"},
+            {99, nullptr, "DebugActivateOpenContextRetention"},
+            {100, nullptr, "GetUserRegistrationNotifier"},
+            {101, nullptr, "GetUserStateChangeNotifier"},
+            {102, &ACC_SU::GetBaasAccountManagerForSystemService, "GetBaasAccountManagerForSystemService"},
+            {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
+            {104, nullptr, "GetProfileUpdateNotifier"},
+            {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
+            {106, nullptr, "GetProfileSyncNotifier"},
+            {110, &ACC_SU::StoreSaveDataThumbnailSystem, "StoreSaveDataThumbnail"},
+            {111, nullptr, "ClearSaveDataThumbnail"},
+            {112, nullptr, "LoadSaveDataThumbnail"},
+            {113, nullptr, "GetSaveDataThumbnailExistence"},
+            {120, nullptr, "ListOpenUsersInApplication"},
+            {130, nullptr, "ActivateOpenContextRetention"},
+            {140, &ACC_SU::ListQualifiedUsers, "ListQualifiedUsers"},
+            {150, nullptr, "AuthenticateApplicationAsync"},
+            {151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
+            {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
+            {190, nullptr, "GetUserLastOpenedApplication"},
+            {191, nullptr, "ActivateOpenContextHolder"},
+            {200, &ACC_SU::BeginUserRegistration, "BeginUserRegistration"},
+            {201, &ACC_SU::CompleteUserRegistration, "CompleteUserRegistration"},
+            {202, nullptr, "CancelUserRegistration"},
+            {203, &ACC_SU::DeleteUser, "DeleteUser"},
+            {204, &ACC_SU::SetUserPosition, "SetUserPosition"},
+            {205, &ACC_SU::GetProfileEditor, "GetProfileEditor"},
+            {206, nullptr, "CompleteUserRegistrationForcibly"},
+            {210, nullptr, "CreateFloatingRegistrationRequest"},
+            {211, nullptr, "CreateProcedureToRegisterUserWithNintendoAccount"},
+            {212, nullptr, "ResumeProcedureToRegisterUserWithNintendoAccount"},
+            {230, nullptr, "AuthenticateServiceAsync"},
+            {250, &ACC_SU::GetBaasAccountAdministrator, "GetBaasAccountAdministrator"},
+            {290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"},
+            {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"},
+            {299, nullptr, "SuspendBackgroundDaemon"},
+            {400, nullptr, "SetPinCode"}, // 18.0.0+
+            {401, &ACC_SU::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
+            {402, nullptr, "GetPinCode"}, // 18.0.0+
+            {403, nullptr, "GetPinCodeParity"},
+            {404, nullptr, "VerifyPinCode"},
+            {405, nullptr, "IsPinCodeVerificationForbidden"},
+            {410, nullptr, "GetPinCodeErrorCount"}, // 18.0.0+
+            {411, nullptr, "ResetPinCodeErrorCount"}, // 18.0.0+
+            {412, nullptr, "IncrementPinCodeErrorCount"}, // 18.0.0+
+            {900, nullptr, "SetUserUnqualifiedForDebug"},
+            {901, nullptr, "UnsetUserUnqualifiedForDebug"},
+            {902, nullptr, "ListUsersUnqualifiedForDebug"},
+            {910, nullptr, "RefreshFirmwareSettingsForDebug"},
+            {997, nullptr, "DebugInvalidateTokenCacheForUser"},
+            {998, nullptr, "DebugSetUserStateClose"},
+            {999, nullptr, "DebugSetUserStateOpen"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+    ~ACC_SU() override = default;
+};
+
+class ACC_U0 final : public Module::Interface {
+public:
+    ACC_U0(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u0") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &ACC_U0::GetUserCount, "GetUserCount"},
+            {1, &ACC_U0::GetUserExistence, "GetUserExistence"},
+            {2, &ACC_U0::ListAllUsers, "ListAllUsers"},
+            {3, &ACC_U0::ListOpenUsers, "ListOpenUsers"},
+            {4, &ACC_U0::GetLastOpenedUser, "GetLastOpenedUser"},
+            {5, &ACC_U0::GetProfile, "GetProfile"},
+            {6, nullptr, "GetProfileDigest"}, // 3.0.0+
+            {50, &ACC_U0::IsUserRegistrationRequestPermitted, "IsUserRegistrationRequestPermitted"},
+            {51, &ACC_U0::TrySelectUserWithoutInteractionDeprecated, "TrySelectUserWithoutInteractionDeprecated"},
+            {52, &ACC_U0::TrySelectUserWithoutInteraction, "TrySelectUserWithoutInteraction"},
+            {60, &ACC_U0::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"}, // 5.0.0 - 5.1.0
+            {99, nullptr, "DebugActivateOpenContextRetention"}, // 6.0.0+
+            {100, &ACC_U0::InitializeApplicationInfo, "InitializeApplicationInfo"},
+            {101, &ACC_U0::GetBaasAccountManagerForApplication, "GetBaasAccountManagerForApplication"},
+            {102, nullptr, "AuthenticateApplicationAsync"},
+            {103, nullptr, "CheckNetworkServiceAvailabilityAsync"}, // 4.0.0+
+            {110, &ACC_U0::StoreSaveDataThumbnailApplication, "StoreSaveDataThumbnail"},
+            {111, nullptr, "ClearSaveDataThumbnail"},
+            {120, nullptr, "CreateGuestLoginRequest"},
+            {130, nullptr, "LoadOpenContext"}, // 5.0.0+
+            {131, &ACC_U0::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"}, // 6.0.0+
+            {140, &ACC_U0::InitializeApplicationInfoRestricted, "InitializeApplicationInfoRestricted"}, // 6.0.0+
+            {141, &ACC_U0::ListQualifiedUsers, "ListQualifiedUsers"}, // 6.0.0+
+            {150, &ACC_U0::IsUserAccountSwitchLocked, "IsUserAccountSwitchLocked"}, // 6.0.0+
+            {160, &ACC_U0::InitializeApplicationInfoV2, "InitializeApplicationInfoV2"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+    ~ACC_U0() override = default;
+};
+
+class ACC_U1 final : public Module::Interface {
+public:
+    ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u1") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &ACC_U1::GetUserCount, "GetUserCount"},
+            {1, &ACC_U1::GetUserExistence, "GetUserExistence"},
+            {2, &ACC_U1::ListAllUsers, "ListAllUsers"},
+            {3, &ACC_U1::ListOpenUsers, "ListOpenUsers"},
+            {4, &ACC_U1::GetLastOpenedUser, "GetLastOpenedUser"},
+            {5, &ACC_U1::GetProfile, "GetProfile"},
+            {6, nullptr, "GetProfileDigest"},
+            {50, &ACC_U1::IsUserRegistrationRequestPermitted, "IsUserRegistrationRequestPermitted"},
+            {51, &ACC_U1::TrySelectUserWithoutInteraction, "TrySelectUserWithoutInteraction"},
+            {60, &ACC_U1::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"},
+            {99, nullptr, "DebugActivateOpenContextRetention"},
+            {100, nullptr, "GetUserRegistrationNotifier"},
+            {101, nullptr, "GetUserStateChangeNotifier"},
+            {102, &ACC_U1::GetBaasAccountManagerForSystemService, "GetBaasAccountManagerForSystemService"},
+            {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
+            {104, nullptr, "GetProfileUpdateNotifier"},
+            {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
+            {106, nullptr, "GetProfileSyncNotifier"},
+            {110, &ACC_U1::StoreSaveDataThumbnailApplication, "StoreSaveDataThumbnail"},
+            {111, nullptr, "ClearSaveDataThumbnail"},
+            {112, nullptr, "LoadSaveDataThumbnail"},
+            {113, nullptr, "GetSaveDataThumbnailExistence"},
+            {120, nullptr, "ListOpenUsersInApplication"},
+            {130, nullptr, "ActivateOpenContextRetention"},
+            {140, &ACC_U1::ListQualifiedUsers, "ListQualifiedUsers"},
+            {150, nullptr, "AuthenticateApplicationAsync"},
+            {151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
+            {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
+            {190, nullptr, "GetUserLastOpenedApplication"},
+            {191, nullptr, "ActivateOpenContextHolder"},
+            {401, &ACC_U1::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
+            {402, nullptr, "GetPinCode"}, // 18.0.0+
+            {997, nullptr, "DebugInvalidateTokenCacheForUser"},
+            {998, nullptr, "DebugSetUserStateClose"},
+            {999, nullptr, "DebugSetUserStateOpen"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+    ~ACC_U1() override = default;
+};
+
+class DAUTH_0 final : public ServiceFramework<DAUTH_0> {
+public:
+    explicit DAUTH_0(Core::System& system_) : ServiceFramework{system_, "dauth:0"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "EnsureAuthenticationTokenCacheAsync"},
+            {1, nullptr, "LoadAuthenticationTokenCache"},
+            {2, nullptr, "InvalidateAuthenticationTokenCache"},
+            {3, nullptr, "IsDeviceAuthenticationTokenCacheAvailable"},
+            {10, nullptr, "EnsureEdgeTokenCacheAsync"},
+            {11, nullptr, "LoadEdgeTokenCache"},
+            {12, nullptr, "InvalidateEdgeTokenCache"},
+            {13, nullptr, "IsEdgeTokenCacheAvailable"},
+            {20, nullptr, "EnsureApplicationAuthenticationCacheAsync"},
+            {21, nullptr, "LoadApplicationAuthenticationTokenCache"},
+            {22, nullptr, "LoadApplicationNetworkServiceClientConfigCache"},
+            {23, nullptr, "IsApplicationAuthenticationCacheAvailable"},
+            {24, nullptr, "InvalidateApplicationAuthenticationCache"},
+            {30, nullptr, "EnsureGameCardAuthenticationCacheAsync"},
+            {31, nullptr, "LoadGameCardAuthenticationTokenCache"},
+            {32, nullptr, "IsGameCardAuthenticationCacheAvailable"},
+            {33, nullptr, "InvalidateGameCardAuthenticationCache"},
+            {1000, nullptr, "GetInactiveElicenseUsedEvent"},
+            {9000, nullptr, "ImportVirtualClientCertificate"},
+            {9010, nullptr, "DeleteVirtualClientCertificate"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class ACC_E final : public Module::Interface {
+public:
+    explicit ACC_E(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:e") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            { 0, nullptr, "GetUserCount"},
+            { 1, nullptr, "GetUserExistence"},
+            { 2, nullptr, "ListAllUsers"},
+            { 3, nullptr, "ListOpenUsers"},
+            { 4, nullptr, "GetLastOpenedUser"},
+            { 5, nullptr, "GetProfile"},
+            { 6, nullptr, "GetProfileDigest"},
+            { 50, nullptr, "IsUserRegistrationRequestPermitted"},
+            { 51, nullptr, "TrySelectUserWithoutInteractionDeprecated"},
+            { 52, nullptr, "TrySelectUserWithoutInteraction"},
+            { 99, nullptr, "DebugActivateOpenContextRetention"},
+            { 100, nullptr, "GetUserRegistrationNotifier"},
+            { 101, nullptr, "GetUserStateChangeNotifier"},
+            { 102, nullptr, "GetBaasAccountManagerForSystemService"},
+            { 103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
+            { 104, nullptr, "GetProfileUpdateNotifier"},
+            { 105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
+            { 106, nullptr, "GetProfileSyncNotifier"},
+            { 110, nullptr, "StoreSaveDataThumbnail"},
+            { 111, nullptr, "ClearSaveDataThumbnail"},
+            { 112, nullptr, "LoadSaveDataThumbnail"},
+            { 113, nullptr, "GetSaveDataThumbnailExistence"},
+            { 120, nullptr, "ListOpenUsersInApplication"},
+            { 130, nullptr, "ActivateOpenContextRetention"},
+            { 140, nullptr, "ListQualifiedUsers"},
+            { 151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
+            { 152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
+            { 170, nullptr, "GetNasOp2MembershipStateChangeNotifier"},
+            { 191, nullptr, "UpdateNotificationReceiverInfo"},
+            { 200, nullptr, "BeginUserRegistration"},
+            { 201, nullptr, "CompleteUserRegistration"},
+            { 202, nullptr, "CancelUserRegistration"},
+            { 203, nullptr, "DeleteUser"},
+            { 204, nullptr, "SetUserPosition"},
+            { 205, nullptr, "GetProfileEditor"},
+            { 206, nullptr, "CompleteUserRegistrationForcibly"},
+            { 210, nullptr, "CreateFloatingRegistrationRequest"},
+            { 211, nullptr, "CreateProcedureToRegisterUserWithNintendoAccount"},
+            { 212, nullptr, "ResumeProcedureToRegisterUserWithNintendoAccount"},
+            { 213, nullptr, "CreateProcedureToCreateUserWithNintendoAccount"},
+            { 214, nullptr, "ResumeProcedureToCreateUserWithNintendoAccount"},
+            { 215, nullptr, "ResumeProcedureToCreateUserWithNintendoAccountAfterApplyResponse"},
+            { 230, nullptr, "AuthenticateServiceAsync"},
+            { 250, nullptr, "GetBaasAccountAdministrator"},
+            { 251, nullptr, "SynchronizeNetworkServiceAccountsSnapshotAsync"},
+            { 290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"},
+            { 291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"},
+            { 292, nullptr, "ProxyProcedureForDeviceMigrationAuthenticatingOperatingUser"},
+            { 293, nullptr, "ProxyProcedureForDeviceMigrationDownload"},
+            { 299, nullptr, "SuspendBackgroundDaemon"},
+            { 350, nullptr, "CreateDeviceMigrationUserExportRequest"},
+            { 351, nullptr, "UploadNasCredential"},
+            { 352, nullptr, "CreateDeviceMigrationUserImportRequest"},
+            { 353, nullptr, "DeleteUserMigrationSaveData"},
+            { 400, nullptr, "SetPinCode"},
+            { 401, nullptr, "GetPinCodeLength"},
+            { 402, nullptr, "GetPinCode"},
+            { 403, nullptr, "GetPinCodeParity"},
+            { 404, nullptr, "VerifyPinCode"},
+            { 405, nullptr, "IsPinCodeVerificationForbidden"},
+            { 410, nullptr, "GetPinCodeErrorCount"},
+            { 411, nullptr, "ResetPinCodeErrorCount"},
+            { 412, nullptr, "IncrementPinCodeErrorCount"},
+            { 413, nullptr, "SetPinCodeErrorCount"},
+            { 420, nullptr, "SetStartPenaltyTime"},
+            { 421, nullptr, "GetStartPenaltyTime"},
+            { 900, nullptr, "SetUserUnqualifiedForDebug"},
+            { 901, nullptr, "UnsetUserUnqualifiedForDebug"},
+            { 902, nullptr, "ListUsersUnqualifiedForDebug"},
+            { 910, nullptr, "RefreshFirmwareSettingsForDebug"},
+            { 997, nullptr, "DebugInvalidateTokenCacheForUser"},
+            { 998, nullptr, "DebugSetUserStateClose"},
+            { 999, nullptr, "DebugSetUserStateOpen"},
+            { 1000, nullptr, "CreateIAccountEntityServiceForApplication"},
+            { 1100, nullptr, "CreateIUserStateManager"},
+            { 10050, nullptr, "IsUserRegistrationRequestPermittedForAccountPolicy"},
+            { 10105, nullptr, "CheckNetworkServiceAvailabilityAsyncForAccountPolicy"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class ACC_E_U1 final : public Module::Interface {
+public:
+    explicit ACC_E_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:e:u1") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetUserCount"},
+            {1, nullptr, "GetUserExistence"},
+            {2, nullptr, "ListAllUsers"},
+            {3, nullptr, "ListOpenUsers"},
+            {4, nullptr, "GetLastOpenedUser"},
+            {5, nullptr, "GetProfile"},
+            {6, nullptr, "GetProfileDigest"},
+            {50, nullptr, "IsUserRegistrationRequestPermitted"},
+            {51, nullptr, "TrySelectUserWithoutInteractionDeprecated"},
+            {99, nullptr, "DebugActivateOpenContextRetention"},
+            {100, nullptr, "GetUserRegistrationNotifier"},
+            {101, nullptr, "GetUserStateChangeNotifier"},
+            {102, nullptr, "GetBaasAccountManagerForSystemService"},
+            {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
+            {104, nullptr, "GetProfileUpdateNotifier"},
+            {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
+            {106, nullptr, "GetProfileSyncNotifier"},
+            {110, nullptr, "StoreSaveDataThumbnail"},
+            {111, nullptr, "ClearSaveDataThumbnail"},
+            {112, nullptr, "LoadSaveDataThumbnail"},
+            {113, nullptr, "GetSaveDataThumbnailExistence"},
+            {120, nullptr, "ListOpenUsersInApplication"},
+            {130, nullptr, "ActivateOpenContextRetention"},
+            {140, nullptr, "ListQualifiedUsers"},
+            {151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
+            {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
+            {170, nullptr, "GetNasOp2MembershipStateChangeNotifier"},
+            {191, nullptr, "UpdateNotificationReceiverInfo"},
+            {997, nullptr, "DebugInvalidateTokenCacheForUser"},
+            {998, nullptr, "DebugSetUserStateClose"},
+            {999, nullptr, "DebugSetUserStateOpen"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class ACC_E_U2 final : public Module::Interface {
+public:
+    explicit ACC_E_U2(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_)
+        : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:e:u2") {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetUserCount"},
+            {1, nullptr, "GetUserExistence"},
+            {2, nullptr, "ListAllUsers"},
+            {3, nullptr, "ListOpenUsers"},
+            {4, nullptr, "GetLastOpenedUser"},
+            {5, nullptr, "GetProfile"},
+            {6, nullptr, "GetProfileDigest"},
+            {50, nullptr, "#IsUserRegistrationRequestPermitted"},
+            {51, nullptr, "TrySelectUserWithoutInteractionDeprecated"},
+            {52, nullptr, "TrySelectUserWithoutInteraction"},
+            {99, nullptr, "DebugActivateOpenContextRetention"},
+            {100, nullptr, "GetUserRegistrationNotifier"},
+            {101, nullptr, "GetUserStateChangeNotifier"},
+            {102, nullptr, "GetBaasAccountManagerForSystemService"},
+            {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
+            {104, nullptr, "GetProfileUpdateNotifier"},
+            {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
+            {106, nullptr, "GetProfileSyncNotifier"},
+            {110, nullptr, "StoreSaveDataThumbnail"},
+            {111, nullptr, "ClearSaveDataThumbnail"},
+            {112, nullptr, "LoadSaveDataThumbnail"},
+            {113, nullptr, "GetSaveDataThumbnailExistence"},
+            {120, nullptr, "ListOpenUsersInApplication"},
+            {130, nullptr, "ActivateOpenContextRetention"},
+            {140, nullptr, "ListQualifiedUsers"},
+            {151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
+            {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
+            {170, nullptr, "GetNasOp2MembershipStateChangeNotifier"},
+            {191, nullptr, "UpdateNotificationReceiverInfo"},
+            {205, nullptr, "GetProfileEditor"},
+            {401, nullptr, "GetPinCodeLength"},
+            {402, nullptr, "GetPinCode"},
+            {403, nullptr, "GetPinCodeParity"},
+            {404, nullptr, "VerifyPinCode"},
+            {405, nullptr, "IsPinCodeVerificationForbidden"},
+            {997, nullptr, "DebugInvalidateTokenCacheForUser"},
+            {998, nullptr, "DebugSetUserStateClose"},
+            {999, nullptr, "DebugSetUserStateOpen"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
 void LoopProcess(Core::System& system) {
    auto module = std::make_shared<Module>();
    auto profile_manager = std::make_shared<ProfileManager>();
    auto server_manager = std::make_unique<ServerManager>(system);

-    server_manager->RegisterNamedService("acc:aa",
-                                         std::make_shared<ACC_AA>(module, profile_manager, system));
-    server_manager->RegisterNamedService("acc:su",
-                                         std::make_shared<ACC_SU>(module, profile_manager, system));
-    server_manager->RegisterNamedService("acc:u0",
-                                         std::make_shared<ACC_U0>(module, profile_manager, system));
-    server_manager->RegisterNamedService("acc:u1",
-                                         std::make_shared<ACC_U1>(module, profile_manager, system));
+    server_manager->RegisterNamedService("acc:aa", std::make_shared<ACC_AA>(module, profile_manager, system));
+    server_manager->RegisterNamedService("acc:su", std::make_shared<ACC_SU>(module, profile_manager, system));
+    server_manager->RegisterNamedService("acc:u0", std::make_shared<ACC_U0>(module, profile_manager, system));
+    server_manager->RegisterNamedService("acc:u1", std::make_shared<ACC_U1>(module, profile_manager, system));
+
+    server_manager->RegisterNamedService("acc:e", std::make_shared<ACC_E>(module, profile_manager, system));
+    server_manager->RegisterNamedService("acc:e:u1", std::make_shared<ACC_E_U1>(module, profile_manager, system));
+    server_manager->RegisterNamedService("acc:e:u2", std::make_shared<ACC_E_U2>(module, profile_manager, system));
+
+    server_manager->RegisterNamedService("dauth:0", std::make_shared<DAUTH_0>(system));
    ServerManager::RunServer(std::move(server_manager));
 }

@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/acc/acc_aa.h"
-
-namespace Service::Account {
-
-ACC_AA::ACC_AA(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_,
-               Core::System& system_)
-    : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:aa") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "EnsureCacheAsync"},
-        {1, nullptr, "LoadCache"},
-        {2, nullptr, "GetDeviceAccountId"},
-        {50, nullptr, "RegisterNotificationTokenAsync"},   // 1.0.0 - 6.2.0
-        {51, nullptr, "UnregisterNotificationTokenAsync"}, // 1.0.0 - 6.2.0
-    };
-    // clang-format on
-    RegisterHandlers(functions);
-}
-
-ACC_AA::~ACC_AA() = default;
-
-} // namespace Service::Account
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/acc/acc.h"
-
-namespace Service::Account {
-
-class ACC_AA final : public Module::Interface {
-public:
-    explicit ACC_AA(std::shared_ptr<Module> module_,
-                    std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_);
-    ~ACC_AA() override;
-};
-
-} // namespace Service::Account
@@ -1,83 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/acc/acc_su.h"
-
-namespace Service::Account {
-
-ACC_SU::ACC_SU(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_,
-               Core::System& system_)
-    : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:su") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, &ACC_SU::GetUserCount, "GetUserCount"},
-        {1, &ACC_SU::GetUserExistence, "GetUserExistence"},
-        {2, &ACC_SU::ListAllUsers, "ListAllUsers"},
-        {3, &ACC_SU::ListOpenUsers, "ListOpenUsers"},
-        {4, &ACC_SU::GetLastOpenedUser, "GetLastOpenedUser"},
-        {5, &ACC_SU::GetProfile, "GetProfile"},
-        {6, nullptr, "GetProfileDigest"},
-        {50, &ACC_SU::IsUserRegistrationRequestPermitted, "IsUserRegistrationRequestPermitted"},
-        {51, &ACC_SU::TrySelectUserWithoutInteractionDeprecated, "TrySelectUserWithoutInteractionDeprecated"},
-        {52, &ACC_SU::TrySelectUserWithoutInteraction, "TrySelectUserWithoutInteraction"}, // 19.0.0+
-        {60, &ACC_SU::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"},
-        {99, nullptr, "DebugActivateOpenContextRetention"},
-        {100, nullptr, "GetUserRegistrationNotifier"},
-        {101, nullptr, "GetUserStateChangeNotifier"},
-        {102, &ACC_SU::GetBaasAccountManagerForSystemService, "GetBaasAccountManagerForSystemService"},
-        {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
-        {104, nullptr, "GetProfileUpdateNotifier"},
-        {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
-        {106, nullptr, "GetProfileSyncNotifier"},
-        {110, &ACC_SU::StoreSaveDataThumbnailSystem, "StoreSaveDataThumbnail"},
-        {111, nullptr, "ClearSaveDataThumbnail"},
-        {112, nullptr, "LoadSaveDataThumbnail"},
-        {113, nullptr, "GetSaveDataThumbnailExistence"},
-        {120, nullptr, "ListOpenUsersInApplication"},
-        {130, nullptr, "ActivateOpenContextRetention"},
-        {140, &ACC_SU::ListQualifiedUsers, "ListQualifiedUsers"},
-        {150, nullptr, "AuthenticateApplicationAsync"},
-        {151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
-        {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
-        {190, nullptr, "GetUserLastOpenedApplication"},
-        {191, nullptr, "ActivateOpenContextHolder"},
-        {200, &ACC_SU::BeginUserRegistration, "BeginUserRegistration"},
-        {201, &ACC_SU::CompleteUserRegistration, "CompleteUserRegistration"},
-        {202, nullptr, "CancelUserRegistration"},
-        {203, &ACC_SU::DeleteUser, "DeleteUser"},
-        {204, &ACC_SU::SetUserPosition, "SetUserPosition"},
-        {205, &ACC_SU::GetProfileEditor, "GetProfileEditor"},
-        {206, nullptr, "CompleteUserRegistrationForcibly"},
-        {210, nullptr, "CreateFloatingRegistrationRequest"},
-        {211, nullptr, "CreateProcedureToRegisterUserWithNintendoAccount"},
-        {212, nullptr, "ResumeProcedureToRegisterUserWithNintendoAccount"},
-        {230, nullptr, "AuthenticateServiceAsync"},
-        {250, &ACC_SU::GetBaasAccountAdministrator, "GetBaasAccountAdministrator"},
-        {290, nullptr, "ProxyProcedureForGuestLoginWithNintendoAccount"},
-        {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"},
-        {299, nullptr, "SuspendBackgroundDaemon"},
-        {400, nullptr, "SetPinCode"}, // 18.0.0+
-        {401, &ACC_SU::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
-        {402, nullptr, "GetPinCode"}, // 18.0.0+
-        {410, nullptr, "GetPinCodeErrorCount"}, // 18.0.0+
-        {411, nullptr, "ResetPinCodeErrorCount"}, // 18.0.0+
-        {412, nullptr, "IncrementPinCodeErrorCount"}, // 18.0.0+
-        {900, nullptr, "SetUserUnqualifiedForDebug"},
-        {901, nullptr, "UnsetUserUnqualifiedForDebug"},
-        {902, nullptr, "ListUsersUnqualifiedForDebug"},
-        {910, nullptr, "RefreshFirmwareSettingsForDebug"},
-        {997, nullptr, "DebugInvalidateTokenCacheForUser"},
-        {998, nullptr, "DebugSetUserStateClose"},
-        {999, nullptr, "DebugSetUserStateOpen"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ACC_SU::~ACC_SU() = default;
-
-} // namespace Service::Account
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/acc/acc.h"
-
-namespace Service::Account {
-
-class ACC_SU final : public Module::Interface {
-public:
-    explicit ACC_SU(std::shared_ptr<Module> module_,
-                    std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_);
-    ~ACC_SU() override;
-};
-
-} // namespace Service::Account
@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/acc/acc_u0.h"
-
-namespace Service::Account {
-
-ACC_U0::ACC_U0(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_,
-               Core::System& system_)
-    : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u0") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, &ACC_U0::GetUserCount, "GetUserCount"},
-        {1, &ACC_U0::GetUserExistence, "GetUserExistence"},
-        {2, &ACC_U0::ListAllUsers, "ListAllUsers"},
-        {3, &ACC_U0::ListOpenUsers, "ListOpenUsers"},
-        {4, &ACC_U0::GetLastOpenedUser, "GetLastOpenedUser"},
-        {5, &ACC_U0::GetProfile, "GetProfile"},
-        {6, nullptr, "GetProfileDigest"}, // 3.0.0+
-        {50, &ACC_U0::IsUserRegistrationRequestPermitted, "IsUserRegistrationRequestPermitted"},
-        {51, &ACC_U0::TrySelectUserWithoutInteractionDeprecated, "TrySelectUserWithoutInteractionDeprecated"},
-        {52, &ACC_U0::TrySelectUserWithoutInteraction, "TrySelectUserWithoutInteraction"},
-        {60, &ACC_U0::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"}, // 5.0.0 - 5.1.0
-        {99, nullptr, "DebugActivateOpenContextRetention"}, // 6.0.0+
-        {100, &ACC_U0::InitializeApplicationInfo, "InitializeApplicationInfo"},
-        {101, &ACC_U0::GetBaasAccountManagerForApplication, "GetBaasAccountManagerForApplication"},
-        {102, nullptr, "AuthenticateApplicationAsync"},
-        {103, nullptr, "CheckNetworkServiceAvailabilityAsync"}, // 4.0.0+
-        {110, &ACC_U0::StoreSaveDataThumbnailApplication, "StoreSaveDataThumbnail"},
-        {111, nullptr, "ClearSaveDataThumbnail"},
-        {120, nullptr, "CreateGuestLoginRequest"},
-        {130, nullptr, "LoadOpenContext"}, // 5.0.0+
-        {131, &ACC_U0::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"}, // 6.0.0+
-        {140, &ACC_U0::InitializeApplicationInfoRestricted, "InitializeApplicationInfoRestricted"}, // 6.0.0+
-        {141, &ACC_U0::ListQualifiedUsers, "ListQualifiedUsers"}, // 6.0.0+
-        {150, &ACC_U0::IsUserAccountSwitchLocked, "IsUserAccountSwitchLocked"}, // 6.0.0+
-        {160, &ACC_U0::InitializeApplicationInfoV2, "InitializeApplicationInfoV2"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ACC_U0::~ACC_U0() = default;
-
-} // namespace Service::Account
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/acc/acc.h"
-
-namespace Service::Account {
-
-class ACC_U0 final : public Module::Interface {
-public:
-    explicit ACC_U0(std::shared_ptr<Module> module_,
-                    std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_);
-    ~ACC_U0() override;
-};
-
-} // namespace Service::Account
@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "core/hle/service/acc/acc_u1.h"
-
-namespace Service::Account {
-
-ACC_U1::ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager> profile_manager_,
-               Core::System& system_)
-    : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:u1") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, &ACC_U1::GetUserCount, "GetUserCount"},
-        {1, &ACC_U1::GetUserExistence, "GetUserExistence"},
-        {2, &ACC_U1::ListAllUsers, "ListAllUsers"},
-        {3, &ACC_U1::ListOpenUsers, "ListOpenUsers"},
-        {4, &ACC_U1::GetLastOpenedUser, "GetLastOpenedUser"},
-        {5, &ACC_U1::GetProfile, "GetProfile"},
-        {6, nullptr, "GetProfileDigest"},
-        {50, &ACC_U1::IsUserRegistrationRequestPermitted, "IsUserRegistrationRequestPermitted"},
-        {51, &ACC_U1::TrySelectUserWithoutInteraction, "TrySelectUserWithoutInteraction"},
-        {60, &ACC_U1::ListOpenContextStoredUsers, "ListOpenContextStoredUsers"},
-        {99, nullptr, "DebugActivateOpenContextRetention"},
-        {100, nullptr, "GetUserRegistrationNotifier"},
-        {101, nullptr, "GetUserStateChangeNotifier"},
-        {102, &ACC_U1::GetBaasAccountManagerForSystemService, "GetBaasAccountManagerForSystemService"},
-        {103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
-        {104, nullptr, "GetProfileUpdateNotifier"},
-        {105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
-        {106, nullptr, "GetProfileSyncNotifier"},
-        {110, &ACC_U1::StoreSaveDataThumbnailApplication, "StoreSaveDataThumbnail"},
-        {111, nullptr, "ClearSaveDataThumbnail"},
-        {112, nullptr, "LoadSaveDataThumbnail"},
-        {113, nullptr, "GetSaveDataThumbnailExistence"},
-        {120, nullptr, "ListOpenUsersInApplication"},
-        {130, nullptr, "ActivateOpenContextRetention"},
-        {140, &ACC_U1::ListQualifiedUsers, "ListQualifiedUsers"},
-        {150, nullptr, "AuthenticateApplicationAsync"},
-        {151, nullptr, "EnsureSignedDeviceIdentifierCacheForNintendoAccountAsync"},
-        {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
-        {190, nullptr, "GetUserLastOpenedApplication"},
-        {191, nullptr, "ActivateOpenContextHolder"},
-        {401, &ACC_U1::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
-        {402, nullptr, "GetPinCode"}, // 18.0.0+
-        {997, nullptr, "DebugInvalidateTokenCacheForUser"},
-        {998, nullptr, "DebugSetUserStateClose"},
-        {999, nullptr, "DebugSetUserStateOpen"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ACC_U1::~ACC_U1() = default;
-
-} // namespace Service::Account
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "core/hle/service/acc/acc.h"
-
-namespace Service::Account {
-
-class ACC_U1 final : public Module::Interface {
-public:
-    explicit ACC_U1(std::shared_ptr<Module> module_,
-                    std::shared_ptr<ProfileManager> profile_manager_, Core::System& system_);
-    ~ACC_U1() override;
-};
-
-} // namespace Service::Account
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -54,11 +57,58 @@ public:
    }
 };

+class BPC_C final : public ServiceFramework<BPC_C> {
+public:
+    explicit BPC_C(Core::System& system_) : ServiceFramework{system_, "bpc:c"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "ShutdownSystem"},
+            {1, nullptr, "RebootSystem"},
+            {2, nullptr, "GetWakeupReason"},
+            {3, nullptr, "GetShutdownReason"},
+            {4, nullptr, "GetAcOk"},
+            {5, nullptr, "GetPowerEvent"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class BPC_B final : public ServiceFramework<BPC_B> {
+public:
+    explicit BPC_B(Core::System& system_) : ServiceFramework{system_, "bpc:b"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetSleepButtonState"},
+            {1, nullptr, "GetPowerButtonEvent"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class BPC_W final : public ServiceFramework<BPC_W> {
+public:
+    explicit BPC_W(Core::System& system_) : ServiceFramework{system_, "bpc:w"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "CreateWakeupTimer"},
+            {1, nullptr, "CancelWakeupTimer"},
+            {2, nullptr, "EnableWakeupTimerOnDevice"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
 void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);

    server_manager->RegisterNamedService("bpc", std::make_shared<BPC>(system));
    server_manager->RegisterNamedService("bpc:r", std::make_shared<BPC_R>(system));
+    server_manager->RegisterNamedService("bpc:c", std::make_shared<BPC_C>(system));
+    server_manager->RegisterNamedService("bpc:b", std::make_shared<BPC_B>(system));
+    server_manager->RegisterNamedService("bpc:w", std::make_shared<BPC_W>(system));
    ServerManager::RunServer(std::move(server_manager));
 }

@@ -18,20 +18,12 @@ void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);
    auto album_manager = std::make_shared<AlbumManager>(system);

-    server_manager->RegisterNamedService(
-        "caps:a", std::make_shared<IAlbumAccessorService>(system, album_manager));
-    server_manager->RegisterNamedService(
-        "caps:c", std::make_shared<IAlbumControlService>(system, album_manager));
-    server_manager->RegisterNamedService(
-        "caps:u", std::make_shared<IAlbumApplicationService>(system, album_manager));
-
-    server_manager->RegisterNamedService(
-        "caps:ss", std::make_shared<IScreenShotService>(system, album_manager));
-    server_manager->RegisterNamedService("caps:sc",
-                                         std::make_shared<IScreenShotControlService>(system));
-    server_manager->RegisterNamedService(
-        "caps:su", std::make_shared<IScreenShotApplicationService>(system, album_manager));
-
+    server_manager->RegisterNamedService("caps:a", std::make_shared<IAlbumAccessorService>(system, album_manager));
+    server_manager->RegisterNamedService("caps:c", std::make_shared<IAlbumControlService>(system, album_manager));
+    server_manager->RegisterNamedService("caps:u", std::make_shared<IAlbumApplicationService>(system, album_manager));
+    server_manager->RegisterNamedService("caps:ss", std::make_shared<IScreenShotService>(system, album_manager));
+    server_manager->RegisterNamedService("caps:sc", std::make_shared<IScreenShotControlService>(system));
+    server_manager->RegisterNamedService("caps:su", std::make_shared<IScreenShotApplicationService>(system, album_manager));
    ServerManager::RunServer(std::move(server_manager));
 }

@@ -263,6 +263,9 @@ Result AlbumManager::SaveScreenShot(ApplicationAlbumEntry& out_entry,
        return result;
    }

+    // TODO: ???
+    R_UNLESS(!image_data.empty(), ResultUnknown);
+
    const auto date = ConvertToAlbumDateTime(posix_time);

    return SaveImage(out_entry, image_data, title_id, date);
@@ -43,6 +43,30 @@ private:
    }
 };

+ECTX_W::ECTX_W(Core::System& system_) : ServiceFramework{system_, "ectx:w"} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, nullptr, "CreateContextRegistrar"},
+        {1, nullptr, "CommitContext"},
+        {2, nullptr, "RemoveContext"},
+    };
+    // clang-format on
+    RegisterHandlers(functions);
+}
+ECTX_W::~ECTX_W() = default;
+
+ECTX_R::ECTX_R(Core::System& system_) : ServiceFramework{system_, "ectx:r"} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, nullptr, "GetContextInfo"},
+        {1, nullptr, "PullContext"},
+        {2, nullptr, "ListContextDescriptorWithResultForDebug"},
+    };
+    // clang-format on
+    RegisterHandlers(functions);
+}
+ECTX_R::~ECTX_R() = default;
+
 ECTX_AW::ECTX_AW(Core::System& system_) : ServiceFramework{system_, "ectx:aw"} {
    // clang-format off
    static const FunctionInfo functions[] = {
@@ -11,6 +11,18 @@ class System;

 namespace Service::Glue {

+class ECTX_W final : public ServiceFramework<ECTX_W> {
+public:
+    explicit ECTX_W(Core::System& system_);
+    ~ECTX_W() override;
+};
+
+class ECTX_R final : public ServiceFramework<ECTX_R> {
+public:
+    explicit ECTX_R(Core::System& system_);
+    ~ECTX_R() override;
+};
+
 class ECTX_AW final : public ServiceFramework<ECTX_AW> {
 public:
    explicit ECTX_AW(Core::System& system_);
@@ -19,40 +19,27 @@ void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);

    // ARP
-    server_manager->RegisterNamedService("arp:r",
-                                         std::make_shared<ARP_R>(system, system.GetARPManager()));
-    server_manager->RegisterNamedService("arp:w",
-                                         std::make_shared<ARP_W>(system, system.GetARPManager()));
+    server_manager->RegisterNamedService("arp:r", std::make_shared<ARP_R>(system, system.GetARPManager()));
+    server_manager->RegisterNamedService("arp:w", std::make_shared<ARP_W>(system, system.GetARPManager()));

    // BackGround Task Controller
    server_manager->RegisterNamedService("bgtc:t", std::make_shared<BGTC_T>(system));
    server_manager->RegisterNamedService("bgtc:sc", std::make_shared<BGTC_SC>(system));

    // Error Context
+    server_manager->RegisterNamedService("ectx:w", std::make_shared<ECTX_W>(system));
+    server_manager->RegisterNamedService("ectx:r", std::make_shared<ECTX_R>(system));
    server_manager->RegisterNamedService("ectx:aw", std::make_shared<ECTX_AW>(system));

    // Notification Services
-    server_manager->RegisterNamedService(
-        "notif:a", std::make_shared<INotificationServicesForApplication>(system));
-    server_manager->RegisterNamedService("notif:s",
-                                         std::make_shared<INotificationServices>(system));
+    server_manager->RegisterNamedService("notif:a", std::make_shared<INotificationServicesForApplication>(system));
+    server_manager->RegisterNamedService("notif:s", std::make_shared<INotificationServices>(system));

    // Time
    auto time = std::make_shared<Time::TimeManager>(system);
-
-    server_manager->RegisterNamedService(
-        "time:u",
-        std::make_shared<Time::StaticService>(
-            system, Service::PSC::Time::StaticServiceSetupInfo{0, 0, 0, 0, 0, 0}, time, "time:u"));
-    server_manager->RegisterNamedService(
-        "time:a",
-        std::make_shared<Time::StaticService>(
-            system, Service::PSC::Time::StaticServiceSetupInfo{1, 1, 0, 1, 0, 0}, time, "time:a"));
-    server_manager->RegisterNamedService(
-        "time:r",
-        std::make_shared<Time::StaticService>(
-            system, Service::PSC::Time::StaticServiceSetupInfo{0, 0, 0, 0, 1, 0}, time, "time:r"));
-
+    server_manager->RegisterNamedService("time:u", std::make_shared<Time::StaticService>(system, Service::PSC::Time::StaticServiceSetupInfo{0, 0, 0, 0, 0, 0}, time, "time:u"));
+    server_manager->RegisterNamedService("time:a", std::make_shared<Time::StaticService>(system, Service::PSC::Time::StaticServiceSetupInfo{1, 1, 0, 1, 0, 0}, time, "time:a"));
+    server_manager->RegisterNamedService("time:r", std::make_shared<Time::StaticService>(system, Service::PSC::Time::StaticServiceSetupInfo{0, 0, 0, 0, 1, 0}, time, "time:r"));
    ServerManager::RunServer(std::move(server_manager));
 }

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -16,27 +19,77 @@

 namespace Service::HID {

+class IHidTemporaryServer final : public ServiceFramework<IHidTemporaryServer> {
+public:
+    explicit IHidTemporaryServer(Core::System& system_)
+    : ServiceFramework{system_, "hid:tmp"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetConsoleSixAxisSensorCalibrationValues"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+    ~IHidTemporaryServer() override = default;
+};
+
+class AHID_CD final : public ServiceFramework<AHID_CD> {
+public:
+    explicit AHID_CD(Core::System& system_)
+    : ServiceFramework{system_, "ahid:cd"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "AcquireDevice"},
+            {1, nullptr, "ReleaseDevice"},
+            {2, nullptr, "GetCtrlSession"},
+            {3, nullptr, "GetReadSession"},
+            {4, nullptr, "GetWriteSession"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+    ~AHID_CD() override = default;
+};
+
+class AHID_HDR final : public ServiceFramework<AHID_HDR> {
+public:
+    explicit AHID_HDR(Core::System& system_)
+    : ServiceFramework{system_, "ahid:hdr"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "GetDeviceEntries"},
+            {1, nullptr, "GetDeviceList"},
+            {2, nullptr, "GetDeviceParameters"},
+            {3, nullptr, "AttachDevice"},
+            {4, nullptr, "DetachDevice"},
+            {5, nullptr, "SetDeviceFilter"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+    ~AHID_HDR() override = default;
+};
+
 void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);
-    std::shared_ptr<HidFirmwareSettings> firmware_settings =
-        std::make_shared<HidFirmwareSettings>(system);
-    std::shared_ptr<ResourceManager> resource_manager =
-        std::make_shared<ResourceManager>(system, firmware_settings);
+    auto firmware_settings = std::make_shared<HidFirmwareSettings>(system);
+    auto resource_manager = std::make_shared<ResourceManager>(system, firmware_settings);

    resource_manager->Initialize();

-    server_manager->RegisterNamedService(
-        "hid", std::make_shared<IHidServer>(system, resource_manager, firmware_settings));
-    server_manager->RegisterNamedService(
-        "hid:dbg", std::make_shared<IHidDebugServer>(system, resource_manager, firmware_settings));
-    server_manager->RegisterNamedService(
-        "hid:sys", std::make_shared<IHidSystemServer>(system, resource_manager, firmware_settings));
+    server_manager->RegisterNamedService("hid", std::make_shared<IHidServer>(system, resource_manager, firmware_settings));
+    server_manager->RegisterNamedService("hid:dbg", std::make_shared<IHidDebugServer>(system, resource_manager, firmware_settings));
+    server_manager->RegisterNamedService("hid:sys", std::make_shared<IHidSystemServer>(system, resource_manager, firmware_settings));
+    server_manager->RegisterNamedService("hid:tmp", std::make_shared<IHidTemporaryServer>(system));

    server_manager->RegisterNamedService("hidbus", std::make_shared<Hidbus>(system));

    server_manager->RegisterNamedService("irs", std::make_shared<IRS::IRS>(system));
    server_manager->RegisterNamedService("irs:sys", std::make_shared<IRS::IRS_SYS>(system));

+    server_manager->RegisterNamedService("ahid:cd", std::make_shared<AHID_CD>(system));
+    server_manager->RegisterNamedService("ahid:hdr", std::make_shared<AHID_HDR>(system));
+
    server_manager->RegisterNamedService("xcd:sys", std::make_shared<XCD_SYS>(system));

    system.RunServer(std::move(server_manager));
@@ -38,10 +38,30 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour
        {213, nullptr, "ActivateNfc"},
        {214, nullptr, "GetXcdHandleForNpadWithNfc"},
        {215, nullptr, "IsNfcActivated"},
-        {230, nullptr, "AcquireIrSensorEventHandle"},
+        {216, nullptr, "GetAbstractedPadIdForNpadWithNfc"},
+        {217, nullptr, "SetNfcEvent"},
+        {218, nullptr, "GetNfcInfo"},
+        {219, nullptr, "StartNfcDiscovery"},
+        {220, nullptr, "StopNfcDiscovery"},
+        {221, nullptr, "StartNtagRead"},
+        {222, nullptr, "StartNtagWrite"},
+        {223, nullptr, "SendNfcRawData"},
+        {224, nullptr, "RegisterMifareKey"},
+        {225, nullptr, "ClearMifareKey"},
+        {226, nullptr, "StartMifareRead"},
+        {227, nullptr, "StartMifareWrite"},
+        {230, nullptr, "AcquireIrSensorEventHndle" },
        {231, nullptr, "ActivateIrSensor"},
        {232, nullptr, "GetIrSensorState"},
-        {233, nullptr, "GetXcdHandleForNpadWithIrSensor"},
+        {233, nullptr, "GetXcdHandleForNpadWihIrSensor" },
+        {234, nullptr, "GetNpadJoyHoldType"},
+        {241, nullptr, "GetDataFormat"},
+        {242, nullptr, "SetDataFormat"},
+        {243, nullptr, "GetMcuState"},
+        {244, nullptr, "SetMcuState"},
+        {245, nullptr, "GetMcuVersionForNfc"},
+        {246, nullptr, "CheckNfcDevicePower"},
+        {247, nullptr, "SetMcuStateImmediate"},
        {301, nullptr, "ActivateNpadSystem"},
        {303, &IHidSystemServer::ApplyNpadSystemCommonPolicy, "ApplyNpadSystemCommonPolicy"},
        {304, &IHidSystemServer::EnableAssigningSingleOnSlSrPress, "EnableAssigningSingleOnSlSrPress"},
@@ -330,12 +330,12 @@ public:
    /// Helper function to test whether the output buffer at buffer_index can be written
    [[nodiscard]] bool CanWriteBuffer(std::size_t buffer_index = 0) const;

-    [[nodiscard]] Handle GetCopyHandle(std::size_t index) const {
-        return incoming_copy_handles.at(index);
+    [[nodiscard]] Handle GetCopyHandle(std::size_t index) const noexcept {
+        return index >= incoming_copy_handles.size() ? 0 : incoming_copy_handles[index];
    }

-    [[nodiscard]] Handle GetMoveHandle(std::size_t index) const {
-        return incoming_move_handles.at(index);
+    [[nodiscard]] Handle GetMoveHandle(std::size_t index) const noexcept {
+        return index >= incoming_move_handles.size() ? 0 : incoming_move_handles[index];
    }

    void AddMoveObject(Kernel::KAutoObject* object) {
@@ -0,0 +1,86 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "common/logging.h"
+#include "core/hle/service/ipc_helpers.h"
+#include "core/hle/service/mnpp/mnpp.h"
+#include "core/hle/service/server_manager.h"
+#include "core/hle/service/service.h"
+
+namespace Service::MNPP {
+
+class MNPP_APP final : public ServiceFramework<MNPP_APP> {
+public:
+    explicit MNPP_APP(Core::System& system_) : ServiceFramework{system_, "mnpp:app"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, &MNPP_APP::Cmd0, "Cmd0"},
+            {1, &MNPP_APP::Cmd1, "Cmd1"},
+        };
+        // clang-format on
+
+        RegisterHandlers(functions);
+    }
+
+private:
+    void Cmd0(HLERequestContext& ctx) {
+        LOG_WARNING(Service_MNPP, "(STUBBED) called");
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+
+    void Cmd1(HLERequestContext& ctx) {
+        LOG_WARNING(Service_MNPP, "(STUBBED) called");
+
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+    }
+};
+
+class MNPP_SYS final : public ServiceFramework<MNPP_SYS> {
+public:
+    explicit MNPP_SYS(Core::System& system_) : ServiceFramework{system_, "mnpp:sys"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Cmd0"},
+            {10, nullptr, "Cmd10"},
+            {100, nullptr, "Cmd100"},
+            {200, nullptr, "Cmd200"},
+            {300, nullptr, "Cmd300"},
+            {400, nullptr, "Cmd400"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class MNPP_WEB final : public ServiceFramework<MNPP_WEB> {
+public:
+    explicit MNPP_WEB(Core::System& system_) : ServiceFramework{system_, "mnpp:web"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "Cmd0"},
+            {1, nullptr, "Cmd1"},
+            {10, nullptr, "Cmd10"},
+            {20, nullptr, "Cmd20"},
+            {100, nullptr, "Cmd100"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
+    server_manager->RegisterNamedService("mnpp:app", std::make_shared<MNPP_APP>(system));
+    server_manager->RegisterNamedService("mnpp:sys", std::make_shared<MNPP_SYS>(system));
+    server_manager->RegisterNamedService("mnpp:web", std::make_shared<MNPP_WEB>(system));
+    ServerManager::RunServer(std::move(server_manager));
+}
+
+} // namespace Service::MNPP
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -1,51 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/logging.h"
-#include "core/hle/service/ipc_helpers.h"
-#include "core/hle/service/mnpp/mnpp_app.h"
-#include "core/hle/service/server_manager.h"
-#include "core/hle/service/service.h"
-
-namespace Service::MNPP {
-
-class MNPP_APP final : public ServiceFramework<MNPP_APP> {
-public:
-    explicit MNPP_APP(Core::System& system_) : ServiceFramework{system_, "mnpp:app"} {
-        // clang-format off
-        static const FunctionInfo functions[] = {
-            {0, &MNPP_APP::Unknown0, "unknown0"},
-            {1, &MNPP_APP::Unknown1, "unknown1"},
-        };
-        // clang-format on
-
-        RegisterHandlers(functions);
-    }
-
-private:
-    void Unknown0(HLERequestContext& ctx) {
-        LOG_WARNING(Service_MNPP, "(STUBBED) called");
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-    }
-
-    void Unknown1(HLERequestContext& ctx) {
-        LOG_WARNING(Service_MNPP, "(STUBBED) called");
-
-        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(ResultSuccess);
-    }
-};
-
-void LoopProcess(Core::System& system) {
-    auto server_manager = std::make_unique<ServerManager>(system);
-
-    server_manager->RegisterNamedService("mnpp:app", std::make_shared<MNPP_APP>(system));
-    ServerManager::RunServer(std::move(server_manager));
-}
-
-} // namespace Service::MNPP
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator
@@ -84,7 +84,7 @@ private:
    RestrictionSettings restriction_settings{};
    std::array<char, 8> pin_code{};
    Capability capability{};
-    // TODO: this is RAW as fuck
+    // TODO: this is raw
    PlayTimerSettings raw_play_timer_settings{};

    KernelHelpers::ServiceContext service_context;
@@ -55,6 +55,30 @@ public:
    }
 };

+class PCV_ARB final : public ServiceFramework<PCV_ARB> {
+public:
+    explicit PCV_ARB(Core::System& system_) : ServiceFramework{system_, "pcv:arb"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "ReleaseControl"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
+class PCV_IMM final : public ServiceFramework<PCV_IMM> {
+public:
+    explicit PCV_IMM(Core::System& system_) : ServiceFramework{system_, "pcv:imm"} {
+        // clang-format off
+        static const FunctionInfo functions[] = {
+            {0, nullptr, "SetClockRate"},
+        };
+        // clang-format on
+        RegisterHandlers(functions);
+    }
+};
+
 class IClkrstSession final : public ServiceFramework<IClkrstSession> {
 public:
    explicit IClkrstSession(Core::System& system_, DeviceCode device_code_)
@@ -148,6 +172,8 @@ void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);

    server_manager->RegisterNamedService("pcv", std::make_shared<PCV>(system));
+    server_manager->RegisterNamedService("pcv:arb", std::make_shared<PCV_ARB>(system));
+    server_manager->RegisterNamedService("pcv:imm", std::make_shared<PCV_IMM>(system));
    server_manager->RegisterNamedService("clkrst", std::make_shared<CLKRST>(system, "clkrst"));
    server_manager->RegisterNamedService("clkrst:i", std::make_shared<CLKRST>(system, "clkrst:i"));
    server_manager->RegisterNamedService("clkrst:a", std::make_shared<CLKRST_A>(system));
@@ -37,7 +37,7 @@
 #include "core/hle/service/mig/mig.h"
 #include "core/hle/service/mii/mii.h"
 #include "core/hle/service/mm/mm_u.h"
-#include "core/hle/service/mnpp/mnpp_app.h"
+#include "core/hle/service/mnpp/mnpp.h"
 #include "core/hle/service/ncm/ncm.h"
 #include "core/hle/service/nfc/nfc.h"
 #include "core/hle/service/nfp/nfp.h"
@@ -1020,7 +1020,7 @@ Result ISystemSettingsServer::GetBatteryLot(Out<BatteryLot> out_battery_lot) {
        c.lot_number[1] = 'H';
        c.lot_number[2] = 'A';
        c.lot_number[3] = 'C';
-        // TODO: I have no fucking idea what the letters mean
+        // TODO: what do the letters mean?
        c.lot_number[4] = 'H';
        c.lot_number[5] = 'Z';
        c.lot_number[6] = 'Z';
@@ -173,8 +173,26 @@ void BSD::Socket(HLERequestContext& ctx) {

    LOG_DEBUG(Service, "called. domain={} type={} protocol={}", domain, type, protocol);

-    const auto [fd, bsd_errno] = SocketImpl(static_cast<Domain>(domain), static_cast<Type>(type),
-                                            static_cast<Protocol>(protocol));
+    const auto [fd, bsd_errno] = SocketImpl(Domain(domain), Type(type), Protocol(protocol));
+
+    IPC::ResponseBuilder rb{ctx, 4};
+    rb.Push(ResultSuccess);
+    rb.Push<s32>(fd);
+    rb.PushEnum(bsd_errno);
+}
+
+void BSD::SocketExempt(HLERequestContext& ctx) {
+    IPC::RequestParser rp{ctx};
+    const u32 domain = rp.Pop<u32>();
+    const u32 type = rp.Pop<u32>();
+    const u32 protocol = rp.Pop<u32>();
+
+    LOG_DEBUG(Service, "called. domain={} type={} protocol={}", domain, type, protocol);
+
+    auto [fd, bsd_errno] = SocketImpl(Domain(domain), Type(type), Protocol(protocol));
+    if (bsd_errno == Errno::SUCCESS) {
+        bsd_errno = ShutdownImpl(fd, 0);
+    }

    IPC::ResponseBuilder rb{ctx, 4};
    rb.Push(ResultSuccess);
@@ -445,6 +463,7 @@ void BSD::Close(HLERequestContext& ctx) {
    BuildErrnoResponse(ctx, CloseImpl(fd));
 }

+/// @brief Only bsd:s is able to dup()
 void BSD::DuplicateSocket(HLERequestContext& ctx) {
    struct InputParameters {
        s32 fd;
@@ -463,6 +482,13 @@ void BSD::DuplicateSocket(HLERequestContext& ctx) {

    IPC::ResponseBuilder rb{ctx, 4};
    rb.Push(ResultSuccess);
+    if (is_user) {
+        rb.PushRaw(OutputParameters{
+            .ret = 0,
+            .bsd_errno = Errno::INVAL,
+        });
+        return;
+    }

    auto const res_v = DuplicateSocketImpl(input.fd);
    if (auto* res = std::get_if<s32>(&res_v)) {
@@ -496,11 +522,13 @@ void BSD::ExecuteWork(HLERequestContext& ctx, Work work) {
 }

 std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protocol) {
-
-    if (type == Type::SEQPACKET) {
-        UNIMPLEMENTED_MSG("SOCK_SEQPACKET errno management");
-    } else if (type == Type::RAW && (domain != Domain::INET || protocol != Protocol::ICMP)) {
-        UNIMPLEMENTED_MSG("SOCK_RAW errno management");
+    // user bsd:u has restrictions on SOCK_SEQPACKET and SOCK_RAW
+    if (is_user && (type == Type::SEQPACKET || type == Type::RAW)) {
+        if (type == Type::RAW && domain == Domain::INET && protocol == Protocol::ICMP) {
+            // fine, can use on bsd:s and bsd:u
+        } else {
+            return {-1, Errno::INVAL};
+        }
    }

    [[maybe_unused]] const bool unk_flag = (static_cast<u32>(type) & 0x20000000) != 0;
@@ -1052,14 +1080,15 @@ void BSD::OnProxyPacketReceived(const Network::ProxyPacket& packet) {
    }
 }

-BSD::BSD(Core::System& system_, const char* name)
-    : ServiceFramework{system_, name} {
+BSD::BSD(Core::System& system_, const char* name, bool is_user_)
+    : ServiceFramework{system_, name}
+    , is_user{is_user_} {
    // clang-format off
    static const FunctionInfo functions[] = {
        {0, &BSD::RegisterClient, "RegisterClient"},
        {1, &BSD::StartMonitoring, "StartMonitoring"},
        {2, &BSD::Socket, "Socket"},
-        {3, nullptr, "SocketExempt"},
+        {3, &BSD::SocketExempt, "SocketExempt"},
        {4, nullptr, "Open"},
        {5, &BSD::Select, "Select"},
        {6, &BSD::Poll, "Poll"},
@@ -1125,7 +1154,8 @@ std::unique_lock<std::mutex> BSD::LockService() noexcept {
    return {};
 }

-BSDCFG::BSDCFG(Core::System& system_) : ServiceFramework{system_, "bsdcfg"} {
+BSDCFG::BSDCFG(Core::System& system_, const char *name)
+    : ServiceFramework{system_, name} {
    // clang-format off
    static const FunctionInfo functions[] = {
        {0, nullptr, "SetIfUp"},
@@ -1152,4 +1182,16 @@ BSDCFG::BSDCFG(Core::System& system_) : ServiceFramework{system_, "bsdcfg"} {

 BSDCFG::~BSDCFG() = default;

+BSD_NU::BSD_NU(Core::System& system_)
+    : ServiceFramework{system_, "bsd:nu"} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, nullptr, "CreateUserService"},
+    };
+    // clang-format on
+    RegisterHandlers(functions);
+}
+
+BSD_NU::~BSD_NU() = default;
+
 } // namespace Service::Sockets
@@ -29,7 +29,7 @@ namespace Service::Sockets {

 class BSD final : public ServiceFramework<BSD> {
 public:
-    explicit BSD(Core::System& system_, const char* name);
+    explicit BSD(Core::System& system_, const char* name, bool is_user);
    ~BSD() override;

    // These methods are called from SSL; the first two are also called from
@@ -129,6 +129,7 @@ private:
    void RegisterClient(HLERequestContext& ctx);
    void StartMonitoring(HLERequestContext& ctx);
    void Socket(HLERequestContext& ctx);
+    void SocketExempt(HLERequestContext& ctx);
    void Select(HLERequestContext& ctx);
    void Poll(HLERequestContext& ctx);
    void Accept(HLERequestContext& ctx);
@@ -155,8 +156,7 @@ private:
    void ExecuteWork(HLERequestContext& ctx, Work work);

    std::pair<s32, Errno> SocketImpl(Domain domain, Type type, Protocol protocol);
-    std::pair<s32, Errno> PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer,
-                                   s32 nfds, s32 timeout);
+    std::pair<s32, Errno> PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer, s32 nfds, s32 timeout);
    std::pair<s32, Errno> AcceptImpl(s32 fd, std::vector<u8>& write_buffer);
    Errno BindImpl(s32 fd, std::span<const u8> addr);
    Errno ConnectImpl(s32 fd, std::span<const u8> addr);
@@ -189,12 +189,19 @@ private:

 protected:
    std::unique_lock<std::mutex> LockService() noexcept override;
+    bool is_user = false;
 };

 class BSDCFG final : public ServiceFramework<BSDCFG> {
 public:
-    explicit BSDCFG(Core::System& system_);
+    explicit BSDCFG(Core::System& system_, const char *name);
    ~BSDCFG() override;
 };

+class BSD_NU final : public ServiceFramework<BSD_NU> {
+public:
+    explicit BSD_NU(Core::System& system_);
+    ~BSD_NU() override;
+};
+
 } // namespace Service::Sockets
@@ -406,4 +406,21 @@ void SFDNSRES::ResolverSetOptionRequest(HLERequestContext& ctx) {
    rb.Push(ResultSuccess);
    rb.Push<s32>(0); // bsd errno
 }
+
+
+DNS_PRIV::DNS_PRIV(Core::System& system_)
+    : ServiceFramework{system_, "dns:priv"} {
+    // clang-format off
+    static const FunctionInfo functions[] = {
+        {0, nullptr, "Cmd0"},
+        {1, nullptr, "Cmd1"},
+        {2, nullptr, "Cmd2"},
+    };
+    // clang-format on
+    RegisterHandlers(functions);
+}
+
+DNS_PRIV::~DNS_PRIV() = default;
+
+
 } // namespace Service::Sockets
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -25,4 +28,10 @@ private:
    void ResolverSetOptionRequest(HLERequestContext& ctx);
 };

+class DNS_PRIV final : public ServiceFramework<DNS_PRIV> {
+public:
+    explicit DNS_PRIV(Core::System& system_);
+    ~DNS_PRIV() override;
+};
+
 } // namespace Service::Sockets
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -12,12 +15,16 @@ namespace Service::Sockets {
 void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);

-    server_manager->RegisterNamedService("bsd:s", std::make_shared<BSD>(system, "bsd:s"));
-    server_manager->RegisterNamedService("bsd:u", std::make_shared<BSD>(system, "bsd:u"));
-    server_manager->RegisterNamedService("bsdcfg", std::make_shared<BSDCFG>(system));
+    server_manager->RegisterNamedService("bsd:s", std::make_shared<BSD>(system, "bsd:s", false));
+    server_manager->RegisterNamedService("bsd:u", std::make_shared<BSD>(system, "bsd:u", true));
+    server_manager->RegisterNamedService("bsd:a", std::make_shared<BSD>(system, "bsd:a", true));
+    server_manager->RegisterNamedService("bsd:nu", std::make_shared<BSD_NU>(system));
+    server_manager->RegisterNamedService("bsdcfg", std::make_shared<BSDCFG>(system, "bsdcfg"));
+    server_manager->RegisterNamedService("ifcfg", std::make_shared<BSDCFG>(system, "ifcfg"));
    server_manager->RegisterNamedService("nsd:a", std::make_shared<NSD>(system, "nsd:a"));
    server_manager->RegisterNamedService("nsd:u", std::make_shared<NSD>(system, "nsd:u"));
    server_manager->RegisterNamedService("sfdnsres", std::make_shared<SFDNSRES>(system));
+    server_manager->RegisterNamedService("dns:priv", std::make_shared<DNS_PRIV>(system));
    server_manager->StartAdditionalHostThreads("bsdsocket", 2);
    ServerManager::RunServer(std::move(server_manager));
 }
@@ -531,7 +531,8 @@ int TranslateTypeToNative(Type type) {
    NETWORK_PROTOCOL_TRANSLATE_ELEM(MPLS) \
    NETWORK_PROTOCOL_TRANSLATE_ELEM(PFSYNC)
 #elif defined(__linux__)
-// Other platforms get fucked
+// Other platforms may not support some niche protocols.
+// This is usually not an issue
 #define NETWORK_PROTOCOL_TRANSLATE_LIST \
    NETWORK_PROTOCOL_TRANSLATE_ELEM(IP) \
    /*NETWORK_PROTOCOL_TRANSLATE_ELEM(HOPOPTS)*/ \
@@ -25,7 +25,7 @@ endif()
 # Dynarmic project options
 option(DYNARMIC_ENABLE_CPU_FEATURE_DETECTION "Turning this off causes dynarmic to assume the host CPU doesn't support anything later than SSE3" ON)

-if (PLATFORM_OPENBSD OR PLATFORM_DRAGONFLY OR PLATFORM_NETBSD)
+if (OPENBSD OR DRAGONFLY OR NETBSD)
    set(REQUIRE_WX ON)
 else()
    set(REQUIRE_WX OFF)
@@ -363,7 +363,7 @@ elseif (APPLE)
            backend/exception_handler_macos_mig.c
        )
    endif()
-elseif (UNIX AND NOT PLATFORM_HAIKU)
+elseif (UNIX AND NOT HAIKUOS)
    # Haiku lacks <ucontext.h>
    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
        target_link_libraries(dynarmic PRIVATE rt)
@@ -234,7 +234,7 @@ private:
    BlockOfCode block_of_code;
    A32EmitX64 emitter;
    Optimization::PolyfillOptions polyfill_options;
-    // Keep it here, you don't wanna mess with the fuckery that's initializer lists
+    // Keep it here in order to not mess with initializer lists
    const A32::UserConfig conf;
    Jit* jit_interface;

@@ -2160,8 +2160,6 @@ void EmitFPVectorToFixed(BlockOfCode& code, EmitContext& ctx, IR::Inst* inst) {
    ROUNDING_MODE_CASE(CASE, 0x3e) \
    ROUNDING_MODE_CASE(CASE, 0x3f)

-        // FUCK YOU MSVC, FUCKING DEPTH CANT EVEN HANDLE 8+16+32+64 DEPTH OF A ELSE STATMENT YOU FUCKING STUPID
-        // BURN MSVC BURN IT STUPID COMPILER CAN'T EVEN COMPILE THE MOST BASIC C++
        ROUNDING_MODE_SWITCH(ToNearest_TieEven)
        ROUNDING_MODE_SWITCH(TowardsPlusInfinity)
        ROUNDING_MODE_SWITCH(TowardsMinusInfinity)
@@ -787,7 +787,7 @@ static void FoldCountLeadingZeros(IR::Inst& inst, bool is_32_bit) {
 /// Folds division operations based on the following:
 ///
 /// 1. x / 0 -> 0 (NOTE: This is an ARM-specific behavior defined in the architecture reference manual)
-/// 2a. 0x8000_0000 / 0xFFFF_FFFF -> 0x8000_0000 (NOTE: More ARM bullshit)
+/// 2a. 0x8000_0000 / 0xFFFF_FFFF -> 0x8000_0000 (NOTE: More ARM errata)
 /// 2b. 0x8000_0000_0000_0000 / 0xFFFF_FFFF_FFFF_FFFF -> 0x8000_0000_0000_0000
 /// 3. imm_x / imm_y -> result
 /// 4. x / 1 -> x
@@ -151,7 +151,7 @@ if (MSVC)
    )
 else()
    target_compile_options(hid_core PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wconversion>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
        $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type>
        $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>)
@@ -53,12 +53,11 @@ Result NpadAbstractBatteryHandler::DecrementRefCounter() {
 Result NpadAbstractBatteryHandler::UpdateBatteryState(u64 aruid) {
    const auto npad_index = NpadIdTypeToIndex(properties_handler->GetNpadId());
    AruidData* aruid_data = applet_resource_holder->applet_resource->GetAruidData(aruid);
-    if (aruid_data == nullptr) {
+    if (aruid_data == nullptr || aruid_data->shared_memory_format == nullptr) {
        return ResultSuccess;
    }

-    auto& npad_internal_state =
-        aruid_data->shared_memory_format->npad.npad_entry[npad_index].internal_state;
+    auto& npad_internal_state = aruid_data->shared_memory_format->npad.npad_entry[npad_index].internal_state;
    auto& system_properties = npad_internal_state.system_properties;

    system_properties.is_charging_joy_dual.Assign(dual_battery.is_charging);
@@ -80,7 +80,11 @@ Result NPad::Activate(u64 aruid) {
    std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};

    auto* data = applet_resource_holder.applet_resource->GetAruidData(aruid);
-    const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
+    auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
+        aruid_index = 0;
+    }

    if (data == nullptr || !data->flag.is_assigned) {
        return ResultSuccess;
@@ -1099,13 +1103,16 @@ Result NPad::RegisterAppletResourceUserId(u64 aruid) {

 void NPad::UnregisterAppletResourceUserId(u64 aruid) {
    // TODO: Remove this once abstract pad is emulated properly
-    const auto aruid_index = npad_resource.GetIndexFromAruid(aruid);
+    auto aruid_index = npad_resource.GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
+        aruid_index = 0;
+    }
    for (auto& controller : controller_data[aruid_index]) {
        controller.is_active = false;
        controller.is_connected = false;
        controller.shared_memory = nullptr;
    }
-
    npad_resource.UnregisterAppletResourceUserId(aruid);
 }

@@ -71,6 +71,9 @@ Result NPadResource::RegisterAppletResourceUserId(u64 aruid) {

 void NPadResource::UnregisterAppletResourceUserId(u64 aruid) {
    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return;
+    }

    FreeAppletResourceId(aruid);
    if (aruid_index < AruidIndexMax) {
@@ -44,7 +44,7 @@ if (MSVC)
        /we4800 # Implicit conversion from 'type' to bool. Possible information loss
    )
 else()
-    target_compile_options(input_common PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>)
+    target_compile_options(input_common PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wconversion>)
 endif()

 if (ANDROID)
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -157,8 +160,8 @@ Common::ParamPackage Android::BuildButtonParamPackageForButton(PadIdentifier ide

 bool Android::MatchVID(Common::UUID device, const std::vector<std::string>& vids) const {
    for (size_t i = 0; i < vids.size(); ++i) {
-        auto fucker = device.RawString();
-        if (fucker.find(vids[i]) != std::string::npos) {
+        auto dev_str = device.RawString();
+        if (dev_str.find(vids[i]) != std::string::npos) {
            return true;
        }
    }
@@ -648,6 +648,13 @@ SDLDriver::SDLDriver(std::string input_engine_) : InputEngine(std::move(input_en
    // Disable raw input. When enabled this setting causes SDL to die when a web applet opens
    SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, Settings::values.enable_raw_input ? "1" : "0");

+#ifdef _WIN32
+    if (Settings::values.disable_wgi_xinput) {
+        SDL_SetHintWithPriority(SDL_HINT_JOYSTICK_RAWINPUT_CORRELATE_XINPUT, "0", SDL_HINT_OVERRIDE);
+        SDL_SetHintWithPriority(SDL_HINT_JOYSTICK_WGI, "0", SDL_HINT_OVERRIDE);
+    }
+#endif
+
    // SDL3 defaults Steam Controller Bluetooth HIDAPI support to off, which can disable gyro.
    SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_STEAM, "1");
    SDL_SetHint(SDL_HINT_GAMECONTROLLER_SENSOR_FUSION, "1");
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
@@ -28,6 +28,6 @@ if (ENABLE_WEB_SERVICE)
 endif()

 # Solaris uses /lib/amd64/libsocket.so and /lib/amd64/libnsl.so
-if (PLATFORM_SUN)
+if (SOLARIS)
    target_link_libraries(network PRIVATE socket nsl)
 endif()
@@ -253,7 +253,7 @@ if (MSVC)
    )
 else()
    target_compile_options(shader_recompiler PRIVATE
-        $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>
+        $<$<COMPILE_LANGUAGE:C,CXX>:-Wconversion>
        # Bracket depth determines maximum size of a fold expression in Clang since 9c9974c3ccb6.
        # And this in turns limits the size of a std::array.
        $<$<CXX_COMPILER_ID:Clang>:-fbracket-depth=1024>
@@ -373,7 +373,7 @@ else()
            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-shadow>
            $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-unused-local-typedef>)
    else()
-        target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Werror=conversion>)
+        target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wconversion>)
    endif()

    target_compile_options(video_core PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>)
@@ -2257,7 +2257,7 @@ public:
            /// Returns whether the vertex array specified by index is supposed to be
            /// accessed per instance or not.
            bool IsInstancingEnabled(std::size_t index) const {
-                return bool(is_instanced[index]); //FUCK YOU MSVC
+                return bool(is_instanced[index]);
            }
        };

@@ -40,7 +40,6 @@ public:
    }

    struct Regs {
-        // No fucking idea
        INSERT_PADDING_BYTES_NOINIT(0x48);
    } regs{};
 private:
@@ -963,7 +963,7 @@ void Vic::WriteABGR(const OutputSurfaceConfig& output_surface_config, VideoPixel
                    auto pixel1213 = _mm_load_si128((__m128i*)&inp[src + x + 12]);
                    auto pixel1415 = _mm_load_si128((__m128i*)&inp[src + x + 14]);

-                    // Right-shift the channels by 16 to un-do the left shit on read and bring the range
+                    // Right-shift the channels by 16 to un-do the left shift on read and bring the range
                    // back to 8-bit.
                    pixel01 = _mm_srli_epi16(pixel01, 2);
                    pixel23 = _mm_srli_epi16(pixel23, 2);
@@ -88,7 +88,7 @@ set(SHADER_FILES
    ${CMAKE_CURRENT_SOURCE_DIR}/sgsr1_shader_mobile_edge_direction.frag
 )

-if (PLATFORM_HAIKU)
+if (HAIKUOS)
    # glslangValidator WILL crash, glslang will not
    set(GLSLANGVALIDATOR "glslang")
 else()
@@ -441,7 +441,7 @@ void MacroInterpreterImpl::Reset() {
    pc = 0;
    delayed_pc = {};
    method_address.raw = 0;
-    // Vector must hold its last indices otherwise wonky shit will happen
+    // Vector must hold its last indices otherwise chaos will ensue
    // The next parameter index starts at 1, because $r1 already has the value of the first
    // parameter.
    next_parameter_index = 1;
@@ -59,7 +59,7 @@ std::vector<std::string> GetExtensions() {
    std::vector<std::string> extensions;
    for (GLint index = 0; index < num_extensions; ++index) {
        auto const* p = reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, GLuint(index)));
-        if (p != nullptr) // Fuck you? - sincerely, buggy mesa drivers
+        if (p != nullptr)
            extensions.push_back(std::string{p});
    }
    return extensions;
@@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)

 # Set the RPATH for Qt Libraries
 # This must be done before the `yuzu` target is created
-if (YUZU_USE_BUNDLED_QT AND PLATFORM_LINUX)
+if (YUZU_USE_BUNDLED_QT AND LINUX)
    set(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/bin/lib/")
 endif()

@@ -99,6 +99,7 @@ ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QW

 #ifndef _WIN32
    ui->enable_raw_input->setVisible(false);
+    ui->disable_wgi_xinput->setVisible(false);
 #endif

    LoadConfiguration();
@@ -139,6 +140,7 @@ void ConfigureInputAdvanced::ApplyConfiguration() {
    Settings::values.emulate_analog_keyboard = ui->emulate_analog_keyboard->isChecked();
    Settings::values.touchscreen.enabled = ui->touchscreen_enabled->isChecked();
    Settings::values.enable_raw_input = ui->enable_raw_input->isChecked();
+    Settings::values.disable_wgi_xinput = ui->disable_wgi_xinput->isChecked();
    Settings::values.enable_udp_controller = ui->enable_udp_controller->isChecked();
    Settings::values.controller_navigation = ui->controller_navigation->isChecked();
    Settings::values.enable_ring_controller = ui->enable_ring_controller->isChecked();
@@ -174,6 +176,7 @@ void ConfigureInputAdvanced::LoadConfiguration() {
    ui->emulate_analog_keyboard->setChecked(Settings::values.emulate_analog_keyboard.GetValue());
    ui->touchscreen_enabled->setChecked(Settings::values.touchscreen.enabled);
    ui->enable_raw_input->setChecked(Settings::values.enable_raw_input.GetValue());
+    ui->disable_wgi_xinput->setChecked(Settings::values.disable_wgi_xinput.GetValue());
    ui->enable_udp_controller->setChecked(Settings::values.enable_udp_controller.GetValue());
    ui->controller_navigation->setChecked(Settings::values.controller_navigation.GetValue());
    ui->enable_ring_controller->setChecked(Settings::values.enable_ring_controller.GetValue());
@@ -2757,6 +2757,22 @@
                       </property>
                     </widget>
                   </item>
+                   <item row="9" column="0">
+                     <widget class="QCheckBox" name="disable_wgi_xinput">
+                       <property name="toolTip">
+                         <string>Aimed to disable SDL GUIDE button hack: synthetic GUIDE(HOME) event when SELECT(MINUS) + START(PLUS) pressed. May impact Win related trigger/rumble/etc stuff</string>
+                       </property>
+                       <property name="minimumSize">
+                         <size>
+                           <width>0</width>
+                           <height>23</height>
+                         </size>
+                       </property>
+                       <property name="text">
+                         <string>Disable SDL WGI/XInput (Requires restart)</string>
+                       </property>
+                     </widget>
+                   </item>
                 </layout>
               </widget>
             </item>
@@ -16,6 +16,12 @@
 #include <sys/resource.h>
 #endif

+#if defined(__APPLE__)
+#include <climits>
+#include <cstdlib>
+#include <cstring>
+#endif
+
 #include "main_window.h"

 #ifdef _WIN32
@@ -126,6 +132,16 @@ int main(int argc, char* argv[]) {
 #endif // _WIN32

 #if defined(__APPLE__)
+    // Convert the relative path to an absolute path before the chdir
+    char resolved[PATH_MAX];
+    for (int i = 1; i < argc; ++i) {
+        if (strcmp(argv[i], "-u") == 0 || strcmp(argv[i], "-input-profile") == 0) {
+            ++i;
+        } else if (argv[i][0] != '-' && argv[i][0] != '/' && realpath(argv[i], resolved)) {
+            argv[i] = strdup(resolved);
+        }
+    }
+
    // If you start a bundle (binary) on OSX without the Terminal, the working directory is "/".
    // But since we require the working directory to be the executable path for the location of
    // the user folder in the Qt Frontend, we need to cd into that working directory
@@ -1,7 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-// Qt on macOS doesn't define VMA shit
+// Static Qt on macOS doesn't use Vulkan
+// Other platforms do, and thus have conflicting VulkanMemoryAllocator symbols
 #if defined(QT_STATICPLUGIN) && !defined(__APPLE__)
 #undef VMA_IMPLEMENTATION
 #endif
@@ -38,7 +38,7 @@ void MigrationWorker::process() {
    try {
        fs::remove_all(eden_dir);
    } catch (fs::filesystem_error& _) {
-        // ignore because linux does stupid crap sometimes
+        // directory may not exist at this point, that's fine
    }

    switch (strategy) {
@@ -5,6 +5,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <SDL3/SDL.h>
+#include <SDL3/SDL_timer.h>
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif

 #include "common/logging.h"
 #include "common/scm_rev.h"
@@ -26,9 +30,17 @@ EmuWindow_SDL3::EmuWindow_SDL3(InputCommon::InputSubsystem* input_subsystem_, Co
        LOG_CRITICAL(Frontend, "Failed to initialize SDL3: {}, Exiting...", SDL_GetError());
        exit(1);
    }
+    titlebar_timer = SDL_AddTimer(2000, [](void *userdata, SDL_TimerID, Uint32) -> Uint32 {
+        auto* this_ = (EmuWindow_SDL3*)userdata;
+        auto const results = this_->system.GetAndResetPerfStats();
+        auto const title = fmt::format("{} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc, results.average_game_fps, results.emulation_speed * 100.0f);
+        SDL_SetWindowTitle(this_->render_window, title.c_str());
+        return 2000;
+    }, this);
 }

 EmuWindow_SDL3::~EmuWindow_SDL3() {
+    SDL_RemoveTimer(titlebar_timer);
    system.HIDCore().UnloadInputDevices();
    input_subsystem->Shutdown();
    SDL_Quit();
@@ -132,8 +144,7 @@ void EmuWindow_SDL3::Fullscreen() {
    switch (Settings::values.fullscreen_mode.GetValue()) {
    case Settings::FullscreenMode::Exclusive:
        // Set window size to render size before entering fullscreen in exclusive mode.
-        if (const SDL_DisplayMode* display_mode_ptr =
-                SDL_GetDesktopDisplayMode(SDL_GetDisplayForWindow(render_window))) {
+        if (const SDL_DisplayMode* display_mode_ptr = SDL_GetDesktopDisplayMode(SDL_GetDisplayForWindow(render_window))) {
            display_mode = *display_mode_ptr;
            SDL_SetWindowSize(render_window, display_mode.w, display_mode.h);
            SDL_SetWindowFullscreenMode(render_window, &display_mode);
@@ -165,92 +176,60 @@ void EmuWindow_SDL3::Fullscreen() {
    }
 }

-void EmuWindow_SDL3::WaitEvent() {
-    // Called on main thread
-    SDL_Event event;
-
-    if (!SDL_WaitEvent(&event)) {
-        const char* error = SDL_GetError();
-        if (!error || strcmp(error, "") == 0) {
-            // https://github.com/libsdl-org/SDL/issues/5780
-            // Sometimes SDL will return without actually having hit an error condition;
-            // just ignore it in this case.
-            return;
-        }
-
-        LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", error);
-        exit(1);
-    }
-
+void EmuWindow_SDL3::OnEvent(SDL_Event& event) {
+    // Notice how we skip the "update title" aspect on most events
+    // this is because some WMs do NOT like changing titles while resizing
+    // so let's just... not do that, thanks :)
+    // Afterall we don't really expect the user to pay attention to the titlebar
+    // while they're moving a lot of shit around...
    switch (event.type) {
    case SDL_EVENT_WINDOW_RESIZED:
    case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
    case SDL_EVENT_WINDOW_MAXIMIZED:
    case SDL_EVENT_WINDOW_RESTORED:
-        OnResize();
-        break;
+        return OnResize();
    case SDL_EVENT_WINDOW_MINIMIZED:
        is_shown = false;
-        OnResize();
-        break;
+        return OnResize();
    case SDL_EVENT_WINDOW_EXPOSED:
        is_shown = true;
-        OnResize();
-        break;
+        return OnResize();
    case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
        is_open = false;
-        break;
+        return;
    case SDL_EVENT_KEY_DOWN:
    case SDL_EVENT_KEY_UP:
-        OnKeyEvent(static_cast<int>(event.key.scancode), event.key.down ? 1 : 0);
-        break;
+        return OnKeyEvent(int(event.key.scancode), event.key.down ? 1 : 0);
    case SDL_EVENT_MOUSE_MOTION:
        // ignore if it came from touch
        if (event.button.which != SDL_TOUCH_MOUSEID)
            OnMouseMotion(event.motion.x, event.motion.y);
-        break;
+        return;
    case SDL_EVENT_MOUSE_BUTTON_DOWN:
    case SDL_EVENT_MOUSE_BUTTON_UP:
        // ignore if it came from touch
-        if (event.button.which != SDL_TOUCH_MOUSEID) {
-            OnMouseButton(event.button.button, event.button.down ? 1 : 0,
-                          static_cast<s32>(event.button.x), static_cast<s32>(event.button.y));
-        }
-        break;
+        if (event.button.which != SDL_TOUCH_MOUSEID)
+            OnMouseButton(event.button.button, event.button.down ? 1 : 0, s32(event.button.x), s32(event.button.y));
+        return;
    case SDL_EVENT_FINGER_DOWN:
-        OnFingerDown(event.tfinger.x, event.tfinger.y,
-                     static_cast<std::size_t>(event.tfinger.touchID));
-        break;
+        return OnFingerDown(event.tfinger.x, event.tfinger.y, std::size_t(event.tfinger.touchID));
    case SDL_EVENT_FINGER_MOTION:
-        OnFingerMotion(event.tfinger.x, event.tfinger.y,
-                       static_cast<std::size_t>(event.tfinger.touchID));
-        break;
+        return OnFingerMotion(event.tfinger.x, event.tfinger.y, std::size_t(event.tfinger.touchID));
    case SDL_EVENT_FINGER_UP:
-        OnFingerUp();
-        break;
+        return OnFingerUp();
    case SDL_EVENT_QUIT:
        is_open = false;
-        break;
+        return;
    default:
        break;
    }
-
-    const u32 current_time = SDL_GetTicks();
-    if (current_time > last_time + 2000) {
-        const auto results = system.GetAndResetPerfStats();
-        const auto title = fmt::format("{} | {}-{} | FPS: {:.0f} ({:.0f}%)",
-                                       Common::g_build_fullname,
-                                       Common::g_scm_branch,
-                                       Common::g_scm_desc,
-                                       results.average_game_fps,
-                                       results.emulation_speed * 100.0);
-        SDL_SetWindowTitle(render_window, title.c_str());
-        last_time = current_time;
-    }
 }

 // Credits to Samantas5855 and others for this function.
 void EmuWindow_SDL3::SetWindowIcon() {
+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
+    // Icons do not work yet
+#else
    SDL_IOStream* const yuzu_icon_stream = SDL_IOFromConstMem((void*)yuzu_icon, yuzu_icon_size);
    if (yuzu_icon_stream == nullptr) {
        LOG_WARNING(Frontend, "Failed to create Eden icon stream.");
@@ -264,6 +243,7 @@ void EmuWindow_SDL3::SetWindowIcon() {
    // The icon is attached to the window pointer
    SDL_SetWindowIcon(render_window, window_icon);
    SDL_DestroySurface(window_icon);
+#endif
 }

 void EmuWindow_SDL3::OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) {
@@ -9,11 +9,12 @@
 #include <tuple>
 #include <utility>

+#include <SDL3/SDL.h>
+#include <SDL3/SDL_timer.h>
+
 #include "core/frontend/emu_window.h"
 #include "core/frontend/graphics_context.h"

-struct SDL_Window;
-
 namespace Core {
 class System;
 }
@@ -35,7 +36,7 @@ public:
    bool IsShown() const override;

    /// Wait for the next event on the main thread.
-    void WaitEvent();
+    void OnEvent(SDL_Event& event);

    // Sets the window icon from yuzu.bmp
    void SetWindowIcon();
@@ -80,6 +81,9 @@ protected:
    /// Called when a configuration change affects the minimal size of the window
    void OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) override;

+    /// Periodic changer of titlebar (independent of event loop)
+    SDL_TimerID titlebar_timer;
+
    /// Is the window still open?
    bool is_open = true;

@@ -89,9 +93,6 @@ protected:
    /// Internal SDL3 render window
    SDL_Window* render_window{};

-    /// Keeps track of how often to update the title bar during gameplay
-    u32 last_time = 0;
-
    /// Input subsystem to use with this window.
    InputCommon::InputSubsystem* input_subsystem;

@@ -8,6 +8,12 @@
 #include <memory>
 #include <regex>
 #include <string>
+#include "common/settings_enums.h"
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
+#define SDL_MAIN_USE_CALLBACKS 1
+#include <SDL3/SDL_main.h>

 #include <fmt/ostream.h>

@@ -39,9 +45,7 @@
 #ifdef _WIN32
 // windows.h needs to be included before shellapi.h
 #include <windows.h>
-
 #include <shellapi.h>
-
 #include "common/windows/timer_resolution.h"
 #endif

@@ -174,8 +178,14 @@ static void OnStatusMessageReceived(const Network::StatusMessageEntry& msg) {
        std::cout << std::endl << "* " << message << std::endl << std::endl;
 }

-/// Application entry point
-int main(int argc, char** argv) {
+struct SdlState {
+    Core::System system{};
+    std::unique_ptr<EmuWindow_SDL3> emu_window;
+};
+
+extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
+    SdlState* state = new SdlState();
+
 #ifdef _WIN32
    if (AttachConsole(ATTACH_PARENT_PROCESS)) {
        freopen("CONOUT$", "wb", stdout);
@@ -193,7 +203,7 @@ int main(int argc, char** argv) {
    auto argv_w = CommandLineToArgvW(GetCommandLineW(), &argc_w);
    if (argv_w == nullptr) {
        LOG_CRITICAL(Frontend, "Failed to get command line arguments");
-        return -1;
+        return SDL_APP_FAILURE;
    }
 #endif
    std::string filepath;
@@ -247,7 +257,7 @@ int main(int argc, char** argv) {
                break;
            case 'h':
                PrintHelp(argv[0]);
-                return 0;
+                return SDL_APP_FAILURE;
            case 'g':
                filepath = std::string(optarg);
                break;
@@ -264,7 +274,7 @@ int main(int argc, char** argv) {
                if (!std::regex_match(str_arg, re)) {
                    std::cout << "Wrong format for option --multiplayer\n";
                    PrintHelp(argv[0]);
-                    return -1;
+                    return SDL_APP_FAILURE;
                }

                std::smatch match;
@@ -279,11 +289,11 @@ int main(int argc, char** argv) {
                std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$");
                if (!std::regex_match(nickname, nickname_re)) {
                    LOG_ERROR(Frontend, "Nickname is not valid. Must be 4 to 20 alphanumeric characters");
-                    return -1;
+                    return SDL_APP_FAILURE;
                }
                if (address.empty()) {
                    LOG_ERROR(Frontend, "Address to room must not be empty");
-                    return -1;
+                    return SDL_APP_FAILURE;
                }
                break;
            }
@@ -296,7 +306,7 @@ int main(int argc, char** argv) {
                break;
            case 'v':
                PrintVersion();
-                return -1;
+                return SDL_APP_FAILURE;
            case 'n':
                force_null_render = true;
                break;
@@ -358,79 +368,73 @@ int main(int argc, char** argv) {

    if (filepath.empty()) {
        LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified");
-        return -1;
+        return SDL_APP_FAILURE;
    }

-    Core::System system{};
-    system.Initialize();
+    state->system.Initialize();

    InputCommon::InputSubsystem input_subsystem{};

    // Apply the command line arguments
-    system.ApplySettings();
+    state->system.ApplySettings();

-    std::unique_ptr<EmuWindow_SDL3> emu_window;
    switch (Settings::values.renderer_backend.GetValue()) {
 #ifdef HAS_OPENGL
    case Settings::RendererBackend::OpenGL_GLSL:
    case Settings::RendererBackend::OpenGL_GLASM:
    case Settings::RendererBackend::OpenGL_SPIRV:
-        emu_window = std::make_unique<EmuWindow_SDL3_GL>(&input_subsystem, system, fullscreen);
+        state->emu_window = std::make_unique<EmuWindow_SDL3_GL>(&input_subsystem, state->system, fullscreen);
        break;
 #endif
    case Settings::RendererBackend::Vulkan:
-        emu_window = std::make_unique<EmuWindow_SDL3_VK>(&input_subsystem, system, fullscreen);
+        state->emu_window = std::make_unique<EmuWindow_SDL3_VK>(&input_subsystem, state->system, fullscreen);
        break;
    case Settings::RendererBackend::Null:
-        emu_window = std::make_unique<EmuWindow_SDL3_Null>(&input_subsystem, system, fullscreen);
+        state->emu_window = std::make_unique<EmuWindow_SDL3_Null>(&input_subsystem, state->system, fullscreen);
        break;
    default:
        LOG_CRITICAL(Frontend, "Invalid renderer backend");
-        return -1;
+        return SDL_APP_FAILURE;
    }

 #ifdef _WIN32
    Common::Windows::SetCurrentTimerResolutionToMaximum();
-    system.CoreTiming().SetTimerResolutionNs(Common::Windows::GetCurrentTimerResolution());
+    state->system.CoreTiming().SetTimerResolutionNs(Common::Windows::GetCurrentTimerResolution());
 #endif

-    system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
-    system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
-    system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
-    system.GetUserChannel().clear();
+    state->system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
+    state->system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
+    state->system.GetFileSystemController().CreateFactories(*state->system.GetFilesystem());
+    state->system.GetUserChannel().clear();

    Service::AM::FrontendAppletParameters load_parameters{
        .applet_id = Service::AM::AppletId::Application,
    };
-    const Core::SystemResultStatus load_result{system.Load(*emu_window, filepath, load_parameters)};
-
+    const Core::SystemResultStatus load_result = state->system.Load(*state->emu_window, filepath, load_parameters);
    switch (load_result) {
-    case Core::SystemResultStatus::ErrorGetLoader:
-        LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filepath);
-        return -1;
-    case Core::SystemResultStatus::ErrorLoader:
-        LOG_CRITICAL(Frontend, "Failed to load ROM!");
-        return -1;
-    case Core::SystemResultStatus::ErrorNotInitialized:
-        LOG_CRITICAL(Frontend, "CPUCore not initialized");
-        return -1;
-    case Core::SystemResultStatus::ErrorVideoCore:
-        LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
-        return -1;
    case Core::SystemResultStatus::Success:
        break; // Expected case
+    case Core::SystemResultStatus::ErrorGetLoader:
+        LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filepath);
+        return SDL_APP_FAILURE;
+    case Core::SystemResultStatus::ErrorLoader:
+        LOG_CRITICAL(Frontend, "Failed to load ROM!");
+        return SDL_APP_FAILURE;
+    case Core::SystemResultStatus::ErrorNotInitialized:
+        LOG_CRITICAL(Frontend, "CPUCore not initialized");
+        return SDL_APP_FAILURE;
+    case Core::SystemResultStatus::ErrorVideoCore:
+        LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
+        return SDL_APP_FAILURE;
    default:
-        if (static_cast<u32>(load_result) >
-            static_cast<u32>(Core::SystemResultStatus::ErrorLoader)) {
-            const u16 loader_id = static_cast<u16>(Core::SystemResultStatus::ErrorLoader);
-            const u16 error_id = static_cast<u16>(load_result) - loader_id;
-            LOG_CRITICAL(Frontend,
-                         "While attempting to load the ROM requested, an error occurred. Please "
-                         "refer to the Eden wiki for more information or the Eden discord for "
-                         "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
-                         loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));
-        }
-        break;
+        const u16 loader_id = u16(Core::SystemResultStatus::ErrorLoader);
+        const u16 error_id = u16(load_result) - loader_id;
+        LOG_CRITICAL(Frontend,
+            "While attempting to load the ROM requested, an error occurred. Please "
+            "refer to the Eden wiki for more information or the Eden discord for "
+            "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
+            loader_id, error_id, Loader::ResultStatus(error_id));
+        return SDL_APP_FAILURE;
    }

    if (use_multiplayer) {
@@ -439,40 +443,46 @@ int main(int argc, char** argv) {
            member->BindOnStatusMessageReceived(OnStatusMessageReceived);
            member->BindOnStateChanged(OnStateChanged);
            member->BindOnError(OnNetworkError);
-            LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port,
-                      nickname);
+            LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port, nickname);
            member->Join(nickname, address.c_str(), port, 0, Network::NoPreferredIP, password);
        } else {
            LOG_ERROR(Network, "Could not access RoomMember");
-            return 0;
+            return SDL_APP_FAILURE;
        }
    }

    // Core is loaded, start the GPU (makes the GPU contexts current to this thread)
-    system.GPU().Start();
-    system.GetCpuManager().OnGpuReady();
+    state->system.GPU().Start();
+    state->system.GetCpuManager().OnGpuReady();

    if (Settings::values.use_disk_shader_cache.GetValue()) {
-        system.Renderer().ReadRasterizer()->LoadDiskResources(
-            system.GetApplicationProcessProgramID(), std::stop_token{},
+        state->system.Renderer().ReadRasterizer()->LoadDiskResources(
+            state->system.GetApplicationProcessProgramID(), std::stop_token{},
            [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
    }

-    system.RegisterExitCallback([&] {
-        // Just exit right away.
-        exit(0);
-    });
-    void(system.Run());
-    if (system.DebuggerEnabled()) {
-        system.InitializeDebugger();
-    }
-    while (emu_window->IsOpen()) {
-        emu_window->WaitEvent();
-    }
-    system.DetachDebugger();
-    void(system.Pause());
-    system.ShutdownMainProcess();
-    return 0;
+    // don't do anything, SDL3 already exists for us :D
+    state->system.RegisterExitCallback([] {});
+    void(state->system.Run());
+    if (state->system.DebuggerEnabled())
+        state->system.InitializeDebugger();
+    return SDL_APP_SUCCESS;
+}
+extern "C" SDL_AppResult SDL_AppIterate(void *appstate) {
+    SdlState *state = (SdlState *)appstate;
+    return state->emu_window->IsOpen() ? SDL_APP_CONTINUE : SDL_APP_SUCCESS;
+}
+extern "C" SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
+    SdlState *state = (SdlState *)appstate;
+    state->emu_window->OnEvent(*event);
+    return SDL_APP_SUCCESS;
+}
+extern "C" void SDL_AppQuit(void *appstate, SDL_AppResult result) {
+    SdlState *state = (SdlState *)appstate;
+    state->system.DetachDebugger();
+    void(state->system.Pause());
+    state->system.ShutdownMainProcess();
+    delete state;
 }

 #define VMA_IMPLEMENTATION
Author	SHA1	Message	Date
lizzie	f76174bd2a	pcv + better oob for hle	2026-08-15 09:25:52 +00:00
lizzie	26c761736b	ga	2026-08-15 08:53:05 +00:00
lizzie	66a45785ab	bsd:s and bsd:u enforce socket() distinctions	2026-08-15 08:43:06 +00:00
lizzie	1c54b78734	[hle/service] fix NPad crashes, add missing homebrew services Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-08-15 08:17:38 +00:00
lizzie	e7a931d06b	[eden-cli] rework loop to use new SDL3 event dispatch system (#4108 ) modernized into the new SDL3 API for event dispatching. also stopped using the periodic comparison and just added a SDL timer like it wants us to do is it better than before? well it's certainly more portable now. docs say this improves battery usage on busywaits for event polling. Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4108 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-08-12 18:10:24 +02:00
crueter	8648c27cbb	[cmake] Simplify DetectPlatform and normalize platform names (#4183 ) Since 3.25 introduced `LINUX` and `BSD`, use them, and standardize other platforms to that style Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4183 Reviewed-by: Samuel <lizzie@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-08-10 04:57:38 +02:00
codeman4033	def76946f0	[forgejo] Replace mentions of yuzu in issue templates with eden (#3842 ) Also fix the broken link for log files in the bug report Signed-off-by: codeman4033 <codeman4033@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3842 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: Samuel <lizzie@eden-emu.dev>	2026-08-10 03:55:03 +02:00
BoiledElectricity	13d39f39aa	[qt] fix relative ROM paths passed on the CLI on macOS (#4105 ) On macOS, convert relative paths to absolute paths before changing the working directory. Otherwise, valid Switch formats may incorrectly fail with a "The ROM format is not supported" error. Fixes: https://github.com/eden-emulator/Issue-Reports/issues/404 Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4105 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: Samuel <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-08-09 17:18:58 +02:00
lizzie	7731b5bc86	[core/hle/kernel/svc] demote ResetSignal log Debug->Trace (#4161 ) I don't see why it's LOG_DEBUG if WaitSynchronization is LOG_TRACE, leaves incomplete data may as well bundle it to trace with the others? :) Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4161 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: Maufeat <sahyno1996@gmail.com>	2026-08-09 14:13:27 +02:00
lizzie	c4ab2f6b9e	[cmake] Add ENABLE_WERROR option (#4080 ) Should warnings be errors? that's a philosophical debate which I can only answer with "no, but if you think otherwise here is an option for you" Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4080 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-08-09 02:56:28 +02:00
xbzk	dd12266c26	[input] added option to disable wgi/xinput to prevent SDL GUIDE hack (#4237 ) - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- So, many users hate the fact when they press START+SELECT, an additional HOME event is sent. That is annoying coz for most users' default hotkey settings, it closes eden when not in game, and when in game it calls a NOT controller responsive prompt about leaving Eden. There are several games with reasons to press start+select, also there are homebrews which relies on that combo to open internal menus. Again. That is annoying. Digging deep i've found that SDL implements something called guide hack: When Start+Select is pressed it sends a synthetic GUIDE(which code equals to HOME). This was intended for controllers missing the HOME button, but SDL fails to track them all, and misses API to disabling it. I've figured out a patch to SDL to disable it, but since it would be better to invest on a PR straight into SDL repo, on our side i thought it better to simply add an option to disable WGI (Windows.Gaming.Input) and Xinput, both paths which could lead into the hack enabling. Setting is available in a remote place no one will bother. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4237 Reviewed-by: Samuel <lizzie@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-08-09 02:53:37 +02:00
crueter	a3d32a18b8	[meta] Discourage profanity usage (#4239 ) I'm not into millennial humor, personally. Proactively removed as much profanity as I could grep. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4239 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: Samuel <lizzie@eden-emu.dev>	2026-08-09 02:53:16 +02:00
crueter	c0ffc900cd	[ci] Only update translations once a week (#4256 ) They've slowed down enough at this point. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4256	2026-08-08 05:46:52 +02:00