From 7e938fcdd9e3fd166f3de378cdafe93a7f40df47 Mon Sep 17 00:00:00 2001 From: Reg Tiangha Date: Wed, 21 Aug 2024 14:02:46 -0600 Subject: [PATCH] Replace all remaining Citra references with Lime3DS Whereas previous efforts were focused on the user-facing side, this commit replaces Citra references which are present in the codebase itself. This should be the last time a change like this is ever necessary. --- .ci/linux.sh | 2 +- CMakeLists.txt | 8 +- dist/installer/CMakeLists.txt | 2 +- dist/installer/README.md | 4 +- dist/installer/config/config_linux.xml | 14 +-- dist/installer/config/config_mac.xml | 12 +- dist/installer/config/config_windows.xml | 14 +-- externals/CMakeLists.txt | 6 +- ...bs.cmake => Lime3DSHandleSystemLibs.cmake} | 0 hooks/pre-commit | 2 +- src/CMakeLists.txt | 6 +- ...raApplication.kt => Lime3DSApplication.kt} | 0 .../github/lime3ds/android/NativeLibrary.kt | 2 +- .../android/activities/EmulationActivity.kt | 2 +- .../features/settings/model/Settings.kt | 4 +- .../model/view/InputBindingSetting.kt | 4 +- .../features/settings/ui/SettingsActivity.kt | 4 +- .../settings/ui/SettingsActivityPresenter.kt | 2 +- .../settings/ui/SettingsFragmentPresenter.kt | 2 +- .../CopyDirProgressDialogFragment.kt | 6 +- .../android/fragments/EmulationFragment.kt | 8 +- .../android/fragments/HomeSettingsFragment.kt | 8 +- ...t.kt => Lime3DSDirectoryDialogFragment.kt} | 20 +-- .../SelectUserDirectoryDialogFragment.kt | 4 +- .../android/fragments/SetupFragment.kt | 12 +- .../lime3ds/android/overlay/InputOverlay.kt | 2 +- .../lime3ds/android/ui/main/MainActivity.kt | 12 +- .../android/utils/DirectoryInitialization.kt | 32 ++--- .../lime3ds/android/utils/DocumentsTree.kt | 2 +- ...oryHelper.kt => Lime3DSDirectoryHelper.kt} | 26 ++-- .../android/utils/PermissionsHandler.kt | 16 +-- .../github/lime3ds/android/utils/ThemeUtil.kt | 2 +- .../android/viewmodel/HomeViewModel.kt | 6 +- src/android/app/src/main/jni/config.cpp | 8 +- src/android/app/src/main/jni/default_ini.h | 18 +-- src/android/app/src/main/jni/native.cpp | 18 +-- ...ctory.xml => dialog_lime3ds_directory.xml} | 0 .../src/main/res/layout/fragment_about.xml | 2 +- .../app/src/main/res/values-de/strings.xml | 2 +- .../app/src/main/res/values-es/strings.xml | 25 +--- .../app/src/main/res/values-fr/strings.xml | 6 +- .../{citra_colors.xml => lime_colors.xml} | 0 .../app/src/main/res/values-night/themes.xml | 2 +- .../app/src/main/res/values-pt/strings.xml | 25 +--- .../app/src/main/res/values-ru/strings.xml | 6 +- .../app/src/main/res/values-zh/strings.xml | 6 +- .../src/main/res/values/lime3ds_colors.xml | 35 ++++++ .../app/src/main/res/values/strings.xml | 8 +- .../app/src/main/res/values/styles.xml | 2 +- .../app/src/main/res/values/themes.xml | 2 +- src/audio_core/CMakeLists.txt | 2 +- src/audio_core/cubeb_input.cpp | 8 +- src/audio_core/cubeb_sink.cpp | 6 +- src/common/CMakeLists.txt | 4 +- src/common/aarch64/cpu_detect.cpp | 4 +- src/common/aarch64/cpu_detect.h | 4 +- src/common/aarch64/oaknut_abi.h | 4 +- src/common/aarch64/oaknut_util.h | 4 +- src/common/arch.h | 6 +- src/common/assert.h | 8 +- src/common/common_funcs.h | 8 +- src/common/file_util.cpp | 4 +- src/common/file_util.h | 8 +- src/common/logging/backend.cpp | 16 +-- src/common/logging/text_formatter.cpp | 2 +- src/common/logging/types.h | 2 +- src/common/microprofile.h | 2 +- src/common/microprofileui.h | 2 +- src/common/settings.h | 2 +- src/common/telemetry.cpp | 4 +- src/common/telemetry.h | 2 +- src/common/x64/cpu_detect.cpp | 6 +- src/common/x64/cpu_detect.h | 4 +- src/common/x64/xbyak_abi.h | 4 +- src/common/x64/xbyak_util.h | 4 +- src/core/CMakeLists.txt | 2 +- .../arm/dyncom/arm_dyncom_interpreter.cpp | 10 +- src/core/arm/exclusive_monitor.cpp | 4 +- src/core/cheats/gateway_cheat.cpp | 2 +- src/core/core.cpp | 4 +- src/core/file_sys/plugin_3gx.cpp | 2 +- src/core/file_sys/plugin_3gx.h | 6 +- src/core/hle/kernel/ipc.cpp | 29 ++--- src/core/hle/kernel/kernel.h | 2 +- src/core/hle/kernel/process.cpp | 14 +-- src/core/hle/kernel/svc.cpp | 54 ++++---- src/core/hle/kernel/thread.cpp | 6 +- src/core/hle/kernel/vm_manager.cpp | 9 +- src/core/hle/service/ac/ac.cpp | 6 +- src/core/hle/service/am/am.cpp | 10 +- src/core/hle/service/apt/apt.cpp | 2 +- src/core/hle/service/csnd/csnd_snd.cpp | 2 +- src/core/hle/service/http/http_c.cpp | 4 +- src/core/hle/service/ldr_ro/cro_helper.cpp | 6 +- src/core/hle/service/ldr_ro/ldr_ro.cpp | 18 +-- src/core/hle/service/nwm/nwm_uds.cpp | 2 +- src/core/hle/service/nwm/uds_beacon.cpp | 2 +- src/core/loader/artic.cpp | 12 +- src/core/loader/ncch.cpp | 7 +- src/core/memory.cpp | 119 +++++++++--------- src/core/memory.h | 8 +- src/core/movie.cpp | 4 +- src/core/telemetry_session.cpp | 8 +- src/core/telemetry_session.h | 4 +- src/core/tracer/recorder.h | 2 +- src/dedicated_room/CMakeLists.txt | 2 +- src/dedicated_room/lime-room.cpp | 65 +++++----- src/dedicated_room/lime-room.rc | 2 +- src/input_common/CMakeLists.txt | 2 +- src/input_common/udp/protocol.h | 2 +- src/lime/CMakeLists.txt | 2 +- src/lime/config.cpp | 5 +- src/lime/default_ini.h | 16 +-- src/lime/lime.rc | 2 +- src/lime_qt/CMakeLists.txt | 10 +- src/lime_qt/aboutdialog.ui | 2 +- src/lime_qt/configuration/config.cpp | 16 +-- .../configuration/configure_general.cpp | 4 +- .../configuration/configure_motion_touch.cpp | 4 +- .../configuration/configure_per_game.cpp | 3 +- src/lime_qt/dumping/dumping_dialog.cpp | 4 +- src/lime_qt/game_list.cpp | 9 +- src/lime_qt/main.cpp | 38 +++--- src/lime_qt/main.h | 8 +- src/lime_qt/main.ui | 4 +- src/lime_qt/movie/movie_play_dialog.cpp | 2 +- src/lime_qt/movie/movie_record_dialog.cpp | 2 +- src/lime_qt/multiplayer/direct_connect.cpp | 6 +- src/lime_qt/multiplayer/host_room.cpp | 22 ++-- src/lime_qt/multiplayer/lobby.cpp | 14 +-- src/lime_qt/multiplayer/message.cpp | 4 +- src/network/CMakeLists.txt | 2 +- src/network/announce_multiplayer_session.cpp | 8 +- src/network/artic_base/artic_base_client.cpp | 2 +- src/network/network_settings.h | 4 +- src/network/room.cpp | 6 +- src/network/room.h | 4 +- src/network/verify_user.h | 2 +- src/tests/CMakeLists.txt | 2 +- src/tests/core/hle/kernel/hle_ipc.cpp | 16 +-- src/tests/core/memory/vm_manager.cpp | 2 +- .../video_core/shader/shader_jit_compiler.cpp | 8 +- src/video_core/CMakeLists.txt | 2 +- .../custom_textures/custom_tex_manager.cpp | 2 +- src/video_core/debug_utils/debug_utils.h | 2 +- src/video_core/pica/vertex_loader.cpp | 2 +- .../rasterizer_cache/rasterizer_cache.h | 18 +-- .../rasterizer_cache/rasterizer_cache_base.h | 6 +- .../post_processing_opengl.cpp | 2 +- .../renderer_opengl/post_processing_opengl.h | 2 +- .../renderer_opengl/renderer_opengl.cpp | 2 +- .../renderer_vulkan/vk_platform.cpp | 4 +- src/video_core/shader/shader.cpp | 4 +- src/video_core/shader/shader_jit.cpp | 8 +- src/video_core/shader/shader_jit.h | 4 +- .../shader/shader_jit_a64_compiler.cpp | 4 +- .../shader/shader_jit_a64_compiler.h | 2 +- .../shader/shader_jit_x64_compiler.cpp | 4 +- .../shader/shader_jit_x64_compiler.h | 2 +- src/web_service/CMakeLists.txt | 2 +- src/web_service/announce_room_json.h | 2 +- src/web_service/telemetry_json.h | 2 +- src/web_service/verify_login.h | 4 +- src/web_service/verify_user_jwt.cpp | 2 +- 164 files changed, 652 insertions(+), 627 deletions(-) rename externals/cmake-modules/{CitraHandleSystemLibs.cmake => Lime3DSHandleSystemLibs.cmake} (100%) rename src/android/app/src/main/java/io/github/lime3ds/android/{CitraApplication.kt => Lime3DSApplication.kt} (100%) rename src/android/app/src/main/java/io/github/lime3ds/android/fragments/{CitraDirectoryDialogFragment.kt => Lime3DSDirectoryDialogFragment.kt} (81%) rename src/android/app/src/main/java/io/github/lime3ds/android/utils/{CitraDirectoryHelper.kt => Lime3DSDirectoryHelper.kt} (68%) rename src/android/app/src/main/res/layout/{dialog_citra_directory.xml => dialog_lime3ds_directory.xml} (100%) rename src/android/app/src/main/res/values-night/{citra_colors.xml => lime_colors.xml} (100%) create mode 100644 src/android/app/src/main/res/values/lime3ds_colors.xml diff --git a/.ci/linux.sh b/.ci/linux.sh index 9e324befd..856eae5a6 100755 --- a/.ci/linux.sh +++ b/.ci/linux.sh @@ -7,7 +7,7 @@ if [ "$TARGET" = "appimage" ]; then export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" else # For the linux-fresh verification target, verify compilation without PCH as well. - export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF) + export EXTRA_CMAKE_FLAGS=(-DLIME3DS_USE_PRECOMPILED_HEADERS=OFF) fi mkdir build && cd build diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ebf36798..3203f1304 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,12 +85,12 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) # Compile options CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ${IS_DEBUG_BUILD} "MINGW" OFF) option(ENABLE_LTO "Enable link time optimization" ${DEFAULT_ENABLE_LTO}) -option(CITRA_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) -option(CITRA_WARNINGS_AS_ERRORS "Enable warnings as errors" ON) +option(LIME3DS_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) +option(LIME3DS_WARNINGS_AS_ERRORS "Enable warnings as errors" ON) -include(CitraHandleSystemLibs) +include(Lime3DSHandleSystemLibs) -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) message(STATUS "Using Precompiled Headers.") set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON) diff --git a/dist/installer/CMakeLists.txt b/dist/installer/CMakeLists.txt index 2217f8348..3dcc59653 100644 --- a/dist/installer/CMakeLists.txt +++ b/dist/installer/CMakeLists.txt @@ -11,7 +11,7 @@ endif() set(BUILD_DIR "${CMAKE_BINARY_DIR}/installer") set(DIST_DIR "${BUILD_DIR}/dist") -set(TARGET_FILE "${DIST_DIR}/citra-setup-${PLATFORM}") +set(TARGET_FILE "${DIST_DIR}/lime3ds-setup-${PLATFORM}") file(MAKE_DIRECTORY "${BUILD_DIR}" "${DIST_DIR}") diff --git a/dist/installer/README.md b/dist/installer/README.md index dc58093dd..b43b1f2b5 100644 --- a/dist/installer/README.md +++ b/dist/installer/README.md @@ -1,7 +1,7 @@ -Citra Qt Installer +Lime3DS Qt Installer ================== -This contains the configuration files for building Citra's installer. +This contains the configuration files for building Lime3DS's installer. Installers can only be built on the platform that they are targeting. diff --git a/dist/installer/config/config_linux.xml b/dist/installer/config/config_linux.xml index 12bb780b3..45e6bcbb8 100644 --- a/dist/installer/config/config_linux.xml +++ b/dist/installer/config/config_linux.xml @@ -1,19 +1,19 @@ - Citra + Lime3DS 1.0.0 - Citra Updater - Citra Team - - @HomeDir@/.citra - /opt/citra + Lime3DS Updater + Lime3DS Team + + @HomeDir@/.lime3ds + /opt/lime3ds icon icon.png https://repo.citra-emu.org 1 - Official Citra Repository + Official Lime3DS Repository diff --git a/dist/installer/config/config_mac.xml b/dist/installer/config/config_mac.xml index 7fa6838b8..0ad0933a4 100644 --- a/dist/installer/config/config_mac.xml +++ b/dist/installer/config/config_mac.xml @@ -1,18 +1,18 @@ - Citra + Lime3DS 1.0.0 - Citra Updater - Citra Team - - @ApplicationsDir@/Citra + Lime3DS Updater + Lime3DS Team + + @ApplicationsDir@/Lime3DS icon icon.png https://repo.citra-emu.org 1 - Official Citra Repository + Official Lime3DS Repository diff --git a/dist/installer/config/config_windows.xml b/dist/installer/config/config_windows.xml index 8281edd95..6a6edc7f1 100644 --- a/dist/installer/config/config_windows.xml +++ b/dist/installer/config/config_windows.xml @@ -1,19 +1,19 @@ - Citra + Lime3DS 1.0.0 - Citra Updater - Citra Team - Citra - - @HomeDir@/AppData/Local/Citra + Lime3DS Updater + Lime3DS Team + Lime3DS + + @HomeDir@/AppData/Local/Lime3DS icon icon.png https://repo.citra-emu.org 1 - Official Citra Repository + Official Lime3DS Repository diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fec83a8c5..eb7279724 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -116,7 +116,7 @@ if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE) else() set(DYNARMIC_TESTS OFF CACHE BOOL "") set(DYNARMIC_FRONTENDS "A32" CACHE STRING "") - set(DYNARMIC_USE_PRECOMPILED_HEADERS ${CITRA_USE_PRECOMPILED_HEADERS} CACHE BOOL "") + set(DYNARMIC_USE_PRECOMPILED_HEADERS ${LIME3DS_USE_PRECOMPILED_HEADERS} CACHE BOOL "") add_subdirectory(dynarmic EXCLUDE_FROM_ALL) endif() endif() @@ -267,7 +267,7 @@ if (USE_SYSTEM_JSON) target_link_libraries(json-headers INTERFACE nlohmann_json::nlohmann_json) get_target_property(NLOHMANN_PREFIX nlohmann_json::nlohmann_json INTERFACE_INCLUDE_DIRECTORIES) # The nlohmann-json3 package expects "#include " - # Citra uses "#include " so we have to add this manually + # Lime3DS uses "#include " so we have to add this manually target_include_directories(json-headers SYSTEM INTERFACE "${NLOHMANN_PREFIX}/nlohmann") else() target_include_directories(json-headers SYSTEM INTERFACE ./json) @@ -298,7 +298,7 @@ add_library(httplib INTERFACE) if(USE_SYSTEM_CPP_HTTPLIB) find_package(CppHttp 0.14.1) # Detect if system cpphttplib is a shared library - # this breaks building as Citra relies on functions that are moved + # this breaks building as Lime3DS relies on functions that are moved # into the shared object. get_target_property(HTTP_LIBS httplib::httplib INTERFACE_LINK_LIBRARIES) if(HTTP_LIBS) diff --git a/externals/cmake-modules/CitraHandleSystemLibs.cmake b/externals/cmake-modules/Lime3DSHandleSystemLibs.cmake similarity index 100% rename from externals/cmake-modules/CitraHandleSystemLibs.cmake rename to externals/cmake-modules/Lime3DSHandleSystemLibs.cmake diff --git a/hooks/pre-commit b/hooks/pre-commit index 098a99216..0e99f85b7 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -1,6 +1,6 @@ #!/bin/sh -# Enforce citra's whitespace policy +# Enforce Lime3DS's whitespace policy git config --local core.whitespace tab-in-indent,trailing-space paths_to_check="src/ CMakeLists.txt" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bda0be14..793ada6dc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -85,14 +85,14 @@ if (MSVC) /wd4324 # 'struct_name': structure was padded due to __declspec(align()) ) - if (CITRA_WARNINGS_AS_ERRORS) + if (LIME3DS_WARNINGS_AS_ERRORS) add_compile_options(/WX) endif() # Since MSVC's debugging information is not very deterministic, so we have to disable it # when using ccache or other caching tools if (CMAKE_C_COMPILER_LAUNCHER STREQUAL "ccache" OR CMAKE_CXX_COMPILER_LAUNCHER STREQUAL "ccache" - OR CITRA_USE_PRECOMPILED_HEADERS) + OR LIME3DS_USE_PRECOMPILED_HEADERS) # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21 add_compile_options(/Z7) else() @@ -120,7 +120,7 @@ else() add_compile_options(-D_FORTIFY_SOURCE=2) endif() - if (CITRA_WARNINGS_AS_ERRORS) + if (LIME3DS_WARNINGS_AS_ERRORS) add_compile_options(-Werror) endif() diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/CitraApplication.kt b/src/android/app/src/main/java/io/github/lime3ds/android/Lime3DSApplication.kt similarity index 100% rename from src/android/app/src/main/java/io/github/lime3ds/android/CitraApplication.kt rename to src/android/app/src/main/java/io/github/lime3ds/android/Lime3DSApplication.kt diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt b/src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt index 79b77f77c..2c8cad96f 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/NativeLibrary.kt @@ -29,7 +29,7 @@ import java.util.Date /** * Class which contains methods that interact - * with the native side of the Citra code. + * with the native side of the Lime3DS code. */ object NativeLibrary { /** diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt index 69c7d5333..aef0bbe95 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/activities/EmulationActivity.kt @@ -89,7 +89,7 @@ class EmulationActivity : AppCompatActivity() { // Set these options now so that the SurfaceView the game renders into is the right size. enableFullscreenImmersive() - // Override Citra core INI with the one set by our in game menu + // Override Lime3DS core INI with the one set by our in game menu NativeLibrary.swapScreens( EmulationMenuSettings.swapScreens, windowManager.defaultDisplay.rotation diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt index fca956267..84f455974 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/Settings.kt @@ -42,14 +42,14 @@ class Settings { fun loadSettings(view: SettingsActivityView? = null) { sections = SettingsSectionMap() - loadCitraSettings(view) + loadLime3DSSettings(view) if (!TextUtils.isEmpty(gameId)) { loadCustomGameSettings(gameId!!, view) } isLoaded = true } - private fun loadCitraSettings(view: SettingsActivityView?) { + private fun loadLime3DSSettings(view: SettingsActivityView?) { for ((fileName) in configFileSectionsMap) { sections.putAll(SettingsFile.readFile(fileName, view)) } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt index 622bfb0e4..493e2e7d9 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/model/view/InputBindingSetting.kt @@ -108,7 +108,7 @@ class InputBindingSetting( } /** - * Returns the Citra button code for the settings key. + * Returns the Lime3DS button code for the settings key. */ private val buttonCode: Int get() = @@ -259,7 +259,7 @@ class InputBindingSetting( private const val INPUT_MAPPING_PREFIX = "InputMapping" /** - * Returns the settings key for the specified Citra button code. + * Returns the settings key for the specified Lime3DS button code. */ private fun getButtonKey(buttonCode: Int): String = when (buttonCode) { diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt index d386ac44b..fa59354b8 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivity.kt @@ -212,11 +212,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { // Set the root of the document tree before we create a new config file or the native code // will fail when creating the file. - if (DirectoryInitialization.setCitraUserDirectory()) { + if (DirectoryInitialization.setLime3DSUserDirectory()) { LimeApplication.documentsTree.setRoot(Uri.parse(DirectoryInitialization.userPath)) NativeLibrary.createConfigFile() } else { - throw IllegalStateException("Citra directory unavailable when accessing config file!") + throw IllegalStateException("Lime3DS directory unavailable when accessing config file!") } // Set default values for system config file diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt index 9197081dd..015a6afd7 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsActivityPresenter.kt @@ -46,7 +46,7 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView) } private fun prepareDirectoriesIfNeeded() { - if (!DirectoryInitialization.areCitraDirectoriesReady()) { + if (!DirectoryInitialization.areLime3DSDirectoriesReady()) { DirectoryInitialization.start() } loadSettingsUI() diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt index 74de045b8..bf07d1d14 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/features/settings/ui/SettingsFragmentPresenter.kt @@ -891,7 +891,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) ) // Disabled until custom texture implementation gets rewrite, current one overloads RAM - // and crashes Citra. + // and crashes Lime3DS. // add( // SwitchSetting( // BooleanSetting.PRELOAD_TEXTURES, diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt index 277d22c45..aa16dd721 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CopyDirProgressDialogFragment.kt @@ -27,7 +27,7 @@ import io.github.lime3ds.android.LimeApplication import io.github.lime3ds.android.R import io.github.lime3ds.android.databinding.DialogCopyDirBinding import io.github.lime3ds.android.model.SetupCallback -import io.github.lime3ds.android.utils.CitraDirectoryHelper +import io.github.lime3ds.android.utils.Lime3DSDirectoryHelper import io.github.lime3ds.android.utils.FileUtil import io.github.lime3ds.android.utils.PermissionsHandler import io.github.lime3ds.android.viewmodel.HomeViewModel @@ -79,7 +79,7 @@ class CopyDirProgressDialog : DialogFragment() { if (it) { homeViewModel.setUserDir( requireActivity(), - PermissionsHandler.citraDirectory.path!! + PermissionsHandler.lime3dsDirectory.path!! ) homeViewModel.copyInProgress = false homeViewModel.setPickingUserDir(false) @@ -140,7 +140,7 @@ class CopyDirProgressDialog : DialogFragment() { } override fun onComplete() { - CitraDirectoryHelper.initializeCitraDirectory(path) + Lime3DSDirectoryHelper.initializeLime3DSDirectory(path) callback?.onStepCompleted() viewModel.setCopyComplete(true) } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt index 3d7407436..40c13c9f6 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/EmulationFragment.kt @@ -451,10 +451,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram return } - if (DirectoryInitialization.areCitraDirectoriesReady()) { + if (DirectoryInitialization.areLime3DSDirectoriesReady()) { emulationState.run(emulationActivity.isActivityRecreated) } else { - setupCitraDirectoriesThenStartEmulation() + setupLime3DSDirectoriesThenStartEmulation() } } @@ -471,10 +471,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram super.onDetach() } - private fun setupCitraDirectoriesThenStartEmulation() { + private fun setupLime3DSDirectoriesThenStartEmulation() { val directoryInitializationState = DirectoryInitialization.start() if (directoryInitializationState === - DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED + DirectoryInitializationState.LIME3DS_DIRECTORIES_INITIALIZED ) { emulationState.run(emulationActivity.isActivityRecreated) } else if (directoryInitializationState === diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt index aef564c23..81af4043c 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/HomeSettingsFragment.kt @@ -156,10 +156,10 @@ class HomeSettingsFragment : Fragment() { driverViewModel.selectedDriverMetadata ), HomeSetting( - R.string.select_citra_user_folder, - R.string.select_citra_user_folder_home_description, + R.string.select_lime3ds_user_folder, + R.string.select_lime3ds_user_folder_home_description, R.drawable.ic_home, - { mainActivity.openCitraDirectory.launch(null) }, + { mainActivity.openLime3DSDirectory.launch(null) }, details = homeViewModel.userDir ), HomeSetting( @@ -243,7 +243,7 @@ class HomeSettingsFragment : Fragment() { private fun shareLog() { val logDirectory = DocumentFile.fromTreeUri( requireContext(), - PermissionsHandler.citraDirectory + PermissionsHandler.lime3dsDirectory )?.findFile("log") val currentLog = logDirectory?.findFile("lime3ds_log.txt") val oldLog = logDirectory?.findFile("lime3ds_log.old.txt") diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CitraDirectoryDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/Lime3DSDirectoryDialogFragment.kt similarity index 81% rename from src/android/app/src/main/java/io/github/lime3ds/android/fragments/CitraDirectoryDialogFragment.kt rename to src/android/app/src/main/java/io/github/lime3ds/android/fragments/Lime3DSDirectoryDialogFragment.kt index 35d16f115..42ee42f9f 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/CitraDirectoryDialogFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/Lime3DSDirectoryDialogFragment.kt @@ -15,13 +15,13 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.ViewModelProvider import com.google.android.material.dialog.MaterialAlertDialogBuilder import io.github.lime3ds.android.R -import io.github.lime3ds.android.databinding.DialogCitraDirectoryBinding +import io.github.lime3ds.android.databinding.DialogLime3dsDirectoryBinding import io.github.lime3ds.android.ui.main.MainActivity import io.github.lime3ds.android.utils.PermissionsHandler import io.github.lime3ds.android.viewmodel.HomeViewModel -class CitraDirectoryDialogFragment : DialogFragment() { - private lateinit var binding: DialogCitraDirectoryBinding +class Lime3DSDirectoryDialogFragment : DialogFragment() { + private lateinit var binding: DialogLime3dsDirectoryBinding private val homeViewModel: HomeViewModel by activityViewModels() @@ -30,12 +30,12 @@ class CitraDirectoryDialogFragment : DialogFragment() { } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogCitraDirectoryBinding.inflate(layoutInflater) + binding = DialogLime3dsDirectoryBinding.inflate(layoutInflater) val path = Uri.parse(requireArguments().getString(PATH)) binding.checkBox.isChecked = savedInstanceState?.getBoolean(MOVE_DATE_ENABLE) ?: false - val oldPath = PermissionsHandler.citraDirectory + val oldPath = PermissionsHandler.lime3dsDirectory if (!PermissionsHandler.hasWriteAccess(requireActivity()) || oldPath.toString() == path.toString() ) { @@ -47,7 +47,7 @@ class CitraDirectoryDialogFragment : DialogFragment() { isCancelable = false return MaterialAlertDialogBuilder(requireContext()) .setView(binding.root) - .setTitle(R.string.select_citra_user_folder) + .setTitle(R.string.select_lime3ds_user_folder) .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> homeViewModel.directoryListener?.onPressPositiveButton( if (binding.checkBox.visibility != View.GONE) { @@ -60,7 +60,7 @@ class CitraDirectoryDialogFragment : DialogFragment() { } .setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int -> if (!PermissionsHandler.hasWriteAccess(requireContext())) { - (requireActivity() as MainActivity).openCitraDirectory.launch(null) + (requireActivity() as MainActivity).openLime3DSDirectory.launch(null) } } .show() @@ -72,7 +72,7 @@ class CitraDirectoryDialogFragment : DialogFragment() { } companion object { - const val TAG = "citra_directory_dialog_fragment" + const val TAG = "lime3ds_directory_dialog_fragment" private const val MOVE_DATE_ENABLE = "IS_MODE_DATA_ENABLE" private const val PATH = "path" @@ -80,8 +80,8 @@ class CitraDirectoryDialogFragment : DialogFragment() { activity: FragmentActivity, path: String, listener: Listener - ): CitraDirectoryDialogFragment { - val dialog = CitraDirectoryDialogFragment() + ): Lime3DSDirectoryDialogFragment { + val dialog = Lime3DSDirectoryDialogFragment() ViewModelProvider(activity)[HomeViewModel::class.java].directoryListener = listener val args = Bundle() args.putString(PATH, path) diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt index 873bd9a09..97c343b7c 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SelectUserDirectoryDialogFragment.kt @@ -23,10 +23,10 @@ class SelectUserDirectoryDialogFragment : DialogFragment() { isCancelable = false return MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.select_citra_user_folder) + .setTitle(R.string.select_lime3ds_user_folder) .setMessage(R.string.cannot_skip_directory_description) .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int -> - mainActivity.openCitraDirectory.launch(null) + mainActivity.openLime3DSDirectory.launch(null) } .show() } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt index 71340a2cb..46b2b3f39 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/fragments/SetupFragment.kt @@ -39,7 +39,7 @@ import io.github.lime3ds.android.model.SetupCallback import io.github.lime3ds.android.model.SetupPage import io.github.lime3ds.android.model.StepState import io.github.lime3ds.android.ui.main.MainActivity -import io.github.lime3ds.android.utils.CitraDirectoryHelper +import io.github.lime3ds.android.utils.Lime3DSDirectoryHelper import io.github.lime3ds.android.utils.GameHelper import io.github.lime3ds.android.utils.PermissionsHandler import io.github.lime3ds.android.utils.ViewUtils @@ -207,14 +207,14 @@ class SetupFragment : Fragment() { add( SetupPage( R.drawable.ic_home, - R.string.select_citra_user_folder, - R.string.select_citra_user_folder_description, + R.string.select_lime3ds_user_folder, + R.string.select_lime3ds_user_folder_description, 0, true, R.string.select, { userDirCallback = it - openCitraDirectory.launch(null) + openLime3DSDirectory.launch(null) }, true, true, @@ -396,14 +396,14 @@ class SetupFragment : Fragment() { private lateinit var userDirCallback: SetupCallback - private val openCitraDirectory = registerForActivityResult( + private val openLime3DSDirectory = registerForActivityResult( ActivityResultContracts.OpenDocumentTree() ) { result: Uri? -> if (result == null) { return@registerForActivityResult } - CitraDirectoryHelper(requireActivity()).showCitraDirectoryDialog(result, userDirCallback) + Lime3DSDirectoryHelper(requireActivity()).showLime3DSDirectoryDialog(result, userDirCallback) } private lateinit var gamesDirCallback: SetupCallback diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt index 9b68cd122..8ff89c6c0 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/overlay/InputOverlay.kt @@ -895,7 +895,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex * * * This has a few benefits over the conventional way of storing the values - * (ie. within the Citra ini file). + * (ie. within the Lime3DS ini file). * * * No native calls * * Keeps Android-only values inside the Android environment diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt index 0e80a8c8c..0698d42b4 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/ui/main/MainActivity.kt @@ -46,7 +46,7 @@ import io.github.lime3ds.android.features.settings.ui.SettingsActivity import io.github.lime3ds.android.features.settings.utils.SettingsFile import io.github.lime3ds.android.fragments.SelectUserDirectoryDialogFragment import io.github.lime3ds.android.utils.CiaInstallWorker -import io.github.lime3ds.android.utils.CitraDirectoryHelper +import io.github.lime3ds.android.utils.Lime3DSDirectoryHelper import io.github.lime3ds.android.utils.DirectoryInitialization import io.github.lime3ds.android.utils.FileBrowserHelper import io.github.lime3ds.android.utils.InsetsHelper @@ -66,13 +66,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider { override fun onCreate(savedInstanceState: Bundle?) { val splashScreen = installSplashScreen() - splashScreen.setKeepOnScreenCondition { - !DirectoryInitialization.areCitraDirectoriesReady() && + splashScreen.setKeepOnScreenCondition { + !DirectoryInitialization.areLime3DSDirectoriesReady() && PermissionsHandler.hasWriteAccess(this) } if (PermissionsHandler.hasWriteAccess(applicationContext) && - DirectoryInitialization.areCitraDirectoriesReady()) { + DirectoryInitialization.areLime3DSDirectoriesReady()) { settingsViewModel.settings.loadSettings() } @@ -300,14 +300,14 @@ class MainActivity : AppCompatActivity(), ThemeProvider { windowInsets } - val openCitraDirectory = registerForActivityResult( + val openLime3DSDirectory = registerForActivityResult( ActivityResultContracts.OpenDocumentTree() ) { result: Uri? -> if (result == null) { return@registerForActivityResult } - CitraDirectoryHelper(this@MainActivity).showCitraDirectoryDialog(result) + Lime3DSDirectoryHelper(this@MainActivity).showLime3DSDirectoryDialog(result) } val ciaFileInstaller = registerForActivityResult( diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt index cf5e8efb2..55e782105 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DirectoryInitialization.kt @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean /** * A service that spawns its own thread in order to copy several binary and shader files - * from the Citra APK to the external file system. + * from the Lime3DS APK to the external file system. */ object DirectoryInitialization { private const val SYS_DIR_VERSION = "sysDirectoryVersion" @@ -30,25 +30,25 @@ object DirectoryInitialization { var userPath: String? = null val internalUserPath get() = LimeApplication.appContext.getExternalFilesDir(null)!!.canonicalPath - private val isCitraDirectoryInitializationRunning = AtomicBoolean(false) + private val isLime3DSDirectoryInitializationRunning = AtomicBoolean(false) val context: Context get() = LimeApplication.appContext @JvmStatic fun start(): DirectoryInitializationState? { - if (!isCitraDirectoryInitializationRunning.compareAndSet(false, true)) { + if (!isLime3DSDirectoryInitializationRunning.compareAndSet(false, true)) { return null } - if (directoryState != DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED) { + if (directoryState != DirectoryInitializationState.LIME3DS_DIRECTORIES_INITIALIZED) { directoryState = if (hasWriteAccess(context)) { - if (setCitraUserDirectory()) { + if (setLime3DSUserDirectory()) { LimeApplication.documentsTree.setRoot(Uri.parse(userPath)) NativeLibrary.createLogFile() NativeLibrary.logUserDirectory(userPath.toString()) NativeLibrary.createConfigFile() GpuDriverHelper.initializeDriverParameters() - DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED + DirectoryInitializationState.LIME3DS_DIRECTORIES_INITIALIZED } else { DirectoryInitializationState.CANT_FIND_EXTERNAL_STORAGE } @@ -56,7 +56,7 @@ object DirectoryInitialization { DirectoryInitializationState.EXTERNAL_STORAGE_PERMISSION_NEEDED } } - isCitraDirectoryInitializationRunning.set(false) + isLime3DSDirectoryInitializationRunning.set(false) return directoryState } @@ -70,13 +70,13 @@ object DirectoryInitialization { } @JvmStatic - fun areCitraDirectoriesReady(): Boolean { - return directoryState == DirectoryInitializationState.CITRA_DIRECTORIES_INITIALIZED + fun areLime3DSDirectoriesReady(): Boolean { + return directoryState == DirectoryInitializationState.LIME3DS_DIRECTORIES_INITIALIZED } - fun resetCitraDirectoryState() { + fun resetLime3DSDirectoryState() { directoryState = null - isCitraDirectoryInitializationRunning.compareAndSet(true, false) + isLime3DSDirectoryInitializationRunning.compareAndSet(true, false) } val userDirectory: String? @@ -84,17 +84,17 @@ object DirectoryInitialization { checkNotNull(directoryState) { "DirectoryInitialization has to run at least once!" } - check(!isCitraDirectoryInitializationRunning.get()) { + check(!isLime3DSDirectoryInitializationRunning.get()) { "DirectoryInitialization has to finish running first!" } return userPath } - fun setCitraUserDirectory(): Boolean { - val dataPath = PermissionsHandler.citraDirectory + fun setLime3DSUserDirectory(): Boolean { + val dataPath = PermissionsHandler.lime3dsDirectory if (dataPath.toString().isNotEmpty()) { userPath = dataPath.toString() - android.util.Log.d("[Citra Frontend]", "[DirectoryInitialization] User Dir: $userPath") + android.util.Log.d("[Lime3DS Frontend]", "[DirectoryInitialization] User Dir: $userPath") return true } return false @@ -156,7 +156,7 @@ object DirectoryInitialization { } enum class DirectoryInitializationState { - CITRA_DIRECTORIES_INITIALIZED, + LIME3DS_DIRECTORIES_INITIALIZED, EXTERNAL_STORAGE_PERMISSION_NEEDED, CANT_FIND_EXTERNAL_STORAGE } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt index 4846806cd..59c3a6ae0 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/DocumentsTree.kt @@ -14,7 +14,7 @@ import java.util.StringTokenizer import java.util.concurrent.ConcurrentHashMap /** - * A cached document tree for Citra user directory. + * A cached document tree for Lime3DS user directory. * For every filepath which is not startsWith "content://" will need to use this class to traverse. * For example: * C++ Lime3DS log file directory will be /log/lime3ds_log.txt. diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/CitraDirectoryHelper.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/Lime3DSDirectoryHelper.kt similarity index 68% rename from src/android/app/src/main/java/io/github/lime3ds/android/utils/CitraDirectoryHelper.kt rename to src/android/app/src/main/java/io/github/lime3ds/android/utils/Lime3DSDirectoryHelper.kt index 34307e5a5..fad75e134 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/CitraDirectoryHelper.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/Lime3DSDirectoryHelper.kt @@ -8,21 +8,21 @@ import android.content.Intent import android.net.Uri import androidx.fragment.app.FragmentActivity import androidx.lifecycle.ViewModelProvider -import io.github.lime3ds.android.fragments.CitraDirectoryDialogFragment +import io.github.lime3ds.android.fragments.Lime3DSDirectoryDialogFragment import io.github.lime3ds.android.fragments.CopyDirProgressDialog import io.github.lime3ds.android.model.SetupCallback import io.github.lime3ds.android.viewmodel.HomeViewModel /** - * Citra directory initialization ui flow controller. + * Lime3DS directory initialization ui flow controller. */ -class CitraDirectoryHelper(private val fragmentActivity: FragmentActivity) { - fun showCitraDirectoryDialog(result: Uri, callback: SetupCallback? = null) { - val citraDirectoryDialog = CitraDirectoryDialogFragment.newInstance( +class Lime3DSDirectoryHelper(private val fragmentActivity: FragmentActivity) { + fun showLime3DSDirectoryDialog(result: Uri, callback: SetupCallback? = null) { + val lime3dsDirectoryDialog = Lime3DSDirectoryDialogFragment.newInstance( fragmentActivity, result.toString(), - CitraDirectoryDialogFragment.Listener { moveData: Boolean, path: Uri -> - val previous = PermissionsHandler.citraDirectory + Lime3DSDirectoryDialogFragment.Listener { moveData: Boolean, path: Uri -> + val previous = PermissionsHandler.lime3dsDirectory // Do noting if user select the previous path. if (path == previous) { return@Listener @@ -35,7 +35,7 @@ class CitraDirectoryHelper(private val fragmentActivity: FragmentActivity) { takeFlags ) if (!moveData || previous.toString().isEmpty()) { - initializeCitraDirectory(path) + initializeLime3DSDirectory(path) callback?.onStepCompleted() val viewModel = ViewModelProvider(fragmentActivity)[HomeViewModel::class.java] viewModel.setUserDir(fragmentActivity, path.path!!) @@ -47,16 +47,16 @@ class CitraDirectoryHelper(private val fragmentActivity: FragmentActivity) { CopyDirProgressDialog.newInstance(fragmentActivity, previous, path, callback) ?.show(fragmentActivity.supportFragmentManager, CopyDirProgressDialog.TAG) }) - citraDirectoryDialog.show( + lime3dsDirectoryDialog.show( fragmentActivity.supportFragmentManager, - CitraDirectoryDialogFragment.TAG + Lime3DSDirectoryDialogFragment.TAG ) } companion object { - fun initializeCitraDirectory(path: Uri) { - PermissionsHandler.setCitraDirectory(path.toString()) - DirectoryInitialization.resetCitraDirectoryState() + fun initializeLime3DSDirectory(path: Uri) { + PermissionsHandler.setLime3DSDirectory(path.toString()) + DirectoryInitialization.resetLime3DSDirectoryState() DirectoryInitialization.start() } } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt index dd1d072d2..590bea38f 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/PermissionsHandler.kt @@ -13,17 +13,17 @@ import androidx.documentfile.provider.DocumentFile import io.github.lime3ds.android.LimeApplication object PermissionsHandler { - const val CITRA_DIRECTORY = "CITRA_DIRECTORY" + const val LIME3DS_DIRECTORY = "LIME3DS_DIRECTORY" val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) fun hasWriteAccess(context: Context): Boolean { try { - if (citraDirectory.toString().isEmpty()) { + if (lime3dsDirectory.toString().isEmpty()) { return false } - val uri = citraDirectory + val uri = lime3dsDirectory val takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION context.contentResolver.takePersistableUriPermission(uri, takeFlags) @@ -34,17 +34,17 @@ object PermissionsHandler { context.contentResolver.releasePersistableUriPermission(uri, takeFlags) } catch (e: Exception) { - Log.error("[PermissionsHandler]: Cannot check citra data directory permission, error: " + e.message) + Log.error("[PermissionsHandler]: Cannot check lime3ds data directory permission, error: " + e.message) } return false } - val citraDirectory: Uri + val lime3dsDirectory: Uri get() { - val directoryString = preferences.getString(CITRA_DIRECTORY, "") + val directoryString = preferences.getString(LIME3DS_DIRECTORY, "") return Uri.parse(directoryString) } - fun setCitraDirectory(uriString: String?) = - preferences.edit().putString(CITRA_DIRECTORY, uriString).apply() + fun setLime3DSDirectory(uriString: String?) = + preferences.edit().putString(LIME3DS_DIRECTORY, uriString).apply() } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt index b22fff756..63d3533b5 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/utils/ThemeUtil.kt @@ -58,7 +58,7 @@ object ThemeUtil { if (preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false) && isNightMode(activity) ) { - activity.setTheme(R.style.ThemeOverlay_Citra_Dark) + activity.setTheme(R.style.ThemeOverlay_Lime3DS_Dark) } } diff --git a/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt index 546f8a364..8acc20239 100644 --- a/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt +++ b/src/android/app/src/main/java/io/github/lime3ds/android/viewmodel/HomeViewModel.kt @@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import io.github.lime3ds.android.LimeApplication import io.github.lime3ds.android.R -import io.github.lime3ds.android.fragments.CitraDirectoryDialogFragment +import io.github.lime3ds.android.fragments.Lime3DSDirectoryDialogFragment import io.github.lime3ds.android.utils.GameHelper import io.github.lime3ds.android.utils.PermissionsHandler @@ -32,7 +32,7 @@ class HomeViewModel : ViewModel() { private val _userDir = MutableStateFlow( Uri.parse( PreferenceManager.getDefaultSharedPreferences(LimeApplication.appContext) - .getString(PermissionsHandler.CITRA_DIRECTORY, "") + .getString(PermissionsHandler.LIME3DS_DIRECTORY, "") ).path ?: "" ) @@ -44,7 +44,7 @@ class HomeViewModel : ViewModel() { ).path ?: "" ) - var directoryListener: CitraDirectoryDialogFragment.Listener? = null + var directoryListener: Lime3DSDirectoryDialogFragment.Listener? = null val dirProgress get() = _dirProgress.asStateFlow() private val _dirProgress = MutableStateFlow(0) diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index fb3549b0d..320c27b32 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -150,7 +150,8 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.texture_filter); ReadSetting("Renderer", Settings::values.texture_sampling); - // Work around to map Android setting for enabling the frame limiter to the format Citra expects + // Work around to map Android setting for enabling the frame limiter to the format Lime3DS + // expects if (sdl2_config->GetBoolean("Renderer", "use_frame_limit", true)) { ReadSetting("Renderer", Settings::values.frame_limit); } else { @@ -281,8 +282,9 @@ void Config::ReadValues() { // Web Service NetSettings::values.web_api_url = sdl2_config->GetString("WebService", "web_api_url", "https://api.citra-emu.org"); - NetSettings::values.citra_username = sdl2_config->GetString("WebService", "citra_username", ""); - NetSettings::values.citra_token = sdl2_config->GetString("WebService", "citra_token", ""); + NetSettings::values.lime3ds_username = + sdl2_config->GetString("WebService", "lime3ds_username", ""); + NetSettings::values.lime3ds_token = sdl2_config->GetString("WebService", "lime3ds_token", ""); } void Config::Reload() { diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index 1e2d6c8fe..4deee1a68 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h @@ -74,7 +74,7 @@ touch_device= engine:emu_window # Most desktop operating systems do not expose a way to poll the motion state of the controllers # so as a way around it, cemuhook created a udp client/server protocol to broadcast the data directly -# from a controller device to the client program. Citra has a client that can connect and read +# from a controller device to the client program. Lime3DS has a client that can connect and read # from any cemuhook compatible motion program. # IPv4 address of the udp input server (Default "127.0.0.1") @@ -293,7 +293,7 @@ input_device = use_virtual_sd = [System] -# The system model that Citra will try to emulate +# The system model that Lime3DS will try to emulate # 0: Old 3DS (default), 1: New 3DS is_new_3ds = @@ -301,16 +301,16 @@ is_new_3ds = # 0 (default): No, 1: Yes lle_applets = -# The system region that Citra will use during emulation +# The system region that Lime3DS will use during emulation # -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan region_value = -# The system language that Citra will use during emulation +# The system language that Lime3DS will use during emulation # 0: Japanese, 1: English (default), 2: French, 3: German, 4: Italian, 5: Spanish, # 6: Simplified Chinese, 7: Korean, 8: Dutch, 9: Portuguese, 10: Russian, 11: Traditional Chinese language = -# The clock to use when citra starts +# The clock to use when lime3ds starts # 0: System clock (default), 1: fixed time init_clock = @@ -319,7 +319,7 @@ init_clock = # Note: 3DS can only handle times later then Jan 1 2000 init_time = -# The system ticks count to use when citra starts +# The system ticks count to use when lime3ds starts # 0: Random (default), 1: Fixed init_ticks_type = @@ -382,9 +382,9 @@ gdbstub_port=24689 [WebService] # URL for Web API web_api_url = https://api.citra-emu.org -# Username and token for Citra Web Service +# Username and token for Lime3DS Web Service # See https://profile.citra-emu.org/ for more info -citra_username = -citra_token = +lime3ds_username = +lime3ds_token = )"; } diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index edbf7fe44..9b2b839d2 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -16,9 +16,9 @@ #include #include "audio_core/dsp_interface.h" #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include "common/aarch64/cpu_detect.h" -#elif CITRA_ARCH(x86_64) +#elif LIME3DS_ARCH(x86_64) #include "common/x64/cpu_detect.h" #endif #include "common/common_paths.h" @@ -58,7 +58,7 @@ #include "video_core/gpu.h" #include "video_core/renderer_base.h" -#if defined(ENABLE_VULKAN) && CITRA_ARCH(arm64) +#if defined(ENABLE_VULKAN) && LIME3DS_ARCH(arm64) #include #endif @@ -130,7 +130,7 @@ static bool CheckMicPermission() { IDCache::GetRequestMicPermission()); } -static Core::System::ResultStatus RunCitra(const std::string& filepath) { +static Core::System::ResultStatus RunLime3DS(const std::string& filepath) { // Lime3DS core only supports a single running instance std::scoped_lock lock(running_mutex); @@ -258,7 +258,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) { } void EnableAdrenoTurboMode(bool enable) { -#if defined(ENABLE_VULKAN) && CITRA_ARCH(arm64) +#if defined(ENABLE_VULKAN) && LIME3DS_ARCH(arm64) adrenotools_set_turbo(enable); #endif } @@ -266,7 +266,7 @@ void EnableAdrenoTurboMode(bool enable) { void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir, const std::string& custom_driver_name, const std::string& file_redirect_dir) { -#if defined(ENABLE_VULKAN) && CITRA_ARCH(arm64) +#if defined(ENABLE_VULKAN) && LIME3DS_ARCH(arm64) void* handle{}; const char* file_redirect_dir_{}; int featureFlags{}; @@ -463,7 +463,7 @@ jobject Java_io_github_lime3ds_android_NativeLibrary_downloadTitleFromNus( jboolean JNICALL Java_io_github_lime3ds_android_utils_GpuDriverHelper_supportsCustomDriverLoading( JNIEnv* env, jobject instance) { -#ifdef CITRA_ARCH_arm64 +#ifdef LIME3DS_ARCH_arm64 // If the KGSL device exists custom drivers can be loaded using adrenotools return SupportsCustomDriver(); #else @@ -522,7 +522,7 @@ jboolean Java_io_github_lime3ds_android_NativeLibrary_onGamePadMoveEvent( [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj, [[maybe_unused]] jstring j_device, jint axis, jfloat x, jfloat y) { // Clamp joystick movement to supported minimum and maximum - // Citra uses an inverted y axis sent by the frontend + // Lime3DS uses an inverted y axis sent by the frontend x = std::clamp(x, -1.f, 1.f); y = std::clamp(-y, -1.f, 1.f); @@ -649,7 +649,7 @@ void Java_io_github_lime3ds_android_NativeLibrary_run__Ljava_lang_String_2( running_cv.notify_all(); } - const Core::System::ResultStatus result{RunCitra(path)}; + const Core::System::ResultStatus result{RunLime3DS(path)}; if (result != Core::System::ResultStatus::Success) { env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetExitEmulationActivity(), static_cast(result)); diff --git a/src/android/app/src/main/res/layout/dialog_citra_directory.xml b/src/android/app/src/main/res/layout/dialog_lime3ds_directory.xml similarity index 100% rename from src/android/app/src/main/res/layout/dialog_citra_directory.xml rename to src/android/app/src/main/res/layout/dialog_lime3ds_directory.xml diff --git a/src/android/app/src/main/res/layout/fragment_about.xml b/src/android/app/src/main/res/layout/fragment_about.xml index 24558f335..5c32e6410 100644 --- a/src/android/app/src/main/res/layout/fragment_about.xml +++ b/src/android/app/src/main/res/layout/fragment_about.xml @@ -72,7 +72,7 @@ android:layout_marginHorizontal="24dp" android:layout_marginTop="6dp" android:textAlignment="viewStart" - android:text="@string/citra_description" /> + android:text="@string/lime3ds_description" /> diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml index 33d062a09..2dc242c5e 100644 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -20,7 +20,7 @@ Keine Log-Datei gefunden Spieleordner auswählen Über - Ein open-source 3DS-Emulator + Ein open-source 3DS-Emulator Das Aussehen der App verändern CIA Installieren diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml index f36f7cf36..d7593ab1c 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -1,7 +1,6 @@ - Este software correrá juegos de la consola portátil Nintendo 3DS. No se incluye ningún juego.\n\nAntes de comenzar, elige una carpeta en donde guardar los datos de usuario de Lime3DS.\n\nQué es ésto:\nWiki - Datos de usuario de Lime3DS Android y almacenamiento Notificaciones del Emulador Lime3DS Lime3DS está ejecutándose A continuación, tendrás que seleccionar una Carpeta de Juegos. Lime3DS mostrará todas las ROMs de 3DS en la carpeta seleccionada en la app.\n\nLas ROMs en CIA, actualizaciones y DLC tendrán que ser instaladas por separado al darle al icono de la carpeta y seleccionar Instalar CIA. @@ -26,10 +25,10 @@ Seleccionar Directorio de Juego Permite que Lime3DS llene la lista de juegos Acerca de - Un emulador de 3DS de código abierto + Un emulador de 3DS de código abierto Versión de compilación, créditos y más Directorio de juegos seleccionado - Cambia los archivos que Lime3DS usa para cargar juegos + Cambia los archivos que Lime3DS usa para cargar juegos Modifica el aspecto de la app Instalar CIA @@ -79,17 +78,13 @@ Permiso denegado ¿Saltarse la selección de la carpeta de juegos? Los juegos no se mostrarán en la lista de juegos si no se selecciona una carpeta. - https://web.archive.org/web/20240304210021/https://citra-emu.org/wiki/dumping-game-cartridges/ Ayuda Saltar Cancelar - Seleccionar Carpeta de Usuario - datos de usuario con el botón de debajo.]]> + Seleccionar Carpeta de Usuario Seleccionar No puedes saltarte este paso Este paso es imprescindible para que así Lime3DS pueda funcionar. Por favor, seleccione un directorio y entonces podrás continuar. - https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage - Buscar y Filtrar Juegos Buscar Juegos @@ -132,7 +127,6 @@ Descargar Iniciar Lime3DS no tiene las claves para descargar los archivos de sistema. - ¿Cómo obtener las claves?]]> Mostrar las apps del menú HOME en la lista de juegos Ejecutar la Configuración de la consola cuando se ejecute el Menú HOME Mínimo @@ -250,8 +244,6 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Shader JIT Caché de sombreador de disco Reduce los parones al guardar y cargar shaders generados y almacenados. No puede ser usado sin Activar Hardware Shader. - Mejora Adreno GPU (Experimental) - Aumenta el rendimiento gráfico en dispositivos compatibles, mejorando así el rendimiento general. Puede provocar un incremento de la potencia usada y la temperatura, así como también problemas de estabilidad en algunos dispositivos. Utilidades Volcar Texturas Las texturas han sido volcadas a dump/textures/[Title ID]/. @@ -283,7 +275,6 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Más Información Cerrar Restablecer valores de fábrica - cartuchos de juego y/o títulos instalados.]]> Por defecto Ninguno Auto @@ -317,6 +308,7 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Audio Depuración Tema y Color + Tu ROM está encriptada Formato de ROM no válido @@ -350,6 +342,7 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Pantalla Única Conjunta Pantallas híbridas + Alternar Estilos de Pantalla Apaisados Intercambiar Pantallas Reiniciar Estilo Mostrar Estilo @@ -417,13 +410,10 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Error Fatal Ha ocurrido un error fatal. Mira el registro para más detalles.\nSeguir con la emulación podría resultar en diversos cuelgues y bugs. - + Preparando shaders Construyendo shaders - - Jugar - Trucos Añadir trucos @@ -701,8 +691,5 @@ Se esperan fallos gráficos temporales cuando ésta esté activado. Conectar con una consola real que esté ejecutando un servidor Artic Base Conectar con Artic Base Introduce la dirección del servidor Artic Base - Misceláneos - Usar Artic Controller al estar conectado al servidor de Artic Base - Usa los controles dados por el Servidor de Artic Base al estar conectado a éste en vez de los controles del dispositivo configurado. \ No newline at end of file diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml index 6b516b95a..408eb82b1 100644 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -25,10 +25,10 @@ Sélectionner le dossier des jeux Permet à Lime3DS de remplir la liste des jeux À propos - Un émulateur 3DS open-source + Un émulateur 3DS open-source Numéro de build, crédits et plus encore Répertoire de jeux sélectionné - Modifie les fichiers que Lime3DS utilise pour charger les jeux + Modifie les fichiers que Lime3DS utilise pour charger les jeux Modifier l\'apparence de l\'application Installer un CIA @@ -81,7 +81,7 @@ Aide Sauter Annuler - Sélectionnez le dossier utilisateur + Sélectionnez le dossier utilisateur   Sélectionner Vous ne pouvez pas sauter cette étape diff --git a/src/android/app/src/main/res/values-night/citra_colors.xml b/src/android/app/src/main/res/values-night/lime_colors.xml similarity index 100% rename from src/android/app/src/main/res/values-night/citra_colors.xml rename to src/android/app/src/main/res/values-night/lime_colors.xml diff --git a/src/android/app/src/main/res/values-night/themes.xml b/src/android/app/src/main/res/values-night/themes.xml index 8670410d4..05db06db3 100644 --- a/src/android/app/src/main/res/values-night/themes.xml +++ b/src/android/app/src/main/res/values-night/themes.xml @@ -1,7 +1,7 @@ - diff --git a/src/android/app/src/main/res/values-pt/strings.xml b/src/android/app/src/main/res/values-pt/strings.xml index a69d387db..3fa08f749 100644 --- a/src/android/app/src/main/res/values-pt/strings.xml +++ b/src/android/app/src/main/res/values-pt/strings.xml @@ -1,7 +1,6 @@ - Este software irá executar jogos feitos para o console portátil Nintendo 3DS. Nenhum jogo está incluído.\n\nAntes de começar a emulação, selecione uma pasta para armazenar os dados do usuário do Lime3DS.\n\nO que é isto:\nWiki - Dados e armazenamento do usuário do Lime3DS Android Notificações do emulador Lime3DS Lime3DS está rodando Em seguida, você precisará selecionar uma pasta de jogo. O Lime3DS exibirá todas as ROMs 3DS dentro da pasta selecionada no aplicativo.\n\nROMs, atualizações e DLC no formato CIA precisarão ser instalados separadamente clicando no ícone da pasta e selecionando Instalar CIA. @@ -26,10 +25,10 @@ Selecione a pasta de jogos Permitir que o Lime3DS preencha a lista de jogos Sobre - Um emulador de 3DS de código aberto + Um emulador de 3DS de código aberto Versão de compilação, créditos e mais Diretório de jogos selecionado - Altere os arquivos que o Lime3DS usa para carregar jogos + Altere os arquivos que o Lime3DS usa para carregar jogos Modificar a aparência do aplicativo Instale a CIA @@ -79,17 +78,13 @@ Permissão negada Pular seleção da pasta de jogos? Os jogos não serão exibidos na lista de jogos se uma pasta não for selecionada. - https://citra-emulator.com/wiki/dumping-game-cartridges/ Ajuda Pular Cancelar - Selecione a pasta do usuário - diretório de dados de usuário com o botão abaixo.]]> + Selecione a pasta do usuário Selecionar Você não pode pular esta etapa Este passo é necessário para permitir que o Lime3DS funcione. Por favor, selecione um diretório para continuar. - https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage - Pesquisar e Filtrar Jogos Pesquisar Jogos @@ -132,7 +127,6 @@ Baixar Iniciar Lime3DS está sem as keys necessárias para realizar o download do arquivo de sistemas. - Como obter as chaves?]]> Mostrar aplicativos do MENU INICIAL na lista de jogos Execute as configurações de sistema quando o Menu Principal for iniciado. Mínimo @@ -249,8 +243,6 @@ Sombreador JIT Cache de Sombreadores em Disco Reduz as interrupções armazenando e carregando os sombreadores gerados no disco. Não pode ser usado sem ativar o Sombreador de Hardware. - Adreno GPU Boost (Experimental) - Aumenta o rendimento gráfico em dispositivos suportados, melhorando o desempenho. O uso desta configuração pode aumentar o uso de energia e a temperatura. Pode causar problemas de estabilidade em determinados dispositivos. Utilitário Extrair Texturas As texturas são extraídas em dump/textures/[Title ID]/. @@ -282,7 +274,6 @@ Saber mais Fechar Redefinir para o Padrão - cartuchos de jogos ou títulos instalados.]]> Padrão Nenhum Automático @@ -316,6 +307,7 @@ Áudio Depuração Tema e Cor + Sua ROM está Criptografada Formato inválido de ROM @@ -349,6 +341,7 @@ Tela única Telas lado a lado Telas Híbridas + Ciclo de Layouts de Paisagem Trocar telas Redefinir sobreposição Mostrar sobreposição @@ -416,13 +409,10 @@ Erro Fatal Ocorreu um erro fatal. Verifique o registro para obter detalhes.\nContinuar a emulação pode resultar em falhas e bugs. - + Preparando Shaders Construindo Shaders - - Jogar - Truques Adicionar Trapaça @@ -694,8 +684,5 @@ Conecte-se a um console real que esteja executando um servidor Artic Base Conectar-se ao Artic Base Digite o endereço do servidor Artic Base - Diversos - Use o Controle Artic quando conectado ao Servidor Artic Base - Use os controles fornecidos pelo Servidor Artic Base quando conectado a ele, em vez do dispositivo de entrada configurado. \ No newline at end of file diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml index 7a027d2f7..62f485585 100644 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -25,10 +25,10 @@ Выбор папки с играми Позволяет Lime3DS формировать список игр О приложении - Эмулятор 3DS с открытым исходным кодом + Эмулятор 3DS с открытым исходным кодом Версия сборки, разработчики и другое Папка с играми выбрана - Изменение файлов, используемых Lime3DS для запуска игр + Изменение файлов, используемых Lime3DS для запуска игр Настройка внешнего вида приложения Установить CIA @@ -81,7 +81,7 @@ Помощь Пропустить Отмена - Выбор папки пользователя + Выбор папки пользователя Выбрать Вы не можете пропустить данное действие Данный шаг требуется для работы Lime3DS. Пожалуйста, укажите папку, чтобы продолжить. diff --git a/src/android/app/src/main/res/values-zh/strings.xml b/src/android/app/src/main/res/values-zh/strings.xml index 721847dd2..1f1e162c3 100644 --- a/src/android/app/src/main/res/values-zh/strings.xml +++ b/src/android/app/src/main/res/values-zh/strings.xml @@ -25,10 +25,10 @@ 选择游戏文件夹 允许 Lime3DS 填充游戏列表 关于 - 一款开源的任天堂 3DS 模拟器 + 一款开源的任天堂 3DS 模拟器 构建版本、贡献者以及更多 已选择游戏文件夹 - 更改 Lime3DS 用于加载游戏的相关文件 + 更改 Lime3DS 用于加载游戏的相关文件 更改应用程序的外观 安装 CIA @@ -81,7 +81,7 @@ 帮助 跳过 取消 - 选择用户文件夹 + 选择用户文件夹 选择 此步骤不可跳过 运行 Lime3DS 的必需步骤。请选择一个文件夹，然后才可继续。 diff --git a/src/android/app/src/main/res/values/lime3ds_colors.xml b/src/android/app/src/main/res/values/lime3ds_colors.xml new file mode 100644 index 000000000..b6a7b6d05 --- /dev/null +++ b/src/android/app/src/main/res/values/lime3ds_colors.xml @@ -0,0 +1,35 @@ + + + + #154FE2 + #FFFFFF + #DCE1FF + #001551 + #595D72 + #FFFFFF + #DEE1F9 + #161B2C + #75546F + #FFFFFF + #FFD7F5 + #2C1229 + #BA1A1A + #FFDAD6 + #FFFFFF + #410002 + #FEFBFF + #1B1B1F + #FEFBFF + #1B1B1F + #E2E1EC + #45464F + #767680 + #F2F0F4 + #303034 + #B7C4FF + #000000 + #154FE2 + #C6C5D0 + #000000 + + diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 69dcc82d7..15b7755a7 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -30,10 +30,10 @@ Select Games Folder Allows Lime3DS to populate the games list About - An open-source 3DS emulator + An open-source 3DS emulator Build version, credits, and more Games directory selected - Changes the files that Lime3DS uses to load games + Changes the files that Lime3DS uses to load games Modify the look of the app Install CIA @@ -87,8 +87,8 @@ Help Skip Cancel - Select User Folder - user data directory with the button below.]]> + Select User Folder + user data directory with the button below.]]> Select You can\'t skip this step This step is required to allow Lime3DS to work. Please select a directory and then you can continue. diff --git a/src/android/app/src/main/res/values/styles.xml b/src/android/app/src/main/res/values/styles.xml index 5373bd8d9..75c969e41 100644 --- a/src/android/app/src/main/res/values/styles.xml +++ b/src/android/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - diff --git a/src/android/app/src/main/res/values/themes.xml b/src/android/app/src/main/res/values/themes.xml index 0f74013e9..d694c2e1b 100644 --- a/src/android/app/src/main/res/values/themes.xml +++ b/src/android/app/src/main/res/values/themes.xml @@ -15,7 +15,7 @@ @color/lime_onErrorContainer @android:color/transparent @android:color/transparent - @style/CitraSlider + @style/LimeSlider shortEdges diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index ab00c8067..14a63c076 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -62,6 +62,6 @@ if(ENABLE_OPENAL) add_definitions(-DAL_LIBTYPE_STATIC) endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(audio_core PRIVATE precompiled_headers.h) endif() diff --git a/src/audio_core/cubeb_input.cpp b/src/audio_core/cubeb_input.cpp index baee263fb..0f1e909fe 100644 --- a/src/audio_core/cubeb_input.cpp +++ b/src/audio_core/cubeb_input.cpp @@ -50,7 +50,7 @@ void CubebInput::StartSampling(const InputParameters& params) { parameters = params; impl->sample_size_in_bytes = params.sample_size / 8; - auto init_result = cubeb_init(&impl->ctx, "Citra Input", nullptr); + auto init_result = cubeb_init(&impl->ctx, "Lime3DS Input", nullptr); if (init_result != CUBEB_OK) { LOG_CRITICAL(Audio, "cubeb_init failed: {}", init_result); return; @@ -91,8 +91,8 @@ void CubebInput::StartSampling(const InputParameters& params) { } auto stream_init_result = cubeb_stream_init( - impl->ctx, &impl->stream, "Citra Microphone", input_device, &input_params, nullptr, nullptr, - latency_frames, Impl::DataCallback, Impl::StateCallback, impl.get()); + impl->ctx, &impl->stream, "Lime3DS Microphone", input_device, &input_params, nullptr, + nullptr, latency_frames, Impl::DataCallback, Impl::StateCallback, impl.get()); if (stream_init_result != CUBEB_OK) { LOG_CRITICAL(Audio, "cubeb_stream_init failed: {}", stream_init_result); StopSampling(); @@ -184,7 +184,7 @@ std::vector ListCubebInputDevices() { std::vector device_list; cubeb* ctx; - if (cubeb_init(&ctx, "Citra Input Device Enumerator", nullptr) != CUBEB_OK) { + if (cubeb_init(&ctx, "Lime3DS Input Device Enumerator", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio, "cubeb_init failed"); return {}; } diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 4a42d3277..62ddc16d1 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp @@ -25,7 +25,7 @@ struct CubebSink::Impl { }; CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_unique()) { - if (cubeb_init(&impl->ctx, "Citra Output", nullptr) != CUBEB_OK) { + if (cubeb_init(&impl->ctx, "Lime3DS Output", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); return; } @@ -68,7 +68,7 @@ CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_uniqu } } - auto stream_err = cubeb_stream_init(impl->ctx, &impl->stream, "CitraAudio", nullptr, nullptr, + auto stream_err = cubeb_stream_init(impl->ctx, &impl->stream, "Lime3DSAudio", nullptr, nullptr, output_device, ¶ms, std::max(512u, minimum_latency), &Impl::DataCallback, &Impl::StateCallback, impl.get()); if (stream_err != CUBEB_OK) { @@ -164,7 +164,7 @@ std::vector ListCubebSinkDevices() { std::vector device_list; cubeb* ctx; - if (cubeb_init(&ctx, "Citra Output Device Enumerator", nullptr) != CUBEB_OK) { + if (cubeb_init(&ctx, "Lime3DS Output Device Enumerator", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); return {}; } diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 8b76c5c90..072832aec 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -195,12 +195,12 @@ if ("arm64" IN_LIST ARCHITECTURE) target_link_libraries(lime_common PRIVATE oaknut) endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(lime_common PRIVATE precompiled_headers.h) endif() find_library(BACKTRACE_LIBRARY backtrace) if (BACKTRACE_LIBRARY AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL GNU) target_link_libraries(lime_common PRIVATE ${BACKTRACE_LIBRARY} dl) - target_compile_definitions(lime_common PRIVATE CITRA_LINUX_GCC_BACKTRACE) + target_compile_definitions(lime_common PRIVATE LIME3DS_LINUX_GCC_BACKTRACE) endif() diff --git a/src/common/aarch64/cpu_detect.cpp b/src/common/aarch64/cpu_detect.cpp index e98fc3261..f4b9827ed 100644 --- a/src/common/aarch64/cpu_detect.cpp +++ b/src/common/aarch64/cpu_detect.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include #include @@ -114,4 +114,4 @@ const CPUCaps& GetCPUCaps() { } // namespace Common -#endif // CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(arm64) diff --git a/src/common/aarch64/cpu_detect.h b/src/common/aarch64/cpu_detect.h index 8c037a528..62cc887f6 100644 --- a/src/common/aarch64/cpu_detect.h +++ b/src/common/aarch64/cpu_detect.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include @@ -33,4 +33,4 @@ const CPUCaps& GetCPUCaps(); } // namespace Common -#endif // CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(arm64) diff --git a/src/common/aarch64/oaknut_abi.h b/src/common/aarch64/oaknut_abi.h index 56bb8b5f3..a9860eb3a 100644 --- a/src/common/aarch64/oaknut_abi.h +++ b/src/common/aarch64/oaknut_abi.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include #include @@ -198,4 +198,4 @@ inline void ABI_PopRegisters(oaknut::CodeGenerator& code, std::bitset<64> regs, } // namespace Common::A64 -#endif // CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(arm64) diff --git a/src/common/aarch64/oaknut_util.h b/src/common/aarch64/oaknut_util.h index 16cf7dfe3..60c67fbed 100644 --- a/src/common/aarch64/oaknut_util.h +++ b/src/common/aarch64/oaknut_util.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include #include @@ -40,4 +40,4 @@ inline void CallFarFunction(oaknut::CodeGenerator& code, const T f) { } // namespace Common::A64 -#endif // CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(arm64) diff --git a/src/common/arch.h b/src/common/arch.h index 5c70b8dca..f54b251e4 100644 --- a/src/common/arch.h +++ b/src/common/arch.h @@ -6,8 +6,8 @@ #include -#define CITRA_ARCH(NAME) (CITRA_ARCH_##NAME) +#define LIME3DS_ARCH(NAME) (LIME3DS_ARCH_##NAME) -#define CITRA_ARCH_x86_64 BOOST_ARCH_X86_64 -#define CITRA_ARCH_arm64 \ +#define LIME3DS_ARCH_x86_64 BOOST_ARCH_X86_64 +#define LIME3DS_ARCH_arm64 \ (BOOST_ARCH_ARM >= BOOST_VERSION_NUMBER(8, 0, 0) && BOOST_ARCH_WORD_BITS == 64) diff --git a/src/common/assert.h b/src/common/assert.h index 5f632a5c6..394c86b1a 100644 --- a/src/common/assert.h +++ b/src/common/assert.h @@ -16,7 +16,7 @@ #define ASSERT(_a_) \ do \ if (!(_a_)) [[unlikely]] { \ - []() CITRA_NO_INLINE CITRA_NO_RETURN { \ + []() LIME3DS_NO_INLINE LIME3DS_NO_RETURN { \ LOG_CRITICAL(Debug, "Assertion Failed!"); \ Common::Log::Stop(); \ Crash(); \ @@ -28,7 +28,7 @@ #define ASSERT_MSG(_a_, ...) \ do \ if (!(_a_)) [[unlikely]] { \ - [&]() CITRA_NO_INLINE CITRA_NO_RETURN { \ + [&]() LIME3DS_NO_INLINE LIME3DS_NO_RETURN { \ LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); \ Common::Log::Stop(); \ Crash(); \ @@ -38,7 +38,7 @@ while (0) #define UNREACHABLE() \ - ([]() CITRA_NO_INLINE CITRA_NO_RETURN { \ + ([]() LIME3DS_NO_INLINE LIME3DS_NO_RETURN { \ LOG_CRITICAL(Debug, "Unreachable code!"); \ Common::Log::Stop(); \ Crash(); \ @@ -46,7 +46,7 @@ }()) #define UNREACHABLE_MSG(...) \ - ([&]() CITRA_NO_INLINE CITRA_NO_RETURN { \ + ([&]() LIME3DS_NO_INLINE LIME3DS_NO_RETURN { \ LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); \ Common::Log::Stop(); \ Crash(); \ diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 8f109a8d3..cce99a34a 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -24,15 +24,15 @@ #endif #ifdef _MSC_VER -#define CITRA_NO_INLINE __declspec(noinline) +#define LIME3DS_NO_INLINE __declspec(noinline) #else -#define CITRA_NO_INLINE __attribute__((noinline)) +#define LIME3DS_NO_INLINE __attribute__((noinline)) #endif #ifdef _MSC_VER -#define CITRA_NO_RETURN __declspec(noreturn) +#define LIME3DS_NO_RETURN __declspec(noreturn) #else -#define CITRA_NO_RETURN __attribute__((noreturn)) +#define LIME3DS_NO_RETURN __attribute__((noreturn)) #endif #ifdef _MSC_VER diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index c9fe12002..bf70d5cfa 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -868,8 +868,8 @@ bool StringReplace(std::string& haystack, const std::string& a, const std::strin std::string SerializePath(const std::string& input, bool is_saving) { auto result = input; - StringReplace(result, "%CITRA_ROM_FILE%", g_currentRomPath, is_saving); - StringReplace(result, "%CITRA_USER_DIR%", GetUserPath(UserPath::UserDir), is_saving); + StringReplace(result, "%LIME3DS_ROM_FILE%", g_currentRomPath, is_saving); + StringReplace(result, "%LIME3DS_USER_DIR%", GetUserPath(UserPath::UserDir), is_saving); return result; } diff --git a/src/common/file_util.h b/src/common/file_util.h index f0c53c15f..57cfb51e9 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -191,11 +191,11 @@ void SetUserPath(const std::string& path = ""); void SetCurrentRomPath(const std::string& path); -// Returns a pointer to a string with a Citra data dir in the user's home +// Returns a pointer to a string with a Lime3DS data dir in the user's home // directory. To be used in "multi-user" mode (that is, installed). [[nodiscard]] const std::string& GetUserPath(UserPath path); -// Returns a pointer to a string with the default Citra data dir in the user's home +// Returns a pointer to a string with the default Lime3DS data dir in the user's home // directory. [[nodiscard]] const std::string& GetDefaultUserPath(UserPath path); @@ -278,8 +278,8 @@ public: IOFile(); // flags is used for windows specific file open mode flags, which - // allows citra to open the logs in shared write mode, so that the file - // isn't considered "locked" while citra is open and people can open the log file and view it + // allows lime3ds to open the logs in shared write mode, so that the file + // isn't considered "locked" while lime3ds is open and people can open the log file and view it IOFile(const std::string& filename, const char openmode[], int flags = 0); ~IOFile(); diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp index 3c75ba597..27bf0a9ff 100644 --- a/src/common/logging/backend.cpp +++ b/src/common/logging/backend.cpp @@ -14,7 +14,7 @@ #endif #include -#ifdef CITRA_LINUX_GCC_BACKTRACE +#ifdef LIME3DS_LINUX_GCC_BACKTRACE #define BOOST_STACKTRACE_USE_BACKTRACE #include #undef BOOST_STACKTRACE_USE_BACKTRACE @@ -182,7 +182,7 @@ public: bool initialization_in_progress_suppress_logging = true; -#ifdef CITRA_LINUX_GCC_BACKTRACE +#ifdef LIME3DS_LINUX_GCC_BACKTRACE [[noreturn]] void SleepForever() { while (true) { pause(); @@ -251,7 +251,7 @@ public: private: Impl(const std::string& file_backend_filename, const Filter& filter_) : filter{filter_}, file_backend{file_backend_filename} { -#ifdef CITRA_LINUX_GCC_BACKTRACE +#ifdef LIME3DS_LINUX_GCC_BACKTRACE int waker_pipefd[2]; int done_printing_pipefd[2]; if (pipe2(waker_pipefd, O_CLOEXEC) || pipe2(done_printing_pipefd, O_CLOEXEC)) { @@ -260,7 +260,7 @@ private: backtrace_thread_waker_fd = waker_pipefd[1]; backtrace_done_printing_fd = done_printing_pipefd[0]; std::thread([this, wait_fd = waker_pipefd[0], done_fd = done_printing_pipefd[1]] { - Common::SetCurrentThreadName("citra:Crash"); + Common::SetCurrentThreadName("lime3ds:Crash"); for (u8 ignore = 0; read(wait_fd, &ignore, 1) != 1;) ; const int sig = received_signal; @@ -305,7 +305,7 @@ private: } ~Impl() { -#ifdef CITRA_LINUX_GCC_BACKTRACE +#ifdef LIME3DS_LINUX_GCC_BACKTRACE if (int zero_or_ignore = 0; !received_signal.compare_exchange_strong(zero_or_ignore, SIGKILL)) { SleepForever(); @@ -315,7 +315,7 @@ private: void StartBackendThread() { backend_thread = std::jthread([this](std::stop_token stop_token) { - Common::SetCurrentThreadName("citra:Log"); + Common::SetCurrentThreadName("lime3ds:Log"); Entry entry; const auto write_logs = [this, &entry]() { ForEachBackend([&entry](Backend& backend) { backend.Write(entry); }); @@ -374,7 +374,7 @@ private: delete ptr; } -#ifdef CITRA_LINUX_GCC_BACKTRACE +#ifdef LIME3DS_LINUX_GCC_BACKTRACE [[noreturn]] static void HandleSignal(int sig) { signal(SIGABRT, SIG_DFL); signal(SIGSEGV, SIG_DFL); @@ -418,7 +418,7 @@ private: std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()}; std::jthread backend_thread; -#ifdef CITRA_LINUX_GCC_BACKTRACE +#ifdef LIME3DS_LINUX_GCC_BACKTRACE std::atomic_int received_signal{0}; std::array backtrace_storage{}; int backtrace_thread_waker_fd; diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp index 753e5003e..9d6355da4 100644 --- a/src/common/logging/text_formatter.cpp +++ b/src/common/logging/text_formatter.cpp @@ -137,7 +137,7 @@ void PrintMessageToLogcat([[maybe_unused]] const Entry& entry) { case Level::Count: UNREACHABLE(); } - __android_log_print(android_log_priority, "CitraNative", "%s", str.c_str()); + __android_log_print(android_log_priority, "Lime3DSNative", "%s", str.c_str()); #endif } } // namespace Common::Log diff --git a/src/common/logging/types.h b/src/common/logging/types.h index 346b36eb9..960797168 100644 --- a/src/common/logging/types.h +++ b/src/common/logging/types.h @@ -100,7 +100,7 @@ enum class Class : u8 { Input, ///< Input emulation Network, ///< Network emulation Movie, ///< Movie (Input Recording) Playback - WebService, ///< Interface to Citra Web Services + WebService, ///< Interface to Lime3DS Web Services RPC_Server, ///< RPC server Count, ///< Total number of logging classes }; diff --git a/src/common/microprofile.h b/src/common/microprofile.h index 027a3ad94..d97711a2c 100644 --- a/src/common/microprofile.h +++ b/src/common/microprofile.h @@ -8,7 +8,7 @@ // external sampling profilers like "Very Sleepy", and will improve performance somewhat. // #define MICROPROFILE_ENABLED 0 -// Customized Citra settings. +// Customized Lime3DS settings. // This file wraps the MicroProfile header so that these are consistent everywhere. #define MICROPROFILE_WEBSERVER 0 #define MICROPROFILE_GPU_TIMERS 0 // TODO: Implement timer queries when we upgrade to OpenGL 3.3 diff --git a/src/common/microprofileui.h b/src/common/microprofileui.h index 41abe6b75..ef703b6be 100644 --- a/src/common/microprofileui.h +++ b/src/common/microprofileui.h @@ -6,7 +6,7 @@ #include "common/microprofile.h" -// Customized Citra settings. +// Customized Lime3DS settings. // This file wraps the MicroProfile header so that these are consistent everywhere. #define MICROPROFILE_TEXT_WIDTH 6 #define MICROPROFILE_TEXT_HEIGHT 12 diff --git a/src/common/settings.h b/src/common/settings.h index 256f6858a..d7ccef156 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -421,7 +421,7 @@ struct TouchFromButtonMap { std::vector buttons; }; -/// A special region value indicating that citra will automatically select a region +/// A special region value indicating that lime3ds will automatically select a region /// value to fit the region lockout info of the game static constexpr s32 REGION_VALUE_AUTO_SELECT = -1; diff --git a/src/common/telemetry.cpp b/src/common/telemetry.cpp index e5fd193ef..e20b93511 100644 --- a/src/common/telemetry.cpp +++ b/src/common/telemetry.cpp @@ -9,7 +9,7 @@ #include "common/scm_rev.h" #include "common/telemetry.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include "common/x64/cpu_detect.h" #endif @@ -55,7 +55,7 @@ void AppendBuildInfo(FieldCollection& fc) { } void AppendCPUInfo(FieldCollection& fc) { -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) fc.AddField(FieldType::UserSystem, "CPU_Model", Common::GetCPUCaps().cpu_string); fc.AddField(FieldType::UserSystem, "CPU_BrandString", Common::GetCPUCaps().brand_string); fc.AddField(FieldType::UserSystem, "CPU_Extension_x64_AES", Common::GetCPUCaps().aes); diff --git a/src/common/telemetry.h b/src/common/telemetry.h index ba5f0c87d..c8dbffa3d 100644 --- a/src/common/telemetry.h +++ b/src/common/telemetry.h @@ -15,7 +15,7 @@ namespace Common::Telemetry { /// Field type, used for grouping fields together in the final submitted telemetry log enum class FieldType : u8 { None = 0, ///< No specified field group - App, ///< Citra application fields (e.g. version, branch, etc.) + App, ///< Lime3DS application fields (e.g. version, branch, etc.) Session, ///< Emulated session fields (e.g. title ID, log, etc.) Performance, ///< Emulated performance (e.g. fps, emulated CPU speed, etc.) UserFeedback, ///< User submitted feedback (e.g. star rating, user notes, etc.) diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp index 0791a3f20..9294bd6e9 100644 --- a/src/common/x64/cpu_detect.cpp +++ b/src/common/x64/cpu_detect.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "common/arch.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include #include "common/common_types.h" @@ -53,7 +53,7 @@ static CPUCaps Detect() { CPUCaps caps = {}; // Assumes the CPU supports the CPUID instruction. Those that don't would likely not support - // Citra at all anyway + // Lime3DS at all anyway int cpu_id[4]; std::memset(caps.brand_string, 0, sizeof(caps.brand_string)); @@ -148,4 +148,4 @@ const CPUCaps& GetCPUCaps() { } // namespace Common -#endif // CITRA_ARCH(x86_64) +#endif // LIME3DS_ARCH(x86_64) diff --git a/src/common/x64/cpu_detect.h b/src/common/x64/cpu_detect.h index 31ed1c584..3107e4adf 100644 --- a/src/common/x64/cpu_detect.h +++ b/src/common/x64/cpu_detect.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) namespace Common { @@ -37,4 +37,4 @@ const CPUCaps& GetCPUCaps(); } // namespace Common -#endif // CITRA_ARCH(x86_64) +#endif // LIME3DS_ARCH(x86_64) diff --git a/src/common/x64/xbyak_abi.h b/src/common/x64/xbyak_abi.h index 9c3615346..942352436 100644 --- a/src/common/x64/xbyak_abi.h +++ b/src/common/x64/xbyak_abi.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include #include @@ -232,4 +232,4 @@ inline void ABI_PopRegistersAndAdjustStack(Xbyak::CodeGenerator& code, std::bits } // namespace Common::X64 -#endif // CITRA_ARCH(x86_64) +#endif // LIME3DS_ARCH(x86_64) diff --git a/src/common/x64/xbyak_util.h b/src/common/x64/xbyak_util.h index 32621b59d..85c89b8d6 100644 --- a/src/common/x64/xbyak_util.h +++ b/src/common/x64/xbyak_util.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include #include @@ -49,4 +49,4 @@ inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) { } // namespace Common::X64 -#endif // CITRA_ARCH(x86_64) +#endif // LIME3DS_ARCH(x86_64) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 969c8c5a6..2c25108c8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -522,6 +522,6 @@ if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE) target_link_libraries(lime_core PRIVATE dynarmic) endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(lime_core PRIVATE precompiled_headers.h) endif() diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 862c422bc..1594fd77b 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#define CITRA_IGNORE_EXIT(x) +#define LIME3DS_IGNORE_EXIT(x) #include #include @@ -232,7 +232,7 @@ static unsigned int DPO(RotateRightByRegister)(ARMul_State* cpu, unsigned int sh #define DEBUG_MSG \ LOG_DEBUG(Core_ARM11, "inst is {:x}", inst); \ - CITRA_IGNORE_EXIT(0) + LIME3DS_IGNORE_EXIT(0) #define LnSWoUB(s) glue(LnSWoUB, s) #define MLnS(s) glue(MLnS, s) @@ -748,7 +748,7 @@ get_addr_fp_t GetAddressingOpLoadStoreT(unsigned int inst) { // of this instruction, however the 3DS CPU doesn't // support this variant (the 3DS CPU is only ARMv6K, // while this variant is added in ARMv6T2). - // So it's sufficient for citra to not implement this. + // So it's sufficient for lime3ds to not implement this. return nullptr; } @@ -832,7 +832,7 @@ static unsigned int InterpreterTranslateInstruction(const ARMul_State* cpu, cons inst); LOG_ERROR(Core_ARM11, "cpsr={:#X}, cpu->TFlag={}, r15={:#010X}", cpu->Cpsr, cpu->TFlag, cpu->Reg[15]); - CITRA_IGNORE_EXIT(-1); + LIME3DS_IGNORE_EXIT(-1); } inst_base = arm_instruction_trans[idx](inst, idx); @@ -1850,7 +1850,7 @@ BXJ_INST: { // According to the ARM documentation on BXJ, if setting the J bit in the APSR // fails, then BXJ functions identically like a regular BX instruction. // - // This is sufficient for citra, as the CPU for the 3DS does not implement Jazelle. + // This is sufficient for lime3ds, as the CPU for the 3DS does not implement Jazelle. if (inst_base->cond == ConditionCode::AL || CondPassed(cpu, inst_base->cond)) { bx_inst* const inst_cream = (bx_inst*)inst_base->component; diff --git a/src/core/arm/exclusive_monitor.cpp b/src/core/arm/exclusive_monitor.cpp index 5ba6dc9a8..13e98b814 100644 --- a/src/core/arm/exclusive_monitor.cpp +++ b/src/core/arm/exclusive_monitor.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/arch.h" -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) #include "core/arm/dynarmic/arm_exclusive_monitor.h" #endif #include "common/settings.h" @@ -15,7 +15,7 @@ ExclusiveMonitor::~ExclusiveMonitor() = default; std::unique_ptr MakeExclusiveMonitor(Memory::MemorySystem& memory, std::size_t num_cores) { -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) if (Settings::values.use_cpu_jit) { return std::make_unique(memory, num_cores); } diff --git a/src/core/cheats/gateway_cheat.cpp b/src/core/cheats/gateway_cheat.cpp index 4f9456699..3eed636b9 100644 --- a/src/core/cheats/gateway_cheat.cpp +++ b/src/core/cheats/gateway_cheat.cpp @@ -455,7 +455,7 @@ std::string GatewayCheat::GetCode() const { } /// A special marker used to keep track of enabled cheats -static constexpr char EnabledText[] = "*citra_enabled"; +static constexpr char EnabledText[] = "*lime3ds_enabled"; std::string GatewayCheat::ToString() const { std::string result; diff --git a/src/core/core.cpp b/src/core/core.cpp index 7f0d6c4d1..657f69737 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -16,7 +16,7 @@ #include "core/hle/service/cam/cam.h" #include "core/hle/service/hid/hid.h" #include "core/hle/service/ir/ir_user.h" -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) #include "core/arm/dynarmic/arm_dynarmic.h" #endif #include "core/arm/dyncom/arm_dyncom.h" @@ -426,7 +426,7 @@ System::ResultStatus System::Init(Frontend::EmuWindow& emu_window, exclusive_monitor = MakeExclusiveMonitor(*memory, num_cores); cpu_cores.reserve(num_cores); if (Settings::values.use_cpu_jit) { -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) for (u32 i = 0; i < num_cores; ++i) { cpu_cores.push_back(std::make_shared( *this, *memory, i, timing->GetTimer(i), *exclusive_monitor)); diff --git a/src/core/file_sys/plugin_3gx.cpp b/src/core/file_sys/plugin_3gx.cpp index e325d7fca..820924df8 100644 --- a/src/core/file_sys/plugin_3gx.cpp +++ b/src/core/file_sys/plugin_3gx.cpp @@ -91,7 +91,7 @@ Loader::ResultStatus FileSys::Plugin3GXLoader::Load( } if (header.infos.flags.compatibility == static_cast(_3gx_Infos::Compatibility::CONSOLE)) { - LOG_ERROR(Service_PLGLDR, "Failed to load 3GX plugin. Not compatible with Citra: {}", + LOG_ERROR(Service_PLGLDR, "Failed to load 3GX plugin. Not compatible with Lime3DS: {}", plg_context.plugin_path); return Loader::ResultStatus::Error; } diff --git a/src/core/file_sys/plugin_3gx.h b/src/core/file_sys/plugin_3gx.h index 742db7bf9..e535e1afa 100644 --- a/src/core/file_sys/plugin_3gx.h +++ b/src/core/file_sys/plugin_3gx.h @@ -54,8 +54,8 @@ public: u32_le exe_size; // Include sizeof(PluginHeader) + .text + .rodata + .data + .bss (0x1000 // aligned too) u32_le is_default_plugin; - u32_le plgldr_event; ///< Used for synchronization, unused in citra - u32_le plgldr_reply; ///< Used for synchronization, unused in citra + u32_le plgldr_event; ///< Used for synchronization, unused in lime3ds + u32_le plgldr_reply; ///< Used for synchronization, unused in lime3ds u32_le reserved[24]; u32_le config[32]; }; @@ -79,7 +79,7 @@ private: bool no_flash); struct _3gx_Infos { - enum class Compatibility { CONSOLE = 0, CITRA = 1, CONSOLE_CITRA = 2 }; + enum class Compatibility { CONSOLE = 0, LIME3DS = 1, CONSOLE_LIME3DS = 2 }; u32_le author_len; u32_le author_msg_offset; u32_le title_len; diff --git a/src/core/hle/kernel/ipc.cpp b/src/core/hle/kernel/ipc.cpp index 2dc17ea7a..7e1ffd750 100644 --- a/src/core/hle/kernel/ipc.cpp +++ b/src/core/hle/kernel/ipc.cpp @@ -141,10 +141,10 @@ Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem u32 size = static_cast(descInfo.size); IPC::MappedBufferPermissions permissions = descInfo.perms; - VAddr page_start = Common::AlignDown(source_address, Memory::CITRA_PAGE_SIZE); + VAddr page_start = Common::AlignDown(source_address, Memory::LIME3DS_PAGE_SIZE); u32 page_offset = source_address - page_start; - u32 num_pages = Common::AlignUp(page_offset + size, Memory::CITRA_PAGE_SIZE) >> - Memory::CITRA_PAGE_BITS; + u32 num_pages = Common::AlignUp(page_offset + size, Memory::LIME3DS_PAGE_SIZE) >> + Memory::LIME3DS_PAGE_BITS; // Skip when the size is zero and num_pages == 0 if (size == 0) { @@ -174,8 +174,8 @@ Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem found->target_address, size); } - VAddr prev_reserve = page_start - Memory::CITRA_PAGE_SIZE; - VAddr next_reserve = page_start + num_pages * Memory::CITRA_PAGE_SIZE; + VAddr prev_reserve = page_start - Memory::LIME3DS_PAGE_SIZE; + VAddr next_reserve = page_start + num_pages * Memory::LIME3DS_PAGE_SIZE; auto& prev_vma = src_process->vm_manager.FindVMA(prev_reserve)->second; auto& next_vma = src_process->vm_manager.FindVMA(next_reserve)->second; @@ -184,8 +184,8 @@ Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem // Unmap the buffer and guard pages from the source process Result result = - src_process->vm_manager.UnmapRange(page_start - Memory::CITRA_PAGE_SIZE, - (num_pages + 2) * Memory::CITRA_PAGE_SIZE); + src_process->vm_manager.UnmapRange(page_start - Memory::LIME3DS_PAGE_SIZE, + (num_pages + 2) * Memory::LIME3DS_PAGE_SIZE); ASSERT(result == ResultSuccess); mapped_buffer_context.erase(found); @@ -200,9 +200,9 @@ Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem // Create a buffer which contains the mapped buffer and two additional guard pages. std::shared_ptr buffer = - std::make_shared((num_pages + 2) * Memory::CITRA_PAGE_SIZE); + std::make_shared((num_pages + 2) * Memory::LIME3DS_PAGE_SIZE); memory.ReadBlock(*src_process, source_address, - buffer->GetPtr() + Memory::CITRA_PAGE_SIZE + page_offset, size); + buffer->GetPtr() + Memory::LIME3DS_PAGE_SIZE + page_offset, size); // Map the guard pages and mapped pages at once. target_address = @@ -214,19 +214,20 @@ Result TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySystem // Change the permissions and state of the guard pages. const VAddr low_guard_address = target_address; - const VAddr high_guard_address = - low_guard_address + static_cast(buffer->GetSize()) - Memory::CITRA_PAGE_SIZE; + const VAddr high_guard_address = low_guard_address + + static_cast(buffer->GetSize()) - + Memory::LIME3DS_PAGE_SIZE; ASSERT(dst_process->vm_manager.ChangeMemoryState( - low_guard_address, Memory::CITRA_PAGE_SIZE, Kernel::MemoryState::Shared, + low_guard_address, Memory::LIME3DS_PAGE_SIZE, Kernel::MemoryState::Shared, Kernel::VMAPermission::ReadWrite, Kernel::MemoryState::Reserved, Kernel::VMAPermission::None) == ResultSuccess); ASSERT(dst_process->vm_manager.ChangeMemoryState( - high_guard_address, Memory::CITRA_PAGE_SIZE, Kernel::MemoryState::Shared, + high_guard_address, Memory::LIME3DS_PAGE_SIZE, Kernel::MemoryState::Shared, Kernel::VMAPermission::ReadWrite, Kernel::MemoryState::Reserved, Kernel::VMAPermission::None) == ResultSuccess); // Get proper mapped buffer address and store it in the cmd buffer. - target_address += Memory::CITRA_PAGE_SIZE; + target_address += Memory::LIME3DS_PAGE_SIZE; cmd_buf[i++] = target_address + page_offset; mapped_buffer_context.push_back({permissions, size, source_address, diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 8a30abe59..1abef4aba 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -396,7 +396,7 @@ private: /* * Flags non system module main threads to wait a bit before running. On real hardware, - * system modules have plenty of time to load before the game is loaded, but on citra they + * system modules have plenty of time to load before the game is loaded, but on lime3ds they * start at the same time as the game. The artificial wait gives system modules some time * to load and setup themselves before the game starts. */ diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index e4200e5df..38f2f2ad3 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -182,7 +182,7 @@ void Process::ParseKernelCaps(const u32* kernel_caps, std::size_t len) { // Mapped memory page AddressMapping mapping; mapping.address = descriptor << 12; - mapping.size = Memory::CITRA_PAGE_SIZE; + mapping.size = Memory::LIME3DS_PAGE_SIZE; mapping.read_only = false; mapping.unk_flag = false; @@ -459,7 +459,7 @@ ResultVal Process::AllocateThreadLocalStorage() { auto base_memory_region = kernel.GetMemoryRegion(MemoryRegion::BASE); // Allocate some memory from the end of the linear heap for this region. - auto offset = base_memory_region->LinearAllocate(Memory::CITRA_PAGE_SIZE); + auto offset = base_memory_region->LinearAllocate(Memory::LIME3DS_PAGE_SIZE); if (!offset) { LOG_ERROR(Kernel_SVC, "Not enough space in BASE linear region to allocate a new TLS page"); @@ -467,17 +467,17 @@ ResultVal Process::AllocateThreadLocalStorage() { } holding_tls_memory += - MemoryRegionInfo::Interval(*offset, *offset + Memory::CITRA_PAGE_SIZE); - memory_used += Memory::CITRA_PAGE_SIZE; + MemoryRegionInfo::Interval(*offset, *offset + Memory::LIME3DS_PAGE_SIZE); + memory_used += Memory::LIME3DS_PAGE_SIZE; // The page is completely available at the start. tls_slots.emplace_back(0); // Map the page to the current process' address space. auto tls_page_addr = - Memory::TLS_AREA_VADDR + static_cast(tls_page) * Memory::CITRA_PAGE_SIZE; + Memory::TLS_AREA_VADDR + static_cast(tls_page) * Memory::LIME3DS_PAGE_SIZE; vm_manager.MapBackingMemory(tls_page_addr, kernel.memory.GetFCRAMRef(*offset), - Memory::CITRA_PAGE_SIZE, MemoryState::Locked); + Memory::LIME3DS_PAGE_SIZE, MemoryState::Locked); LOG_DEBUG(Kernel, "Allocated TLS page at addr={:08X}", tls_page_addr); } else { @@ -488,7 +488,7 @@ ResultVal Process::AllocateThreadLocalStorage() { tls_slots[tls_page].set(tls_slot); auto tls_address = Memory::TLS_AREA_VADDR + - static_cast(tls_page) * Memory::CITRA_PAGE_SIZE + + static_cast(tls_page) * Memory::LIME3DS_PAGE_SIZE + static_cast(tls_slot) * Memory::TLS_ENTRY_SIZE; kernel.memory.ZeroBlock(*this, tls_address, Memory::TLS_ENTRY_SIZE); diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 9040845fc..c75357f46 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -117,10 +117,10 @@ enum class SystemInfoType { */ NEW_3DS_INFO = 0x10001, /** - * Gets citra related information. This parameter is not available on real systems, + * Gets lime3ds related information. This parameter is not available on real systems, * but can be used by homebrew applications to get some emulator info. */ - CITRA_INFORMATION = 0x20000, + LIME3DS_INFORMATION = 0x20000, }; enum class ProcessInfoType { @@ -263,11 +263,11 @@ enum class SystemInfoMemUsageRegion { }; /** - * Accepted by svcGetSystemInfo param with CITRA_INFORMATION type. Selects which information - * to fetch from Citra. Some string params don't fit in 7 bytes, so they are split. + * Accepted by svcGetSystemInfo param with LIME3DS_INFORMATION type. Selects which information + * to fetch from Lime3DS. Some string params don't fit in 7 bytes, so they are split. */ -enum class SystemInfoCitraInformation { - IS_CITRA = 0, // Always set the output to 1, signaling the app is running on Citra. +enum class SystemInfoLime3DSInformation { + IS_LIME3DS = 0, // Always set the output to 1, signaling the app is running on Lime3DS. BUILD_NAME = 10, // (ie: Nightly, Canary). BUILD_VERSION = 11, // Build version. BUILD_DATE_PART1 = 20, // Build date first 7 characters. @@ -459,9 +459,9 @@ Result SVC::ControlMemory(u32* out_addr, u32 addr0, u32 addr1, u32 size, u32 ope "size=0x{:X}, permissions=0x{:08X}", operation, addr0, addr1, size, permissions); - R_UNLESS((addr0 & Memory::CITRA_PAGE_MASK) == 0, ResultMisalignedAddress); - R_UNLESS((addr1 & Memory::CITRA_PAGE_MASK) == 0, ResultMisalignedAddress); - R_UNLESS((size & Memory::CITRA_PAGE_MASK) == 0, ResultMisalignedSize); + R_UNLESS((addr0 & Memory::LIME3DS_PAGE_MASK) == 0, ResultMisalignedAddress); + R_UNLESS((addr1 & Memory::LIME3DS_PAGE_MASK) == 0, ResultMisalignedAddress); + R_UNLESS((size & Memory::LIME3DS_PAGE_MASK) == 0, ResultMisalignedSize); const u32 region = operation & MEMOP_REGION_MASK; operation &= ~MEMOP_REGION_MASK; @@ -1582,7 +1582,7 @@ Result SVC::GetHandleInfo(s64* out, Handle handle, u32 type) { /// Creates a memory block at the specified address with the specified permissions and size Result SVC::CreateMemoryBlock(Handle* out_handle, u32 addr, u32 size, u32 my_permission, u32 other_permission) { - R_UNLESS(size % Memory::CITRA_PAGE_SIZE == 0, ResultMisalignedSize); + R_UNLESS(size % Memory::LIME3DS_PAGE_SIZE == 0, ResultMisalignedSize); std::shared_ptr shared_memory = nullptr; @@ -1735,51 +1735,51 @@ Result SVC::GetSystemInfo(s64* out, u32 type, s32 param) { LOG_ERROR(Kernel_SVC, "unimplemented GetSystemInfo type=65537 param={}", param); *out = 0; return (system.GetNumCores() == 4) ? ResultSuccess : ResultInvalidEnumValue; - case SystemInfoType::CITRA_INFORMATION: - switch ((SystemInfoCitraInformation)param) { - case SystemInfoCitraInformation::IS_CITRA: + case SystemInfoType::LIME3DS_INFORMATION: + switch ((SystemInfoLime3DSInformation)param) { + case SystemInfoLime3DSInformation::IS_LIME3DS: *out = 1; break; - case SystemInfoCitraInformation::BUILD_NAME: + case SystemInfoLime3DSInformation::BUILD_NAME: CopyStringPart(reinterpret_cast(out), Common::g_build_name, 0, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_VERSION: + case SystemInfoLime3DSInformation::BUILD_VERSION: CopyStringPart(reinterpret_cast(out), Common::g_build_version, 0, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_DATE_PART1: + case SystemInfoLime3DSInformation::BUILD_DATE_PART1: CopyStringPart(reinterpret_cast(out), Common::g_build_date, (sizeof(s64) - 1) * 0, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_DATE_PART2: + case SystemInfoLime3DSInformation::BUILD_DATE_PART2: CopyStringPart(reinterpret_cast(out), Common::g_build_date, (sizeof(s64) - 1) * 1, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_DATE_PART3: + case SystemInfoLime3DSInformation::BUILD_DATE_PART3: CopyStringPart(reinterpret_cast(out), Common::g_build_date, (sizeof(s64) - 1) * 2, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_DATE_PART4: + case SystemInfoLime3DSInformation::BUILD_DATE_PART4: CopyStringPart(reinterpret_cast(out), Common::g_build_date, (sizeof(s64) - 1) * 3, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_GIT_BRANCH_PART1: + case SystemInfoLime3DSInformation::BUILD_GIT_BRANCH_PART1: CopyStringPart(reinterpret_cast(out), Common::g_scm_branch, (sizeof(s64) - 1) * 0, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_GIT_BRANCH_PART2: + case SystemInfoLime3DSInformation::BUILD_GIT_BRANCH_PART2: CopyStringPart(reinterpret_cast(out), Common::g_scm_branch, (sizeof(s64) - 1) * 1, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_GIT_DESCRIPTION_PART1: + case SystemInfoLime3DSInformation::BUILD_GIT_DESCRIPTION_PART1: CopyStringPart(reinterpret_cast(out), Common::g_scm_desc, (sizeof(s64) - 1) * 0, sizeof(s64)); break; - case SystemInfoCitraInformation::BUILD_GIT_DESCRIPTION_PART2: + case SystemInfoLime3DSInformation::BUILD_GIT_DESCRIPTION_PART2: CopyStringPart(reinterpret_cast(out), Common::g_scm_desc, (sizeof(s64) - 1) * 1, sizeof(s64)); break; default: - LOG_ERROR(Kernel_SVC, "unknown GetSystemInfo citra info param={}", param); + LOG_ERROR(Kernel_SVC, "unknown GetSystemInfo lime3ds info param={}", param); *out = 0; break; } @@ -1807,7 +1807,7 @@ Result SVC::GetProcessInfo(s64* out, Handle process_handle, u32 type) { // TODO(yuriks): Type 0 returns a slightly higher number than type 2, but I'm not sure // what's the difference between them. *out = process->memory_used; - if (*out % Memory::CITRA_PAGE_SIZE != 0) { + if (*out % Memory::LIME3DS_PAGE_SIZE != 0) { LOG_ERROR(Kernel_SVC, "called, memory size not page-aligned"); return ResultMisalignedSize; } @@ -1935,7 +1935,7 @@ Result SVC::MapProcessMemoryEx(Handle dst_process_handle, u32 dst_address, R_UNLESS(dst_process && src_process, ResultInvalidHandle); if (size & 0xFFF) { - size = (size & ~0xFFF) + Memory::CITRA_PAGE_SIZE; + size = (size & ~0xFFF) + Memory::LIME3DS_PAGE_SIZE; } // Only linear memory supported @@ -1968,7 +1968,7 @@ Result SVC::UnmapProcessMemoryEx(Handle process, u32 dst_address, u32 size) { R_UNLESS(dst_process, ResultInvalidHandle); if (size & 0xFFF) { - size = (size & ~0xFFF) + Memory::CITRA_PAGE_SIZE; + size = (size & ~0xFFF) + Memory::LIME3DS_PAGE_SIZE; } // Only linear memory supported diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index f8084f5ab..973ca33f8 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -109,9 +109,9 @@ void Thread::Stop() { ReleaseThreadMutexes(this); // Mark the TLS slot in the thread's page as free. - u32 tls_page = (tls_address - Memory::TLS_AREA_VADDR) / Memory::CITRA_PAGE_SIZE; - u32 tls_slot = - ((tls_address - Memory::TLS_AREA_VADDR) % Memory::CITRA_PAGE_SIZE) / Memory::TLS_ENTRY_SIZE; + u32 tls_page = (tls_address - Memory::TLS_AREA_VADDR) / Memory::LIME3DS_PAGE_SIZE; + u32 tls_slot = ((tls_address - Memory::TLS_AREA_VADDR) % Memory::LIME3DS_PAGE_SIZE) / + Memory::TLS_ENTRY_SIZE; if (auto process = owner_process.lock()) { process->tls_slots[tls_page].reset(tls_slot); process->resource_limit->Release(ResourceLimitType::Thread, 1); diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index bcdf3363f..0b31db5a3 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -253,8 +253,8 @@ VMManager::VMAIter VMManager::StripIterConstness(const VMAHandle& iter) { } ResultVal VMManager::CarveVMA(VAddr base, u32 size) { - ASSERT_MSG((size & Memory::CITRA_PAGE_MASK) == 0, "non-page aligned size: {:#10X}", size); - ASSERT_MSG((base & Memory::CITRA_PAGE_MASK) == 0, "non-page aligned base: {:#010X}", base); + ASSERT_MSG((size & Memory::LIME3DS_PAGE_MASK) == 0, "non-page aligned size: {:#10X}", size); + ASSERT_MSG((base & Memory::LIME3DS_PAGE_MASK) == 0, "non-page aligned base: {:#010X}", base); VMAIter vma_handle = StripIterConstness(FindVMA(base)); if (vma_handle == vma_map.end()) { @@ -289,8 +289,9 @@ ResultVal VMManager::CarveVMA(VAddr base, u32 size) { } ResultVal VMManager::CarveVMARange(VAddr target, u32 size) { - ASSERT_MSG((size & Memory::CITRA_PAGE_MASK) == 0, "non-page aligned size: {:#10X}", size); - ASSERT_MSG((target & Memory::CITRA_PAGE_MASK) == 0, "non-page aligned base: {:#010X}", target); + ASSERT_MSG((size & Memory::LIME3DS_PAGE_MASK) == 0, "non-page aligned size: {:#10X}", size); + ASSERT_MSG((target & Memory::LIME3DS_PAGE_MASK) == 0, "non-page aligned base: {:#010X}", + target); const VAddr target_end = target + size; ASSERT(target_end >= target); diff --git a/src/core/hle/service/ac/ac.cpp b/src/core/hle/service/ac/ac.cpp index dd5ee5e8e..1f499bcc7 100644 --- a/src/core/hle/service/ac/ac.cpp +++ b/src/core/hle/service/ac/ac.cpp @@ -120,7 +120,7 @@ void Module::Interface::GetCurrentAPInfo(Kernel::HLERequestContext& ctx) { return; } - constexpr const char* citra_ap = "Citra_AP"; + constexpr const char* lime3ds_ap = "Lime3DS_AP"; constexpr s16 good_signal_strength = 60; constexpr u8 unknown1_value = 6; constexpr u8 unknown2_value = 5; @@ -131,7 +131,7 @@ void Module::Interface::GetCurrentAPInfo(Kernel::HLERequestContext& ctx) { SharedPage::MacAddress mac = shared_page.GetMacAddress(); APInfo info{ - .ssid_len = static_cast(std::strlen(citra_ap)), + .ssid_len = static_cast(std::strlen(lime3ds_ap)), .bssid = mac, .padding = 0, .signal_strength = good_signal_strength, @@ -141,7 +141,7 @@ void Module::Interface::GetCurrentAPInfo(Kernel::HLERequestContext& ctx) { .unknown3 = unknown3_value, .unknown4 = unknown4_value, }; - std::strncpy(info.ssid.data(), citra_ap, info.ssid.size()); + std::strncpy(info.ssid.data(), lime3ds_ap, info.ssid.size()); std::vector out_info(len); std::memcpy(out_info.data(), &info, std::min(len, static_cast(sizeof(info)))); diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 6f280dbe0..5bb761ac3 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -1891,7 +1891,7 @@ void Module::Interface::BeginImportProgram(Kernel::HLERequestContext& ctx) { } // Create our CIAFile handle for the app to write to, and while the app writes - // Citra will store contents out to sdmc/nand + // Lime3DS will store contents out to sdmc/nand const FileSys::Path cia_path = {}; auto file = std::make_shared( am->system.Kernel(), std::make_unique(am->system, media_type), cia_path); @@ -1917,8 +1917,8 @@ void Module::Interface::BeginImportProgramTemporarily(Kernel::HLERequestContext& // Note: This function should register the title in the temp_i.db database, but we can get away // with not doing that because we traverse the file system to detect installed titles. - // Create our CIAFile handle for the app to write to, and while the app writes Citra will store - // contents out to sdmc/nand + // Create our CIAFile handle for the app to write to, and while the app writes Lime3DS will + // store contents out to sdmc/nand const FileSys::Path cia_path = {}; auto file = std::make_shared( am->system.Kernel(), std::make_unique(am->system, FS::MediaType::NAND), cia_path); @@ -2069,7 +2069,7 @@ void Module::Interface::GetProgramInfoFromCia(Kernel::HLERequestContext& ctx) { // TODO(shinyquagsire23): Sizes allegedly depend on the mediatype, and will double // on some mediatypes. Since this is more of a required install size we'll report - // what Citra needs, but it would be good to be more accurate here. + // what Lime3DS needs, but it would be good to be more accurate here. title_info.tid = tmd.GetTitleID(); title_info.size = tmd.GetContentSizeByIndex(FileSys::TMDContentIndex::Main); title_info.version = tmd.GetTitleVersion(); @@ -2221,7 +2221,7 @@ void Module::Interface::GetRequiredSizeFromCia(Kernel::HLERequestContext& ctx) { // TODO(shinyquagsire23): Sizes allegedly depend on the mediatype, and will double // on some mediatypes. Since this is more of a required install size we'll report - // what Citra needs, but it would be good to be more accurate here. + // what Lime3DS needs, but it would be good to be more accurate here. IPC::RequestBuilder rb = rp.MakeBuilder(3, 0); rb.Push(ResultSuccess); rb.Push(container.GetTitleMetadata().GetContentSizeByIndex(FileSys::TMDContentIndex::Main)); diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index 4c2cbbd09..457386391 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -256,7 +256,7 @@ bool Module::LoadLegacySharedFont() { // The expected format is a decrypted, uncompressed BCFNT file with the 0x80 byte header // generated by the APT:U service. The best way to get is by dumping it from RAM. We've provided // a homebrew app to do this: https://github.com/citra-emu/3dsutils. Put the resulting file - // "shared_font.bin" in the Citra "sysdata" directory. + // "shared_font.bin" in the Lime3DS "sysdata" directory. std::string filepath = FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir) + SHARED_FONT; FileUtil::CreateFullPath(filepath); // Create path if not already created diff --git a/src/core/hle/service/csnd/csnd_snd.cpp b/src/core/hle/service/csnd/csnd_snd.cpp index cfd367ab3..ba24ad411 100644 --- a/src/core/hle/service/csnd/csnd_snd.cpp +++ b/src/core/hle/service/csnd/csnd_snd.cpp @@ -193,7 +193,7 @@ static_assert(sizeof(CaptureState) == 0x8, "CaptureState structure size is wrong void CSND_SND::Initialize(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx); - const u32 size = Common::AlignUp(rp.Pop(), Memory::CITRA_PAGE_SIZE); + const u32 size = Common::AlignUp(rp.Pop(), Memory::LIME3DS_PAGE_SIZE); master_state_offset = rp.Pop(); channel_state_offset = rp.Pop(); capture_state_offset = rp.Pop(); diff --git a/src/core/hle/service/http/http_c.cpp b/src/core/hle/service/http/http_c.cpp index 039a43044..e1403c1a0 100644 --- a/src/core/hle/service/http/http_c.cpp +++ b/src/core/hle/service/http/http_c.cpp @@ -560,7 +560,7 @@ void HTTP_C::BeginRequest(Kernel::HLERequestContext& ctx) { Context& http_context = GetContext(context_handle); - // This should never happen in real hardware, but can happen on citra. + // This should never happen in real hardware, but can happen on lime3ds. if (http_context.uses_default_client_cert && !http_context.clcert_data->init) { LOG_ERROR(Service_HTTP, "Failed to begin HTTP request: client cert not found."); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); @@ -598,7 +598,7 @@ void HTTP_C::BeginRequestAsync(Kernel::HLERequestContext& ctx) { Context& http_context = GetContext(context_handle); - // This should never happen in real hardware, but can happen on citra. + // This should never happen in real hardware, but can happen on lime3ds. if (http_context.uses_default_client_cert && !http_context.clcert_data->init) { LOG_ERROR(Service_HTTP, "Failed to begin HTTP request: client cert not found."); IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index ac0e9c1fc..5b2e05ee0 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp @@ -1500,7 +1500,7 @@ u32 CROHelper::Fix(u32 fix_level) { } } - fix_end = Common::AlignUp(fix_end, Memory::CITRA_PAGE_SIZE); + fix_end = Common::AlignUp(fix_end, Memory::LIME3DS_PAGE_SIZE); u32 fixed_size = fix_end - module_address; SetField(FixedSize, fixed_size); @@ -1523,8 +1523,8 @@ std::tuple CROHelper::GetExecutablePages() const { SegmentEntry entry; GetEntry(system.Memory(), i, entry); if (entry.type == SegmentType::Code && entry.size != 0) { - VAddr begin = Common::AlignDown(entry.offset, Memory::CITRA_PAGE_SIZE); - VAddr end = Common::AlignUp(entry.offset + entry.size, Memory::CITRA_PAGE_SIZE); + VAddr begin = Common::AlignDown(entry.offset, Memory::LIME3DS_PAGE_SIZE); + VAddr end = Common::AlignUp(entry.offset + entry.size, Memory::LIME3DS_PAGE_SIZE); return std::make_tuple(begin, end - begin); } } diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp index 5fd3f36ba..4782c3dbf 100644 --- a/src/core/hle/service/ldr_ro/ldr_ro.cpp +++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp @@ -87,19 +87,19 @@ void RO::Initialize(Kernel::HLERequestContext& ctx) { return; } - if (crs_buffer_ptr & Memory::CITRA_PAGE_MASK) { + if (crs_buffer_ptr & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRS original address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); return; } - if (crs_address & Memory::CITRA_PAGE_MASK) { + if (crs_address & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRS mapping address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); return; } - if (crs_size & Memory::CITRA_PAGE_MASK) { + if (crs_size & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRS size is not aligned"); rb.Push(ERROR_MISALIGNED_SIZE); return; @@ -207,21 +207,21 @@ void RO::LoadCRO(Kernel::HLERequestContext& ctx, bool link_on_load_bug_fix) { return; } - if (cro_buffer_ptr & Memory::CITRA_PAGE_MASK) { + if (cro_buffer_ptr & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRO original address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); rb.Push(0); return; } - if (cro_address & Memory::CITRA_PAGE_MASK) { + if (cro_address & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRO mapping address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); rb.Push(0); return; } - if (cro_size & Memory::CITRA_PAGE_MASK) { + if (cro_size & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRO size is not aligned"); rb.Push(ERROR_MISALIGNED_SIZE); rb.Push(0); @@ -354,7 +354,7 @@ void RO::UnloadCRO(Kernel::HLERequestContext& ctx) { return; } - if (cro_address & Memory::CITRA_PAGE_MASK) { + if (cro_address & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRO address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); return; @@ -421,7 +421,7 @@ void RO::LinkCRO(Kernel::HLERequestContext& ctx) { return; } - if (cro_address & Memory::CITRA_PAGE_MASK) { + if (cro_address & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRO address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); return; @@ -461,7 +461,7 @@ void RO::UnlinkCRO(Kernel::HLERequestContext& ctx) { return; } - if (cro_address & Memory::CITRA_PAGE_MASK) { + if (cro_address & Memory::LIME3DS_PAGE_MASK) { LOG_ERROR(Service_LDR, "CRO address is not aligned"); rb.Push(ERROR_MISALIGNED_ADDRESS); return; diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp index a8e8c3c9d..58b2f4e35 100644 --- a/src/core/hle/service/nwm/nwm_uds.cpp +++ b/src/core/hle/service/nwm/nwm_uds.cpp @@ -97,7 +97,7 @@ u16 NWM_UDS::GetNextAvailableNodeId() { void NWM_UDS::BroadcastNodeMap() { // Note: This is not how UDS on a 3ds does it but it shouldn't be - // necessary for citra + // necessary for lime3ds Network::WifiPacket packet; packet.channel = network_channel; packet.type = Network::WifiPacket::PacketType::NodeMap; diff --git a/src/core/hle/service/nwm/uds_beacon.cpp b/src/core/hle/service/nwm/uds_beacon.cpp index d20a7bd67..e78087ad1 100644 --- a/src/core/hle/service/nwm/uds_beacon.cpp +++ b/src/core/hle/service/nwm/uds_beacon.cpp @@ -29,7 +29,7 @@ constexpr u32 EncryptedDataSizeCutoff = 0xFA; /** * NWM Beacon data encryption key, taken from the NWM module code. - * We stub this with an all-zeros key as that is enough for Citra's purpose. + * We stub this with an all-zeros key as that is enough for Lime3DS's purpose. * The real key can be used here to generate beacons that will be accepted by * a real 3ds. */ diff --git a/src/core/loader/artic.cpp b/src/core/loader/artic.cpp index 80365ed6e..0b8a67417 100644 --- a/src/core/loader/artic.cpp +++ b/src/core/loader/artic.cpp @@ -128,13 +128,13 @@ ResultStatus Apploader_Artic::LoadExec(std::shared_ptr& process codeset->CodeSegment().offset = 0; codeset->CodeSegment().addr = program_exheader.codeset_info.text.address; codeset->CodeSegment().size = - program_exheader.codeset_info.text.num_max_pages * Memory::CITRA_PAGE_SIZE; + program_exheader.codeset_info.text.num_max_pages * Memory::LIME3DS_PAGE_SIZE; codeset->RODataSegment().offset = codeset->CodeSegment().offset + codeset->CodeSegment().size; codeset->RODataSegment().addr = program_exheader.codeset_info.ro.address; codeset->RODataSegment().size = - program_exheader.codeset_info.ro.num_max_pages * Memory::CITRA_PAGE_SIZE; + program_exheader.codeset_info.ro.num_max_pages * Memory::LIME3DS_PAGE_SIZE; // TODO(yuriks): Not sure if the bss size is added to the page-aligned .data size or just // to the regular size. Playing it safe for now. @@ -145,7 +145,7 @@ ResultStatus Apploader_Artic::LoadExec(std::shared_ptr& process codeset->RODataSegment().offset + codeset->RODataSegment().size; codeset->DataSegment().addr = program_exheader.codeset_info.data.address; codeset->DataSegment().size = - program_exheader.codeset_info.data.num_max_pages * Memory::CITRA_PAGE_SIZE + + program_exheader.codeset_info.data.num_max_pages * Memory::LIME3DS_PAGE_SIZE + bss_page_size; // Apply patches now that the entire codeset (including .bss) has been allocated @@ -387,9 +387,9 @@ ResultStatus Apploader_Artic::ReadCode(std::vector& buffer) { if (!client_connected) return ResultStatus::ErrorArtic; - size_t code_size = program_exheader.codeset_info.text.num_max_pages * Memory::CITRA_PAGE_SIZE; - code_size += program_exheader.codeset_info.ro.num_max_pages * Memory::CITRA_PAGE_SIZE; - code_size += program_exheader.codeset_info.data.num_max_pages * Memory::CITRA_PAGE_SIZE; + size_t code_size = program_exheader.codeset_info.text.num_max_pages * Memory::LIME3DS_PAGE_SIZE; + code_size += program_exheader.codeset_info.ro.num_max_pages * Memory::LIME3DS_PAGE_SIZE; + code_size += program_exheader.codeset_info.data.num_max_pages * Memory::LIME3DS_PAGE_SIZE; size_t read_amount = 0; buffer.clear(); diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index ad0910096..835f101bf 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -120,13 +120,14 @@ ResultStatus AppLoader_NCCH::LoadExec(std::shared_ptr& process) codeset->CodeSegment().offset = 0; codeset->CodeSegment().addr = overlay_ncch->exheader_header.codeset_info.text.address; codeset->CodeSegment().size = - overlay_ncch->exheader_header.codeset_info.text.num_max_pages * Memory::CITRA_PAGE_SIZE; + overlay_ncch->exheader_header.codeset_info.text.num_max_pages * + Memory::LIME3DS_PAGE_SIZE; codeset->RODataSegment().offset = codeset->CodeSegment().offset + codeset->CodeSegment().size; codeset->RODataSegment().addr = overlay_ncch->exheader_header.codeset_info.ro.address; codeset->RODataSegment().size = - overlay_ncch->exheader_header.codeset_info.ro.num_max_pages * Memory::CITRA_PAGE_SIZE; + overlay_ncch->exheader_header.codeset_info.ro.num_max_pages * Memory::LIME3DS_PAGE_SIZE; // TODO(yuriks): Not sure if the bss size is added to the page-aligned .data size or just // to the regular size. Playing it safe for now. @@ -138,7 +139,7 @@ ResultStatus AppLoader_NCCH::LoadExec(std::shared_ptr& process) codeset->DataSegment().addr = overlay_ncch->exheader_header.codeset_info.data.address; codeset->DataSegment().size = overlay_ncch->exheader_header.codeset_info.data.num_max_pages * - Memory::CITRA_PAGE_SIZE + + Memory::LIME3DS_PAGE_SIZE + bss_page_size; // Apply patches now that the entire codeset (including .bss) has been allocated diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 5bb8abdfc..d15b2f415 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -54,24 +54,24 @@ public: private: bool* At(VAddr addr) { if (addr >= VRAM_VADDR && addr < VRAM_VADDR_END) { - return &vram[(addr - VRAM_VADDR) / CITRA_PAGE_SIZE]; + return &vram[(addr - VRAM_VADDR) / LIME3DS_PAGE_SIZE]; } if (addr >= LINEAR_HEAP_VADDR && addr < LINEAR_HEAP_VADDR_END) { - return &linear_heap[(addr - LINEAR_HEAP_VADDR) / CITRA_PAGE_SIZE]; + return &linear_heap[(addr - LINEAR_HEAP_VADDR) / LIME3DS_PAGE_SIZE]; } if (addr >= NEW_LINEAR_HEAP_VADDR && addr < NEW_LINEAR_HEAP_VADDR_END) { - return &new_linear_heap[(addr - NEW_LINEAR_HEAP_VADDR) / CITRA_PAGE_SIZE]; + return &new_linear_heap[(addr - NEW_LINEAR_HEAP_VADDR) / LIME3DS_PAGE_SIZE]; } if (addr >= PLUGIN_3GX_FB_VADDR && addr < PLUGIN_3GX_FB_VADDR_END) { - return &plugin_fb[(addr - PLUGIN_3GX_FB_VADDR) / CITRA_PAGE_SIZE]; + return &plugin_fb[(addr - PLUGIN_3GX_FB_VADDR) / LIME3DS_PAGE_SIZE]; } return nullptr; } - std::array vram{}; - std::array linear_heap{}; - std::array new_linear_heap{}; - std::array plugin_fb{}; + std::array vram{}; + std::array linear_heap{}; + std::array new_linear_heap{}; + std::array plugin_fb{}; static_assert(sizeof(bool) == 1); friend class boost::serialization::access; @@ -161,13 +161,14 @@ public: auto& page_table = *process.vm_manager.page_table; std::size_t remaining_size = size; - std::size_t page_index = src_addr >> CITRA_PAGE_BITS; - std::size_t page_offset = src_addr & CITRA_PAGE_MASK; + std::size_t page_index = src_addr >> LIME3DS_PAGE_BITS; + std::size_t page_offset = src_addr & LIME3DS_PAGE_MASK; while (remaining_size > 0) { - const std::size_t copy_amount = std::min(CITRA_PAGE_SIZE - page_offset, remaining_size); + const std::size_t copy_amount = + std::min(LIME3DS_PAGE_SIZE - page_offset, remaining_size); const VAddr current_vaddr = - static_cast((page_index << CITRA_PAGE_BITS) + page_offset); + static_cast((page_index << LIME3DS_PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { case PageType::Unmapped: { @@ -210,13 +211,14 @@ public: const void* src_buffer, const std::size_t size) { auto& page_table = *process.vm_manager.page_table; std::size_t remaining_size = size; - std::size_t page_index = dest_addr >> CITRA_PAGE_BITS; - std::size_t page_offset = dest_addr & CITRA_PAGE_MASK; + std::size_t page_index = dest_addr >> LIME3DS_PAGE_BITS; + std::size_t page_offset = dest_addr & LIME3DS_PAGE_MASK; while (remaining_size > 0) { - const std::size_t copy_amount = std::min(CITRA_PAGE_SIZE - page_offset, remaining_size); + const std::size_t copy_amount = + std::min(LIME3DS_PAGE_SIZE - page_offset, remaining_size); const VAddr current_vaddr = - static_cast((page_index << CITRA_PAGE_BITS) + page_offset); + static_cast((page_index << LIME3DS_PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { case PageType::Unmapped: { @@ -393,10 +395,10 @@ void MemorySystem::RasterizerFlushVirtualRegion(VAddr start, u32 size, FlushMode void MemorySystem::MapPages(PageTable& page_table, u32 base, u32 size, MemoryRef memory, PageType type) { LOG_DEBUG(HW_Memory, "Mapping {} onto {:08X}-{:08X}", (void*)memory.GetPtr(), - base * CITRA_PAGE_SIZE, (base + size) * CITRA_PAGE_SIZE); + base * LIME3DS_PAGE_SIZE, (base + size) * LIME3DS_PAGE_SIZE); if (impl->system.IsPoweredOn()) { - RasterizerFlushVirtualRegion(base << CITRA_PAGE_BITS, size * CITRA_PAGE_SIZE, + RasterizerFlushVirtualRegion(base << LIME3DS_PAGE_BITS, size * LIME3DS_PAGE_SIZE, FlushMode::FlushAndInvalidate); } @@ -408,27 +410,28 @@ void MemorySystem::MapPages(PageTable& page_table, u32 base, u32 size, MemoryRef page_table.pointers[base] = memory; // If the memory to map is already rasterizer-cached, mark the page - if (type == PageType::Memory && impl->cache_marker.IsCached(base * CITRA_PAGE_SIZE)) { + if (type == PageType::Memory && impl->cache_marker.IsCached(base * LIME3DS_PAGE_SIZE)) { page_table.attributes[base] = PageType::RasterizerCachedMemory; page_table.pointers[base] = nullptr; } base += 1; - if (memory != nullptr && memory.GetSize() > CITRA_PAGE_SIZE) - memory += CITRA_PAGE_SIZE; + if (memory != nullptr && memory.GetSize() > LIME3DS_PAGE_SIZE) + memory += LIME3DS_PAGE_SIZE; } } void MemorySystem::MapMemoryRegion(PageTable& page_table, VAddr base, u32 size, MemoryRef target) { - ASSERT_MSG((size & CITRA_PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); - ASSERT_MSG((base & CITRA_PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); - MapPages(page_table, base / CITRA_PAGE_SIZE, size / CITRA_PAGE_SIZE, target, PageType::Memory); + ASSERT_MSG((size & LIME3DS_PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); + ASSERT_MSG((base & LIME3DS_PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); + MapPages(page_table, base / LIME3DS_PAGE_SIZE, size / LIME3DS_PAGE_SIZE, target, + PageType::Memory); } void MemorySystem::UnmapRegion(PageTable& page_table, VAddr base, u32 size) { - ASSERT_MSG((size & CITRA_PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); - ASSERT_MSG((base & CITRA_PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); - MapPages(page_table, base / CITRA_PAGE_SIZE, size / CITRA_PAGE_SIZE, nullptr, + ASSERT_MSG((size & LIME3DS_PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); + ASSERT_MSG((base & LIME3DS_PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); + MapPages(page_table, base / LIME3DS_PAGE_SIZE, size / LIME3DS_PAGE_SIZE, nullptr, PageType::Unmapped); } @@ -449,11 +452,11 @@ void MemorySystem::UnregisterPageTable(std::shared_ptr page_table) { template T MemorySystem::Read(const VAddr vaddr) { - const u8* page_pointer = impl->current_page_table->pointers[vaddr >> CITRA_PAGE_BITS]; + const u8* page_pointer = impl->current_page_table->pointers[vaddr >> LIME3DS_PAGE_BITS]; if (page_pointer) { // NOTE: Avoid adding any extra logic to this fast-path block T value; - std::memcpy(&value, &page_pointer[vaddr & CITRA_PAGE_MASK], sizeof(T)); + std::memcpy(&value, &page_pointer[vaddr & LIME3DS_PAGE_MASK], sizeof(T)); return value; } @@ -472,7 +475,7 @@ T MemorySystem::Read(const VAddr vaddr) { } } - PageType type = impl->current_page_table->attributes[vaddr >> CITRA_PAGE_BITS]; + PageType type = impl->current_page_table->attributes[vaddr >> LIME3DS_PAGE_BITS]; switch (type) { case PageType::Unmapped: LOG_ERROR(HW_Memory, "unmapped Read{} @ 0x{:08X} at PC 0x{:08X}", sizeof(T) * 8, vaddr, @@ -497,10 +500,10 @@ T MemorySystem::Read(const VAddr vaddr) { template void MemorySystem::Write(const VAddr vaddr, const T data) { - u8* page_pointer = impl->current_page_table->pointers[vaddr >> CITRA_PAGE_BITS]; + u8* page_pointer = impl->current_page_table->pointers[vaddr >> LIME3DS_PAGE_BITS]; if (page_pointer) { // NOTE: Avoid adding any extra logic to this fast-path block - std::memcpy(&page_pointer[vaddr & CITRA_PAGE_MASK], &data, sizeof(T)); + std::memcpy(&page_pointer[vaddr & LIME3DS_PAGE_MASK], &data, sizeof(T)); return; } @@ -521,7 +524,7 @@ void MemorySystem::Write(const VAddr vaddr, const T data) { } } - PageType type = impl->current_page_table->attributes[vaddr >> CITRA_PAGE_BITS]; + PageType type = impl->current_page_table->attributes[vaddr >> LIME3DS_PAGE_BITS]; switch (type) { case PageType::Unmapped: LOG_ERROR(HW_Memory, "unmapped Write{} 0x{:08X} @ 0x{:08X} at PC 0x{:08X}", @@ -542,15 +545,15 @@ void MemorySystem::Write(const VAddr vaddr, const T data) { template bool MemorySystem::WriteExclusive(const VAddr vaddr, const T data, const T expected) { - u8* page_pointer = impl->current_page_table->pointers[vaddr >> CITRA_PAGE_BITS]; + u8* page_pointer = impl->current_page_table->pointers[vaddr >> LIME3DS_PAGE_BITS]; if (page_pointer) { const auto volatile_pointer = - reinterpret_cast(&page_pointer[vaddr & CITRA_PAGE_MASK]); + reinterpret_cast(&page_pointer[vaddr & LIME3DS_PAGE_MASK]); return Common::AtomicCompareAndSwap(volatile_pointer, data, expected); } - PageType type = impl->current_page_table->attributes[vaddr >> CITRA_PAGE_BITS]; + PageType type = impl->current_page_table->attributes[vaddr >> LIME3DS_PAGE_BITS]; switch (type) { case PageType::Unmapped: LOG_ERROR(HW_Memory, "unmapped Write{} 0x{:08X} @ 0x{:08X} at PC 0x{:08X}", @@ -574,12 +577,12 @@ bool MemorySystem::WriteExclusive(const VAddr vaddr, const T data, const T expec bool MemorySystem::IsValidVirtualAddress(const Kernel::Process& process, const VAddr vaddr) { auto& page_table = *process.vm_manager.page_table; - auto page_pointer = page_table.pointers[vaddr >> CITRA_PAGE_BITS]; + auto page_pointer = page_table.pointers[vaddr >> LIME3DS_PAGE_BITS]; if (page_pointer) { return true; } - if (page_table.attributes[vaddr >> CITRA_PAGE_BITS] == PageType::RasterizerCachedMemory) { + if (page_table.attributes[vaddr >> LIME3DS_PAGE_BITS] == PageType::RasterizerCachedMemory) { return true; } @@ -591,12 +594,12 @@ bool MemorySystem::IsValidPhysicalAddress(const PAddr paddr) const { } u8* MemorySystem::GetPointer(const VAddr vaddr) { - u8* page_pointer = impl->current_page_table->pointers[vaddr >> CITRA_PAGE_BITS]; + u8* page_pointer = impl->current_page_table->pointers[vaddr >> LIME3DS_PAGE_BITS]; if (page_pointer) { - return page_pointer + (vaddr & CITRA_PAGE_MASK); + return page_pointer + (vaddr & LIME3DS_PAGE_MASK); } - if (impl->current_page_table->attributes[vaddr >> CITRA_PAGE_BITS] == + if (impl->current_page_table->attributes[vaddr >> LIME3DS_PAGE_BITS] == PageType::RasterizerCachedMemory) { return GetPointerForRasterizerCache(vaddr); } @@ -606,12 +609,12 @@ u8* MemorySystem::GetPointer(const VAddr vaddr) { } const u8* MemorySystem::GetPointer(const VAddr vaddr) const { - const u8* page_pointer = impl->current_page_table->pointers[vaddr >> CITRA_PAGE_BITS]; + const u8* page_pointer = impl->current_page_table->pointers[vaddr >> LIME3DS_PAGE_BITS]; if (page_pointer) { - return page_pointer + (vaddr & CITRA_PAGE_MASK); + return page_pointer + (vaddr & LIME3DS_PAGE_MASK); } - if (impl->current_page_table->attributes[vaddr >> CITRA_PAGE_BITS] == + if (impl->current_page_table->attributes[vaddr >> LIME3DS_PAGE_BITS] == PageType::RasterizerCachedMemory) { return GetPointerForRasterizerCache(vaddr); } @@ -720,14 +723,14 @@ void MemorySystem::RasterizerMarkRegionCached(PAddr start, u32 size, bool cached return; } - u32 num_pages = ((start + size - 1) >> CITRA_PAGE_BITS) - (start >> CITRA_PAGE_BITS) + 1; + u32 num_pages = ((start + size - 1) >> LIME3DS_PAGE_BITS) - (start >> LIME3DS_PAGE_BITS) + 1; PAddr paddr = start; - for (unsigned i = 0; i < num_pages; ++i, paddr += CITRA_PAGE_SIZE) { + for (unsigned i = 0; i < num_pages; ++i, paddr += LIME3DS_PAGE_SIZE) { for (VAddr vaddr : PhysicalToVirtualAddressForRasterizer(paddr)) { impl->cache_marker.Mark(vaddr, cached); for (auto& page_table : impl->page_table_list) { - PageType& page_type = page_table->attributes[vaddr >> CITRA_PAGE_BITS]; + PageType& page_type = page_table->attributes[vaddr >> LIME3DS_PAGE_BITS]; if (cached) { // Switch page type to cached if now cached @@ -738,7 +741,7 @@ void MemorySystem::RasterizerMarkRegionCached(PAddr start, u32 size, bool cached break; case PageType::Memory: page_type = PageType::RasterizerCachedMemory; - page_table->pointers[vaddr >> CITRA_PAGE_BITS] = nullptr; + page_table->pointers[vaddr >> LIME3DS_PAGE_BITS] = nullptr; break; default: UNREACHABLE(); @@ -752,8 +755,8 @@ void MemorySystem::RasterizerMarkRegionCached(PAddr start, u32 size, bool cached break; case PageType::RasterizerCachedMemory: { page_type = PageType::Memory; - page_table->pointers[vaddr >> CITRA_PAGE_BITS] = - GetPointerForRasterizerCache(vaddr & ~CITRA_PAGE_MASK); + page_table->pointers[vaddr >> LIME3DS_PAGE_BITS] = + GetPointerForRasterizerCache(vaddr & ~LIME3DS_PAGE_MASK); break; } default: @@ -838,13 +841,13 @@ void MemorySystem::ZeroBlock(const Kernel::Process& process, const VAddr dest_ad const std::size_t size) { auto& page_table = *process.vm_manager.page_table; std::size_t remaining_size = size; - std::size_t page_index = dest_addr >> CITRA_PAGE_BITS; - std::size_t page_offset = dest_addr & CITRA_PAGE_MASK; + std::size_t page_index = dest_addr >> LIME3DS_PAGE_BITS; + std::size_t page_offset = dest_addr & LIME3DS_PAGE_MASK; while (remaining_size > 0) { - const std::size_t copy_amount = std::min(CITRA_PAGE_SIZE - page_offset, remaining_size); + const std::size_t copy_amount = std::min(LIME3DS_PAGE_SIZE - page_offset, remaining_size); const VAddr current_vaddr = - static_cast((page_index << CITRA_PAGE_BITS) + page_offset); + static_cast((page_index << LIME3DS_PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { case PageType::Unmapped: { @@ -887,13 +890,13 @@ void MemorySystem::CopyBlock(const Kernel::Process& dest_process, std::size_t size) { auto& page_table = *src_process.vm_manager.page_table; std::size_t remaining_size = size; - std::size_t page_index = src_addr >> CITRA_PAGE_BITS; - std::size_t page_offset = src_addr & CITRA_PAGE_MASK; + std::size_t page_index = src_addr >> LIME3DS_PAGE_BITS; + std::size_t page_offset = src_addr & LIME3DS_PAGE_MASK; while (remaining_size > 0) { - const std::size_t copy_amount = std::min(CITRA_PAGE_SIZE - page_offset, remaining_size); + const std::size_t copy_amount = std::min(LIME3DS_PAGE_SIZE - page_offset, remaining_size); const VAddr current_vaddr = - static_cast((page_index << CITRA_PAGE_BITS) + page_offset); + static_cast((page_index << LIME3DS_PAGE_BITS) + page_offset); switch (page_table.attributes[page_index]) { case PageType::Unmapped: { diff --git a/src/core/memory.h b/src/core/memory.h index 5bb98fb18..e137838a9 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -29,10 +29,10 @@ namespace Memory { * Page size used by the ARM architecture. This is the smallest granularity with which memory can * be mapped. */ -constexpr u32 CITRA_PAGE_SIZE = 0x1000; -constexpr u32 CITRA_PAGE_MASK = CITRA_PAGE_SIZE - 1; -constexpr int CITRA_PAGE_BITS = 12; -constexpr std::size_t PAGE_TABLE_NUM_ENTRIES = 1 << (32 - CITRA_PAGE_BITS); +constexpr u32 LIME3DS_PAGE_SIZE = 0x1000; +constexpr u32 LIME3DS_PAGE_MASK = LIME3DS_PAGE_SIZE - 1; +constexpr int LIME3DS_PAGE_BITS = 12; +constexpr std::size_t PAGE_TABLE_NUM_ENTRIES = 1 << (32 - LIME3DS_PAGE_BITS); enum class PageType { /// Page is unmapped and should cause an access error. diff --git a/src/core/movie.cpp b/src/core/movie.cpp index 48f910337..9d848b3d0 100644 --- a/src/core/movie.cpp +++ b/src/core/movie.cpp @@ -468,8 +468,8 @@ Movie::ValidationResult Movie::ValidateHeader(const CTMHeader& header) const { std::string revision = fmt::format("{:02x}", fmt::join(header.revision, "")); if (revision != Common::g_scm_rev) { - LOG_WARNING(Movie, - "This movie was created on a different version of Citra, playback may desync"); + LOG_WARNING( + Movie, "This movie was created on a different version of Lime3DS, playback may desync"); return ValidationResult::RevisionDismatch; } diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp index 1858c70ca..10ec65c87 100644 --- a/src/core/telemetry_session.cpp +++ b/src/core/telemetry_session.cpp @@ -89,8 +89,8 @@ TelemetrySession::~TelemetrySession() { #ifdef ENABLE_WEB_SERVICE auto backend = std::make_unique(NetSettings::values.web_api_url, - NetSettings::values.citra_username, - NetSettings::values.citra_token); + NetSettings::values.lime3ds_username, + NetSettings::values.lime3ds_token); #else auto backend = std::make_unique(); #endif @@ -161,8 +161,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader) { bool TelemetrySession::SubmitTestcase() { #ifdef ENABLE_WEB_SERVICE auto backend = std::make_unique(NetSettings::values.web_api_url, - NetSettings::values.citra_username, - NetSettings::values.citra_token); + NetSettings::values.lime3ds_username, + NetSettings::values.lime3ds_token); field_collection.Accept(*backend); return backend->SubmitTestcase(); #else diff --git a/src/core/telemetry_session.h b/src/core/telemetry_session.h index f64dd2a64..8ebe7da38 100644 --- a/src/core/telemetry_session.h +++ b/src/core/telemetry_session.h @@ -82,8 +82,8 @@ u64 RegenerateTelemetryId(); /** * Verifies the username and token. - * @param username Citra username to use for authentication. - * @param token Citra token to use for authentication. + * @param username Lime3DS username to use for authentication. + * @param token Lime3DS token to use for authentication. * @returns Future with bool indicating whether the verification succeeded */ bool VerifyLogin(const std::string& username, const std::string& token); diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h index 114f22245..133f81da7 100644 --- a/src/core/tracer/recorder.h +++ b/src/core/tracer/recorder.h @@ -33,7 +33,7 @@ public: */ explicit Recorder(const InitialState& initial_state); - /// Finish recording of this Citrace and save it using the given filename. + /// Finish recording of this Lime3DSce and save it using the given filename. void Finish(const std::string& filename); /// Mark end of a frame diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt index 1a3462b8e..7ca6bd71a 100644 --- a/src/dedicated_room/CMakeLists.txt +++ b/src/dedicated_room/CMakeLists.txt @@ -25,7 +25,7 @@ if(UNIX AND NOT APPLE) install(TARGETS lime-room RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(lime-room PRIVATE precompiled_headers.h) endif() diff --git a/src/dedicated_room/lime-room.cpp b/src/dedicated_room/lime-room.cpp index bd05cc50d..8d9bfb269 100644 --- a/src/dedicated_room/lime-room.cpp +++ b/src/dedicated_room/lime-room.cpp @@ -42,32 +42,33 @@ #endif static void PrintHelp(const char* argv0) { - std::cout << "Usage: " << argv0 - << " [options] \n" - "--room-name The name of the room\n" - "--room-description The room description\n" - "--port The port used for the room\n" - "--max_members The maximum number of players for this room\n" - "--password The password for the room\n" - "--preferred-game The preferred game for this room\n" - "--preferred-game-id The preferred game-id for this room\n" - "--username The username used for announce\n" - "--token The token used for announce\n" - "--web-api-url Citra Web API url\n" - "--ban-list-file The file for storing the room ban list\n" - "--log-file The file for storing the room log\n" - "--enable-citra-mods Allow Citra Community Moderators to moderate on your room\n" - "-h, --help Display this help and exit\n" - "-v, --version Output version information and exit\n"; + std::cout + << "Usage: " << argv0 + << " [options] \n" + "--room-name The name of the room\n" + "--room-description The room description\n" + "--port The port used for the room\n" + "--max_members The maximum number of players for this room\n" + "--password The password for the room\n" + "--preferred-game The preferred game for this room\n" + "--preferred-game-id The preferred game-id for this room\n" + "--username The username used for announce\n" + "--token The token used for announce\n" + "--web-api-url Lime3DS Web API url\n" + "--ban-list-file The file for storing the room ban list\n" + "--log-file The file for storing the room log\n" + "--enable-lime3ds-mods Allow Lime3DS Community Moderators to moderate on your room\n" + "-h, --help Display this help and exit\n" + "-v, --version Output version information and exit\n"; } static void PrintVersion() { - std::cout << "Citra dedicated room " << Common::g_scm_branch << " " << Common::g_scm_desc + std::cout << "Lime3DS dedicated room " << Common::g_scm_branch << " " << Common::g_scm_desc << " Libnetwork: " << Network::network_version << std::endl; } /// The magic text at the beginning of a lime-room ban list file. -static constexpr char BanListMagic[] = "CitraRoom-BanList-1"; +static constexpr char BanListMagic[] = "Lime3DSRoom-BanList-1"; static constexpr char token_delimiter{':'}; @@ -173,7 +174,7 @@ int main(int argc, char** argv) { u64 preferred_game_id = 0; u16 port = Network::DefaultRoomPort; u32 max_members = 16; - bool enable_citra_mods = false; + bool enable_lime3ds_mods = false; static struct option long_options[] = { {"room-name", required_argument, 0, 'n'}, @@ -188,7 +189,7 @@ int main(int argc, char** argv) { {"web-api-url", required_argument, 0, 'a'}, {"ban-list-file", required_argument, 0, 'b'}, {"log-file", required_argument, 0, 'l'}, - {"enable-citra-mods", no_argument, 0, 'e'}, + {"enable-lime3ds-mods", no_argument, 0, 'e'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, {0, 0, 0, 0}, @@ -235,7 +236,7 @@ int main(int argc, char** argv) { log_file.assign(optarg); break; case 'e': - enable_citra_mods = true; + enable_lime3ds_mods = true; break; case 'h': PrintHelp(argv[0]); @@ -289,19 +290,19 @@ int main(int argc, char** argv) { if (username.empty()) { std::cout << "Hosting a public room\n\n"; NetSettings::values.web_api_url = web_api_url; - NetSettings::values.citra_username = UsernameFromDisplayToken(token); - username = NetSettings::values.citra_username; - NetSettings::values.citra_token = TokenFromDisplayToken(token); + NetSettings::values.lime3ds_username = UsernameFromDisplayToken(token); + username = NetSettings::values.lime3ds_username; + NetSettings::values.lime3ds_token = TokenFromDisplayToken(token); } else { std::cout << "Hosting a public room\n\n"; NetSettings::values.web_api_url = web_api_url; - NetSettings::values.citra_username = username; - NetSettings::values.citra_token = token; + NetSettings::values.lime3ds_username = username; + NetSettings::values.lime3ds_token = token; } } - if (!announce && enable_citra_mods) { - enable_citra_mods = false; - std::cout << "Can not enable Citra Moderators for private rooms\n\n"; + if (!announce && enable_lime3ds_mods) { + enable_lime3ds_mods = false; + std::cout << "Can not enable Lime3DS Moderators for private rooms\n\n"; } InitializeLogging(log_file); @@ -319,7 +320,7 @@ int main(int argc, char** argv) { std::make_unique(NetSettings::values.web_api_url); #else std::cout - << "Citra Web Services is not available with this build: validation is disabled.\n\n"; + << "Lime3DS Web Services is not available with this build: validation is disabled.\n\n"; verify_backend = std::make_unique(); #endif } else { @@ -330,7 +331,7 @@ int main(int argc, char** argv) { if (std::shared_ptr room = Network::GetRoom().lock()) { if (!room->Create(room_name, room_description, "", port, password, max_members, username, preferred_game, preferred_game_id, std::move(verify_backend), ban_list, - enable_citra_mods)) { + enable_lime3ds_mods)) { std::cout << "Failed to create room: \n\n"; return -1; } diff --git a/src/dedicated_room/lime-room.rc b/src/dedicated_room/lime-room.rc index 2a707cbd1..8ca683b8e 100644 --- a/src/dedicated_room/lime-room.rc +++ b/src/dedicated_room/lime-room.rc @@ -6,7 +6,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -CITRA_ICON ICON "../../dist/lime.ico" +LIME3DS_ICON ICON "../../dist/lime.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 7c76b16b6..e0aa3b1c3 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -44,6 +44,6 @@ endif() create_target_directory_groups(input_common) target_link_libraries(input_common PUBLIC lime_core PRIVATE lime_common ${Boost_LIBRARIES}) -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(input_common PRIVATE precompiled_headers.h) endif() diff --git a/src/input_common/udp/protocol.h b/src/input_common/udp/protocol.h index 3ba4d1fc8..12018d6d5 100644 --- a/src/input_common/udp/protocol.h +++ b/src/input_common/udp/protocol.h @@ -57,7 +57,7 @@ namespace Request { struct Version {}; /** * Requests the server to send information about what controllers are plugged into the ports - * In citra's case, we only have one controller, so for simplicity's sake, we can just send a + * In lime3ds's case, we only have one controller, so for simplicity's sake, we can just send a * request explicitly for the first controller port and leave it at that. In the future it would be * nice to make this configurable */ diff --git a/src/lime/CMakeLists.txt b/src/lime/CMakeLists.txt index 64201e887..2efc46a1b 100644 --- a/src/lime/CMakeLists.txt +++ b/src/lime/CMakeLists.txt @@ -50,7 +50,7 @@ if(UNIX AND NOT APPLE) install(TARGETS lime RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(lime PRIVATE precompiled_headers.h) endif() diff --git a/src/lime/config.cpp b/src/lime/config.cpp index 4bc59945c..0e6240a6e 100644 --- a/src/lime/config.cpp +++ b/src/lime/config.cpp @@ -345,8 +345,9 @@ void Config::ReadValues() { // Web Service NetSettings::values.web_api_url = sdl2_config->GetString("WebService", "web_api_url", "https://api.citra-emu.org"); - NetSettings::values.citra_username = sdl2_config->GetString("WebService", "citra_username", ""); - NetSettings::values.citra_token = sdl2_config->GetString("WebService", "citra_token", ""); + NetSettings::values.lime3ds_username = + sdl2_config->GetString("WebService", "lime3ds_username", ""); + NetSettings::values.lime3ds_token = sdl2_config->GetString("WebService", "lime3ds_token", ""); // Video Dumping Settings::values.output_format = diff --git a/src/lime/default_ini.h b/src/lime/default_ini.h index 731e0127c..b3fa17b4e 100644 --- a/src/lime/default_ini.h +++ b/src/lime/default_ini.h @@ -74,7 +74,7 @@ touch_device= # Most desktop operating systems do not expose a way to poll the motion state of the controllers # so as a way around it, cemuhook created a udp client/server protocol to broadcast the data directly -# from a controller device to the client program. Citra has a client that can connect and read +# from a controller device to the client program. Lime3DS has a client that can connect and read # from any cemuhook compatible motion program. # IPv4 address of the udp input server (Default "127.0.0.1") @@ -291,7 +291,7 @@ sdmc_directory = nand_directory = [System] -# The system model that Citra will try to emulate +# The system model that Lime3DS will try to emulate # 0: Old 3DS, 1: New 3DS (default) is_new_3ds = @@ -299,11 +299,11 @@ is_new_3ds = # 0 (default): No, 1: Yes lle_applets = -# The system region that Citra will use during emulation +# The system region that Lime3DS will use during emulation # -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan region_value = -# The clock to use when citra starts +# The clock to use when lime3ds starts # 0: System clock (default), 1: fixed time init_clock = @@ -312,7 +312,7 @@ init_clock = # Note: 3DS can only handle times later then Jan 1 2000 init_time = -# The system ticks count to use when citra starts +# The system ticks count to use when lime3ds starts # 0: Random (default), 1: Fixed init_ticks_type = @@ -364,10 +364,10 @@ renderer_debug = [WebService] # URL for Web API web_api_url = https://api.citra-emu.org -# Username and token for Citra Web Service +# Username and token for Lime3DS Web Service # See https://profile.citra-emu.org/ for more info -citra_username = -citra_token = +lime3ds_username = +lime3ds_token = [Video Dumping] # Format of the video to output, default: webm diff --git a/src/lime/lime.rc b/src/lime/lime.rc index 2a707cbd1..8ca683b8e 100644 --- a/src/lime/lime.rc +++ b/src/lime/lime.rc @@ -6,7 +6,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -CITRA_ICON ICON "../../dist/lime.ico" +LIME3DS_ICON ICON "../../dist/lime.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/lime_qt/CMakeLists.txt b/src/lime_qt/CMakeLists.txt index a2f14f40a..8ee3a56cd 100644 --- a/src/lime_qt/CMakeLists.txt +++ b/src/lime_qt/CMakeLists.txt @@ -209,14 +209,14 @@ if (ENABLE_QT_UPDATER) endif() if (ENABLE_QT_TRANSLATION) - set(CITRA_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend") + set(LIME3DS_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend") option(GENERATE_QT_TRANSLATION "Generate en.ts as the translation source file" OFF) # Update source TS file if enabled if (GENERATE_QT_TRANSLATION) get_target_property(QT_SRCS lime-qt SOURCES) get_target_property(QT_INCLUDES lime-qt INCLUDE_DIRECTORIES) - qt_add_lupdate(lime-qt TS_FILES ${CITRA_QT_LANGUAGES}/en.ts + qt_add_lupdate(lime-qt TS_FILES ${LIME3DS_QT_LANGUAGES}/en.ts SOURCES ${QT_SRCS} ${UIS} INCLUDE_DIRECTORIES ${QT_INCLUDES} NO_GLOBAL_TARGET) @@ -224,8 +224,8 @@ if (ENABLE_QT_TRANSLATION) endif() # Find all TS files except en.ts - file(GLOB_RECURSE LANGUAGES_TS ${CITRA_QT_LANGUAGES}/*.ts) - list(REMOVE_ITEM LANGUAGES_TS ${CITRA_QT_LANGUAGES}/en.ts) + file(GLOB_RECURSE LANGUAGES_TS ${LIME3DS_QT_LANGUAGES}/*.ts) + list(REMOVE_ITEM LANGUAGES_TS ${LIME3DS_QT_LANGUAGES}/en.ts) # Compile TS files to QM files qt_add_lrelease(lime-qt TS_FILES ${LANGUAGES_TS} NO_GLOBAL_TARGET QM_FILES_OUTPUT_VARIABLE LANGUAGES_QM) @@ -348,7 +348,7 @@ if(UNIX AND NOT APPLE) install(TARGETS lime-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(lime-qt PRIVATE precompiled_headers.h) endif() diff --git a/src/lime_qt/aboutdialog.ui b/src/lime_qt/aboutdialog.ui index b7446ec82..428633467 100644 --- a/src/lime_qt/aboutdialog.ui +++ b/src/lime_qt/aboutdialog.ui @@ -49,7 +49,7 @@ - + 0 diff --git a/src/lime_qt/configuration/config.cpp b/src/lime_qt/configuration/config.cpp index 547174f0f..9342ce436 100644 --- a/src/lime_qt/configuration/config.cpp +++ b/src/lime_qt/configuration/config.cpp @@ -869,10 +869,10 @@ void Config::ReadWebServiceValues() { ReadSetting(QStringLiteral("web_api_url"), QStringLiteral("https://api.citra-emu.org")) .toString() .toStdString(); - NetSettings::values.citra_username = - ReadSetting(QStringLiteral("citra_username")).toString().toStdString(); - NetSettings::values.citra_token = - ReadSetting(QStringLiteral("citra_token")).toString().toStdString(); + NetSettings::values.lime3ds_username = + ReadSetting(QStringLiteral("lime3ds_username")).toString().toStdString(); + NetSettings::values.lime3ds_token = + ReadSetting(QStringLiteral("lime3ds_token")).toString().toStdString(); qt_config->endGroup(); } @@ -1375,10 +1375,10 @@ void Config::SaveWebServiceValues() { WriteSetting(QStringLiteral("web_api_url"), QString::fromStdString(NetSettings::values.web_api_url), QStringLiteral("https://api.citra-emu.org")); - WriteSetting(QStringLiteral("citra_username"), - QString::fromStdString(NetSettings::values.citra_username)); - WriteSetting(QStringLiteral("citra_token"), - QString::fromStdString(NetSettings::values.citra_token)); + WriteSetting(QStringLiteral("lime3ds_username"), + QString::fromStdString(NetSettings::values.lime3ds_username)); + WriteSetting(QStringLiteral("lime3ds_token"), + QString::fromStdString(NetSettings::values.lime3ds_token)); qt_config->endGroup(); } diff --git a/src/lime_qt/configuration/configure_general.cpp b/src/lime_qt/configuration/configure_general.cpp index 370f05d02..967250833 100644 --- a/src/lime_qt/configuration/configure_general.cpp +++ b/src/lime_qt/configuration/configure_general.cpp @@ -146,8 +146,8 @@ void ConfigureGeneral::SetConfiguration() { void ConfigureGeneral::ResetDefaults() { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), - tr("Are you sure you want to reset your settings and close Citra?"), + this, tr("Lime3DS"), + tr("Are you sure you want to reset your settings and close Lime3DS?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/lime_qt/configuration/configure_motion_touch.cpp b/src/lime_qt/configuration/configure_motion_touch.cpp index 5feca6009..e223442f2 100644 --- a/src/lime_qt/configuration/configure_motion_touch.cpp +++ b/src/lime_qt/configuration/configure_motion_touch.cpp @@ -100,7 +100,7 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent) ui->udp_learn_more->setOpenExternalLinks(true); ui->udp_learn_more->setText( tr("Learn More")); @@ -340,7 +340,7 @@ void ConfigureMotionTouch::OnConfigureTouchFromButton() { bool ConfigureMotionTouch::CanCloseDialog() { if (udp_test_in_progress) { - QMessageBox::warning(this, tr("Citra"), + QMessageBox::warning(this, tr("Lime3DS"), tr("UDP Test or calibration configuration is in progress.
Please " "wait for them to finish.")); return false; diff --git a/src/lime_qt/configuration/configure_per_game.cpp b/src/lime_qt/configuration/configure_per_game.cpp index 11ab562bc..3cd982378 100644 --- a/src/lime_qt/configuration/configure_per_game.cpp +++ b/src/lime_qt/configuration/configure_per_game.cpp @@ -81,7 +81,8 @@ ConfigurePerGame::~ConfigurePerGame() = default; void ConfigurePerGame::ResetDefaults() { const auto config_file_name = title_id == 0 ? filename : fmt::format("{:016X}", title_id); QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), tr("Are you sure you want to reset your settings for this game?"), + this, tr("Lime3DS"), + tr("Are you sure you want to reset your settings for this game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/lime_qt/dumping/dumping_dialog.cpp b/src/lime_qt/dumping/dumping_dialog.cpp index 19de96f5f..c8c1c49ad 100644 --- a/src/lime_qt/dumping/dumping_dialog.cpp +++ b/src/lime_qt/dumping/dumping_dialog.cpp @@ -22,7 +22,7 @@ DumpingDialog::DumpingDialog(QWidget* parent, Core::System& system_) connect(ui->pathExplore, &QToolButton::clicked, this, &DumpingDialog::OnToolButtonClicked); connect(ui->buttonBox, &QDialogButtonBox::accepted, [this] { if (ui->pathLineEdit->text().isEmpty()) { - QMessageBox::critical(this, tr("Citra"), tr("Please specify the output path.")); + QMessageBox::critical(this, tr("Lime3DS"), tr("Please specify the output path.")); return; } ApplyConfiguration(); @@ -82,7 +82,7 @@ void DumpingDialog::Populate() { } if (!missing.isEmpty()) { - QMessageBox::critical(this, tr("Citra"), + QMessageBox::critical(this, tr("Lime3DS"), tr("Could not find any available %1.\nPlease check your FFmpeg " "installation used for compilation.") .arg(missing)); diff --git a/src/lime_qt/game_list.cpp b/src/lime_qt/game_list.cpp index 98456339b..10d03ec58 100644 --- a/src/lime_qt/game_list.cpp +++ b/src/lime_qt/game_list.cpp @@ -734,7 +734,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr #endif connect(uninstall_all, &QAction::triggered, this, [=, this] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), + this, tr("Lime3DS"), tr("Are you sure you want to completely uninstall '%1'?\n\nThis will " "delete the game if installed, as well as any installed updates or DLC.") .arg(name), @@ -757,7 +757,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_game, &QAction::triggered, this, [this, name, media_type, program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), tr("Are you sure you want to uninstall '%1'?").arg(name), + this, tr("Lime3DS"), tr("Are you sure you want to uninstall '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { std::vector> titles; @@ -767,7 +767,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_update, &QAction::triggered, this, [this, name, update_program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), + this, tr("Lime3DS"), tr("Are you sure you want to uninstall the update for '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { @@ -779,7 +779,8 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_dlc, &QAction::triggered, this, [this, name, dlc_program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), tr("Are you sure you want to uninstall all DLC for '%1'?").arg(name), + this, tr("Lime3DS"), + tr("Are you sure you want to uninstall all DLC for '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { std::vector> titles; diff --git a/src/lime_qt/main.cpp b/src/lime_qt/main.cpp index f60a43e09..c22273a0a 100644 --- a/src/lime_qt/main.cpp +++ b/src/lime_qt/main.cpp @@ -78,7 +78,7 @@ #include "lime_qt/util/clickable_label.h" #include "lime_qt/util/graphics_device_info.h" #include "lime_qt/util/util.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include "common/x64/cpu_detect.h" #endif #include "common/settings.h" @@ -222,7 +222,7 @@ GMainWindow::GMainWindow(Core::System& system_) LOG_INFO(Frontend, "Lime3DS Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) const auto& caps = Common::GetCPUCaps(); std::string cpu_string = caps.cpu_string; if (caps.avx || caps.avx2 || caps.avx512) { @@ -259,7 +259,7 @@ GMainWindow::GMainWindow(Core::System& system_) #if defined(_WIN32) if (gl_renderer.startsWith(QStringLiteral("D3D12"))) { // OpenGLOn12 supports but does not yet advertise OpenGL 4.0+ - // We can override the version here to allow Citra to work. + // We can override the version here to allow Lime3DS to work. // TODO: Remove this when OpenGL 4.0+ is advertised. qputenv("MESA_GL_VERSION_OVERRIDE", "4.6"); } @@ -942,7 +942,7 @@ void GMainWindow::ConnectMenuEvents() { connect_menu(ui->action_Dump_Video, &GMainWindow::OnDumpVideo); // Help - connect_menu(ui->action_Open_Citra_Folder, &GMainWindow::OnOpenCitraFolder); + connect_menu(ui->action_Open_Lime3DS_Folder, &GMainWindow::OnOpenLime3DSFolder); connect_menu(ui->action_Open_Log_Folder, []() { QString path = QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::LogDir)); QDesktopServices::openUrl(QUrl::fromLocalFile(path)); @@ -950,7 +950,7 @@ void GMainWindow::ConnectMenuEvents() { connect_menu(ui->action_FAQ, []() { QDesktopServices::openUrl(QUrl(QStringLiteral("https://discord.com/invite/4ZjMpAp3M6"))); }); - connect_menu(ui->action_About, &GMainWindow::OnMenuAboutCitra); + connect_menu(ui->action_About, &GMainWindow::OnMenuAboutLime3DS); #if ENABLE_QT_UPDATER connect_menu(ui->action_Check_For_Updates, &GMainWindow::OnCheckForUpdates); @@ -1147,10 +1147,10 @@ static std::optional HoldWakeLockLinux(u32 window_id = 0) { return {}; } QVariantMap options = {}; - //: TRANSLATORS: This string is shown to the user to explain why Citra needs to prevent the + //: TRANSLATORS: This string is shown to the user to explain why Lime3DS needs to prevent the //: computer from sleeping options.insert(QString::fromLatin1("reason"), - QCoreApplication::translate("GMainWindow", "Citra is running a game")); + QCoreApplication::translate("GMainWindow", "Lime3DS is running a game")); // 0x4: Suspend lock; 0x8: Idle lock QDBusReply reply = xdp.call(QString::fromLatin1("Inhibit"), @@ -1279,7 +1279,7 @@ bool GMainWindow::LoadROM(const QString& filename) { case Core::System::ResultStatus::ErrorLoader_ErrorGbaTitle: QMessageBox::critical(this, tr("Unsupported ROM"), - tr("GBA Virtual Console ROMs are not supported by Citra.")); + tr("GBA Virtual Console ROMs are not supported by Lime3DS.")); break; case Core::System::ResultStatus::ErrorArticDisconnected: @@ -2653,7 +2653,7 @@ void GMainWindow::OnRemoveAmiibo() { ui->action_Remove_Amiibo->setEnabled(false); } -void GMainWindow::OnOpenCitraFolder() { +void GMainWindow::OnOpenLime3DSFolder() { QDesktopServices::openUrl(QUrl::fromLocalFile( QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::UserDir)))); } @@ -2807,8 +2807,9 @@ void GMainWindow::OnDumpVideo() { ); auto result = message_box.exec(); if (result == QMessageBox::Help) { - QDesktopServices::openUrl(QUrl(QStringLiteral( - "https://citra-emu.org/wiki/installing-ffmpeg-for-the-video-dumper/"))); + QDesktopServices::openUrl( + QUrl(QStringLiteral("https://web.archive.org/web/20240301121456/https://" + "citra-emu.org/wiki/installing-ffmpeg-for-the-video-dumper/"))); #ifdef _WIN32 } else if (result == QMessageBox::Open) { OnOpenFFmpeg(); @@ -3178,7 +3179,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det if (result == Core::System::ResultStatus::ErrorSystemFiles) { const QString common_message = tr("%1 is missing. Please dump your " "system archives.
Continuing emulation may result in crashes and bugs."); @@ -3204,11 +3205,12 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det can_continue = false; } else { title = tr("Fatal Error"); - message = - tr("A fatal error occurred. " - "Check " - "the log for details." - "
Continuing emulation may result in crashes and bugs."); + message = tr("A fatal error occurred. " + "Check " + "the log for details." + "
Continuing emulation may result in crashes and bugs."); status_message = tr("Fatal Error encountered"); error_severity_icon = QMessageBox::Icon::Critical; } @@ -3247,7 +3249,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det } } -void GMainWindow::OnMenuAboutCitra() { +void GMainWindow::OnMenuAboutLime3DS() { AboutDialog about{this}; about.exec(); } diff --git a/src/lime_qt/main.h b/src/lime_qt/main.h index ccdf0ce9a..7e3c821ce 100644 --- a/src/lime_qt/main.h +++ b/src/lime_qt/main.h @@ -253,7 +253,7 @@ private slots: void OnConfigure(); void OnLoadAmiibo(); void OnRemoveAmiibo(); - void OnOpenCitraFolder(); + void OnOpenLime3DSFolder(); void OnToggleFilterBar(); void OnDisplayTitleBars(bool); void InitializeHotkeys(); @@ -283,8 +283,8 @@ private slots: void StartVideoDumping(const QString& path); void OnStopVideoDumping(); void OnCoreError(Core::System::ResultStatus, std::string); - /// Called whenever a user selects Help->About Citra - void OnMenuAboutCitra(); + /// Called whenever a user selects Help->About Lime3DS + void OnMenuAboutLime3DS(); #if ENABLE_QT_UPDATER void OnUpdateFound(bool found, bool error); @@ -347,7 +347,7 @@ private: MultiplayerState* multiplayer_state = nullptr; std::unique_ptr config; - // Whether emulation is currently running in Citra. + // Whether emulation is currently running in Lime3DS. bool emulation_running = false; std::unique_ptr emu_thread; // The title of the game currently running diff --git a/src/lime_qt/main.ui b/src/lime_qt/main.ui index cfa6b2e69..638132c67 100644 --- a/src/lime_qt/main.ui +++ b/src/lime_qt/main.ui @@ -85,7 +85,7 @@ - + @@ -588,7 +588,7 @@ Remove - + Open Lime3DS Folder diff --git a/src/lime_qt/movie/movie_play_dialog.cpp b/src/lime_qt/movie/movie_play_dialog.cpp index 2854a1a49..ba34303d1 100644 --- a/src/lime_qt/movie/movie_play_dialog.cpp +++ b/src/lime_qt/movie/movie_play_dialog.cpp @@ -51,7 +51,7 @@ QString MoviePlayDialog::GetGamePath() const { void MoviePlayDialog::OnToolButtonClicked() { const QString path = QFileDialog::getOpenFileName(this, tr("Play Movie"), UISettings::values.movie_playback_path, - tr("Citra TAS Movie (*.ctm)")); + tr("Lime3DS TAS Movie (*.ctm)")); if (path.isEmpty()) { return; } diff --git a/src/lime_qt/movie/movie_record_dialog.cpp b/src/lime_qt/movie/movie_record_dialog.cpp index 594ffa87b..97b5140d8 100644 --- a/src/lime_qt/movie/movie_record_dialog.cpp +++ b/src/lime_qt/movie/movie_record_dialog.cpp @@ -47,7 +47,7 @@ QString MovieRecordDialog::GetAuthor() const { void MovieRecordDialog::OnToolButtonClicked() { const QString path = QFileDialog::getSaveFileName(this, tr("Record Movie"), UISettings::values.movie_record_path, - tr("Citra TAS Movie (*.ctm)")); + tr("Lime3DS TAS Movie (*.ctm)")); if (path.isEmpty()) { return; } diff --git a/src/lime_qt/multiplayer/direct_connect.cpp b/src/lime_qt/multiplayer/direct_connect.cpp index 673fd3980..77fdf2edf 100644 --- a/src/lime_qt/multiplayer/direct_connect.cpp +++ b/src/lime_qt/multiplayer/direct_connect.cpp @@ -32,9 +32,9 @@ DirectConnectWindow::DirectConnectWindow(Core::System& system_, QWidget* parent) ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); - if (ui->nickname->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Citra Web Service user name as nickname by default - ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username)); + if (ui->nickname->text().isEmpty() && !NetSettings::values.lime3ds_username.empty()) { + // Use Lime3DS Web Service user name as nickname by default + ui->nickname->setText(QString::fromStdString(NetSettings::values.lime3ds_username)); } ui->ip->setValidator(validation.GetIP()); ui->ip->setText(UISettings::values.ip); diff --git a/src/lime_qt/multiplayer/host_room.cpp b/src/lime_qt/multiplayer/host_room.cpp index 9d9012ba4..f2086316c 100644 --- a/src/lime_qt/multiplayer/host_room.cpp +++ b/src/lime_qt/multiplayer/host_room.cpp @@ -52,9 +52,9 @@ HostRoomWindow::HostRoomWindow(Core::System& system_, QWidget* parent, QStandard // Restore the settings: ui->username->setText(UISettings::values.room_nickname); - if (ui->username->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Citra Web Service user name as nickname by default - ui->username->setText(QString::fromStdString(NetSettings::values.citra_username)); + if (ui->username->text().isEmpty() && !NetSettings::values.lime3ds_username.empty()) { + // Use Lime3DS Web Service user name as nickname by default + ui->username->setText(QString::fromStdString(NetSettings::values.lime3ds_username)); } ui->room_name->setText(UISettings::values.room_name); ui->port->setText(UISettings::values.room_port); @@ -141,11 +141,11 @@ void HostRoomWindow::Host() { ban_list = UISettings::values.ban_list; } if (auto room = Network::GetRoom().lock()) { - bool created = room->Create(ui->room_name->text().toStdString(), - ui->room_description->toPlainText().toStdString(), "", port, - password, ui->max_player->value(), - NetSettings::values.citra_username, game_name.toStdString(), - game_id, CreateVerifyBackend(is_public), ban_list); + bool created = room->Create( + ui->room_name->text().toStdString(), + ui->room_description->toPlainText().toStdString(), "", port, password, + ui->max_player->value(), NetSettings::values.lime3ds_username, + game_name.toStdString(), game_id, CreateVerifyBackend(is_public), ban_list); if (!created) { NetworkMessage::ErrorManager::ShowError( NetworkMessage::ErrorManager::COULD_NOT_CREATE_ROOM); @@ -163,7 +163,7 @@ void HostRoomWindow::Host() { QMessageBox::warning( this, tr("Error"), tr("Failed to announce the room to the public lobby. In order to host a " - "room publicly, you must have a valid Citra account configured in " + "room publicly, you must have a valid Lime3DS account configured in " "Emulation -> Configure -> Web. If you do not want to publish a room in " "the public lobby, then select Unlisted instead.\nDebug Message: ") + QString::fromStdString(result.result_string), @@ -183,8 +183,8 @@ void HostRoomWindow::Host() { #ifdef ENABLE_WEB_SERVICE if (is_public) { WebService::Client client(NetSettings::values.web_api_url, - NetSettings::values.citra_username, - NetSettings::values.citra_token); + NetSettings::values.lime3ds_username, + NetSettings::values.lime3ds_token); if (auto room = Network::GetRoom().lock()) { token = client.GetExternalJWT(room->GetVerifyUID()).returned_data; } diff --git a/src/lime_qt/multiplayer/lobby.cpp b/src/lime_qt/multiplayer/lobby.cpp index 5fe07b236..c4b017a9f 100644 --- a/src/lime_qt/multiplayer/lobby.cpp +++ b/src/lime_qt/multiplayer/lobby.cpp @@ -56,9 +56,9 @@ Lobby::Lobby(Core::System& system_, QWidget* parent, QStandardItemModel* list, ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); - if (ui->nickname->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Citra Web Service user name as nickname by default - ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username)); + if (ui->nickname->text().isEmpty() && !NetSettings::values.lime3ds_username.empty()) { + // Use Lime3DS Web Service user name as nickname by default + ui->nickname->setText(QString::fromStdString(NetSettings::values.lime3ds_username)); } // UI Buttons @@ -160,11 +160,11 @@ void Lobby::OnJoinRoom(const QModelIndex& source) { QFuture f = QtConcurrent::run([this, nickname, ip, port, password, verify_UID] { std::string token; #ifdef ENABLE_WEB_SERVICE - if (!NetSettings::values.citra_username.empty() && - !NetSettings::values.citra_token.empty()) { + if (!NetSettings::values.lime3ds_username.empty() && + !NetSettings::values.lime3ds_token.empty()) { WebService::Client client(NetSettings::values.web_api_url, - NetSettings::values.citra_username, - NetSettings::values.citra_token); + NetSettings::values.lime3ds_username, + NetSettings::values.lime3ds_token); token = client.GetExternalJWT(verify_UID).returned_data; if (token.empty()) { LOG_ERROR(WebService, "Could not get external JWT, verification may fail"); diff --git a/src/lime_qt/multiplayer/message.cpp b/src/lime_qt/multiplayer/message.cpp index b74256a14..bb43ebd68 100644 --- a/src/lime_qt/multiplayer/message.cpp +++ b/src/lime_qt/multiplayer/message.cpp @@ -30,12 +30,12 @@ const ConnectionError ErrorManager::UNABLE_TO_CONNECT( const ConnectionError ErrorManager::ROOM_IS_FULL( QT_TR_NOOP("Unable to connect to the room because it is already full.")); const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM( - QT_TR_NOOP("Creating a room failed. Please retry. Restarting Citra might be necessary.")); + QT_TR_NOOP("Creating a room failed. Please retry. Restarting Lime3DS might be necessary.")); const ConnectionError ErrorManager::HOST_BANNED( QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you " "or try a different room.")); const ConnectionError ErrorManager::WRONG_VERSION( - QT_TR_NOOP("Version mismatch! Please update to the latest version of Citra. If the problem " + QT_TR_NOOP("Version mismatch! Please update to the latest version of Lime3DS. If the problem " "persists, contact the room host and ask them to update the server.")); const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password.")); const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP( diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 0be2bcc4a..fae7022e0 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -29,6 +29,6 @@ endif() target_link_libraries(network PRIVATE lime_common enet Boost::serialization httplib) -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(network PRIVATE precompiled_headers.h) endif() diff --git a/src/network/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cpp index b3d537757..065b5f16e 100644 --- a/src/network/announce_multiplayer_session.cpp +++ b/src/network/announce_multiplayer_session.cpp @@ -23,8 +23,8 @@ static constexpr std::chrono::seconds announce_time_interval(15); AnnounceMultiplayerSession::AnnounceMultiplayerSession() { #ifdef ENABLE_WEB_SERVICE backend = std::make_unique(NetSettings::values.web_api_url, - NetSettings::values.citra_username, - NetSettings::values.citra_token); + NetSettings::values.lime3ds_username, + NetSettings::values.lime3ds_token); #else backend = std::make_unique(); #endif @@ -156,8 +156,8 @@ void AnnounceMultiplayerSession::UpdateCredentials() { #ifdef ENABLE_WEB_SERVICE backend = std::make_unique(NetSettings::values.web_api_url, - NetSettings::values.citra_username, - NetSettings::values.citra_token); + NetSettings::values.lime3ds_username, + NetSettings::values.lime3ds_token); #endif } diff --git a/src/network/artic_base/artic_base_client.cpp b/src/network/artic_base/artic_base_client.cpp index 69692f029..d5391eae0 100644 --- a/src/network/artic_base/artic_base_client.cpp +++ b/src/network/artic_base/artic_base_client.cpp @@ -274,7 +274,7 @@ bool Client::Connect() { closesocket(main_socket); LOG_ERROR(Network, "Incompatible server version: {}", version_value); SignalCommunicationError("\nIncompatible Artic Base Server version.\nCheck for updates " - "to Artic Base Server or Citra."); + "to Artic Base Server or Lime3DS."); return false; } } else { diff --git a/src/network/network_settings.h b/src/network/network_settings.h index de79c7786..0ff43fcf0 100644 --- a/src/network/network_settings.h +++ b/src/network/network_settings.h @@ -11,8 +11,8 @@ namespace NetSettings { struct Values { // WebService std::string web_api_url; - std::string citra_username; - std::string citra_token; + std::string lime3ds_username; + std::string lime3ds_token; } extern values; } // namespace NetSettings diff --git a/src/network/room.cpp b/src/network/room.cpp index 4623b31d4..97fdfd0f2 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -598,7 +598,7 @@ bool Room::RoomImpl::HasModPermission(const ENetPeer* client) const { if (sending_member == members.end()) { return false; } - if (room_information.enable_citra_mods && + if (room_information.enable_lime3ds_mods && sending_member->user_data.moderator) { // Community moderator return true; @@ -1013,7 +1013,7 @@ bool Room::Create(const std::string& name, const std::string& description, const u32 max_connections, const std::string& host_username, const std::string& preferred_game, u64 preferred_game_id, std::unique_ptr verify_backend, - const Room::BanList& ban_list, bool enable_citra_mods) { + const Room::BanList& ban_list, bool enable_lime3ds_mods) { ENetAddress address; address.host = ENET_HOST_ANY; if (!server_address.empty()) { @@ -1036,7 +1036,7 @@ bool Room::Create(const std::string& name, const std::string& description, room_impl->room_information.preferred_game = preferred_game; room_impl->room_information.preferred_game_id = preferred_game_id; room_impl->room_information.host_username = host_username; - room_impl->room_information.enable_citra_mods = enable_citra_mods; + room_impl->room_information.enable_lime3ds_mods = enable_lime3ds_mods; room_impl->password = password; room_impl->verify_backend = std::move(verify_backend); room_impl->username_ban_list = ban_list.first; diff --git a/src/network/room.h b/src/network/room.h index a67984837..7c643bf54 100644 --- a/src/network/room.h +++ b/src/network/room.h @@ -32,7 +32,7 @@ struct RoomInformation { std::string preferred_game; ///< Game to advertise that you want to play u64 preferred_game_id; ///< Title ID for the advertised game std::string host_username; ///< Forum username of the host - bool enable_citra_mods; ///< Allow Citra Moderators to moderate on this room + bool enable_lime3ds_mods; ///< Allow Lime3DS Moderators to moderate on this room }; struct GameInfo { @@ -148,7 +148,7 @@ public: const std::string& host_username = "", const std::string& preferred_game = "", u64 preferred_game_id = 0, std::unique_ptr verify_backend = nullptr, - const BanList& ban_list = {}, bool enable_citra_mods = false); + const BanList& ban_list = {}, bool enable_lime3ds_mods = false); /** * Sets the verification GUID of the room. diff --git a/src/network/verify_user.h b/src/network/verify_user.h index 01b9877c8..5706a5d1f 100644 --- a/src/network/verify_user.h +++ b/src/network/verify_user.h @@ -13,7 +13,7 @@ struct UserData { std::string username; std::string display_name; std::string avatar_url; - bool moderator = false; ///< Whether the user is a Citra Moderator. + bool moderator = false; ///< Whether the user is a Lime3DS Moderator. }; /** diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 554661f84..a131b7574 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch2 nihstro-headers add_test(NAME tests COMMAND tests) -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(tests PRIVATE precompiled_headers.h) endif() diff --git a/src/tests/core/hle/kernel/hle_ipc.cpp b/src/tests/core/hle/kernel/hle_ipc.cpp index f908e5f2c..46285ffc3 100644 --- a/src/tests/core/hle/kernel/hle_ipc.cpp +++ b/src/tests/core/hle/kernel/hle_ipc.cpp @@ -143,7 +143,7 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel } SECTION("translates StaticBuffer descriptors") { - auto mem = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto mem = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef buffer{mem}; std::fill(buffer.GetPtr(), buffer.GetPtr() + buffer.GetSize(), 0xAB); @@ -167,7 +167,7 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel } SECTION("translates MappedBuffer descriptors") { - auto mem = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto mem = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef buffer{mem}; std::fill(buffer.GetPtr(), buffer.GetPtr() + buffer.GetSize(), 0xCD); @@ -194,11 +194,11 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel } SECTION("translates mixed params") { - auto mem_static = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto mem_static = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef buffer_static{mem_static}; std::fill(buffer_static.GetPtr(), buffer_static.GetPtr() + buffer_static.GetSize(), 0xCE); - auto mem_mapped = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto mem_mapped = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef buffer_mapped{mem_mapped}; std::fill(buffer_mapped.GetPtr(), buffer_mapped.GetPtr() + buffer_mapped.GetSize(), 0xDF); @@ -332,12 +332,12 @@ TEST_CASE("HLERequestContext::WriteToOutgoingCommandBuffer", "[core][kernel]") { } SECTION("translates StaticBuffer descriptors") { - std::vector input_buffer(Memory::CITRA_PAGE_SIZE); + std::vector input_buffer(Memory::LIME3DS_PAGE_SIZE); std::fill(input_buffer.begin(), input_buffer.end(), 0xAB); context.AddStaticBuffer(0, input_buffer); - auto output_mem = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto output_mem = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef output_buffer{output_mem}; VAddr target_address = 0x10000000; @@ -366,10 +366,10 @@ TEST_CASE("HLERequestContext::WriteToOutgoingCommandBuffer", "[core][kernel]") { } SECTION("translates StaticBuffer descriptors") { - std::vector input_buffer(Memory::CITRA_PAGE_SIZE); + std::vector input_buffer(Memory::LIME3DS_PAGE_SIZE); std::fill(input_buffer.begin(), input_buffer.end(), 0xAB); - auto output_mem = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto output_mem = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef output_buffer{output_mem}; VAddr target_address = 0x10000000; diff --git a/src/tests/core/memory/vm_manager.cpp b/src/tests/core/memory/vm_manager.cpp index f58ad2e5b..dd55242fe 100644 --- a/src/tests/core/memory/vm_manager.cpp +++ b/src/tests/core/memory/vm_manager.cpp @@ -11,7 +11,7 @@ #include "core/memory.h" TEST_CASE("Memory Basics", "[kernel][memory]") { - auto mem = std::make_shared(Memory::CITRA_PAGE_SIZE); + auto mem = std::make_shared(Memory::LIME3DS_PAGE_SIZE); MemoryRef block{mem}; Core::Timing timing(1, 100); Core::System system; diff --git a/src/tests/video_core/shader/shader_jit_compiler.cpp b/src/tests/video_core/shader/shader_jit_compiler.cpp index 01698a2e1..32834ea11 100644 --- a/src/tests/video_core/shader/shader_jit_compiler.cpp +++ b/src/tests/video_core/shader/shader_jit_compiler.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "common/arch.h" -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) #include #include @@ -16,9 +16,9 @@ #include "video_core/pica/shader_setup.h" #include "video_core/pica/shader_unit.h" #include "video_core/shader/shader_interpreter.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include "video_core/shader/shader_jit_x64_compiler.h" -#elif CITRA_ARCH(arm64) +#elif LIME3DS_ARCH(arm64) #include "video_core/shader/shader_jit_a64_compiler.h" #endif @@ -702,4 +702,4 @@ TEST_CASE("Source Swizzle", "[video_core][shader][shader_jit]") { Common::Vec4f(iota_vec.y, iota_vec.y, iota_vec.y, iota_vec.y)); } -#endif // CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 7a61f99c3..3007fe524 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -215,6 +215,6 @@ if ("arm64" IN_LIST ARCHITECTURE) target_link_libraries(video_core PUBLIC oaknut) endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(video_core PRIVATE precompiled_headers.h) endif() diff --git a/src/video_core/custom_textures/custom_tex_manager.cpp b/src/video_core/custom_textures/custom_tex_manager.cpp index 2ec3c946b..e8f3e1379 100644 --- a/src/video_core/custom_textures/custom_tex_manager.cpp +++ b/src/video_core/custom_textures/custom_tex_manager.cpp @@ -190,7 +190,7 @@ void CustomTexManager::PrepareDumping(u64 title_id) { } nlohmann::ordered_json json; - json["author"] = "citra"; + json["author"] = "lime3ds"; json["version"] = "1.0.0"; json["description"] = "A graphics pack"; diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index 4f3cc8fb9..ed30cc544 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h @@ -67,7 +67,7 @@ public: context->breakpoint_observers.remove(this); // If we are the last observer to be destroyed, tell the debugger context that - // it is free to continue. In particular, this is required for a proper Citra + // it is free to continue. In particular, this is required for a proper Lime3DS // shutdown, when the emulation thread is waiting at a breakpoint. if (context->breakpoint_observers.empty()) context->Resume(); diff --git a/src/video_core/pica/vertex_loader.cpp b/src/video_core/pica/vertex_loader.cpp index 948ac2817..f36992943 100644 --- a/src/video_core/pica/vertex_loader.cpp +++ b/src/video_core/pica/vertex_loader.cpp @@ -72,7 +72,7 @@ void VertexLoader::LoadVertex(PAddr base_address, u32 index, u32 vertex, Attribu // TODO(yuriks): In this case, no data gets loaded and the vertex // remains with the last value it had. This isn't currently maintained - // as global state, however, and so won't work in Citra yet. + // as global state, however, and so won't work in Lime3DS yet. if (vertex_attribute_elements[i] == 0) { LOG_ERROR(HW_GPU, "Vertex retension unimplemented"); continue; diff --git a/src/video_core/rasterizer_cache/rasterizer_cache.h b/src/video_core/rasterizer_cache/rasterizer_cache.h index 0144cbd61..179097666 100644 --- a/src/video_core/rasterizer_cache/rasterizer_cache.h +++ b/src/video_core/rasterizer_cache/rasterizer_cache.h @@ -1215,8 +1215,9 @@ void RasterizerCache::ClearAll(bool flush) { for (auto& pair : RangeFromInterval(cached_pages, flush_interval)) { const auto interval = pair.first & flush_interval; - const PAddr interval_start_addr = boost::icl::first(interval) << Memory::CITRA_PAGE_BITS; - const PAddr interval_end_addr = boost::icl::last_next(interval) << Memory::CITRA_PAGE_BITS; + const PAddr interval_start_addr = boost::icl::first(interval) << Memory::LIME3DS_PAGE_BITS; + const PAddr interval_end_addr = boost::icl::last_next(interval) + << Memory::LIME3DS_PAGE_BITS; const u32 interval_size = interval_end_addr - interval_start_addr; memory.RasterizerMarkRegionCached(interval_start_addr, interval_size, false); @@ -1371,14 +1372,14 @@ void RasterizerCache::UnregisterSurface(SurfaceId surface_id) { ForEachPage(surface.addr, surface.size, [this, surface_id](u64 page) { const auto page_it = page_table.find(page); if (page_it == page_table.end()) { - ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << CITRA_PAGEBITS); + ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << LIME3DS_PAGEBITS); return; } std::vector& surfaces = page_it.value(); const auto vector_it = std::find(surfaces.begin(), surfaces.end(), surface_id); if (vector_it == surfaces.end()) { ASSERT_MSG(false, "Unregistering unregistered surface in page=0x{:x}", - page << CITRA_PAGEBITS); + page << LIME3DS_PAGEBITS); return; } surfaces.erase(vector_it); @@ -1409,8 +1410,8 @@ void RasterizerCache::UnregisterAll() { template void RasterizerCache::UpdatePagesCachedCount(PAddr addr, u32 size, int delta) { const u32 num_pages = - ((addr + size - 1) >> Memory::CITRA_PAGE_BITS) - (addr >> Memory::CITRA_PAGE_BITS) + 1; - const u32 page_start = addr >> Memory::CITRA_PAGE_BITS; + ((addr + size - 1) >> Memory::LIME3DS_PAGE_BITS) - (addr >> Memory::LIME3DS_PAGE_BITS) + 1; + const u32 page_start = addr >> Memory::LIME3DS_PAGE_BITS; const u32 page_end = page_start + num_pages; // Interval maps will erase segments if count reaches 0, so if delta is negative we have to @@ -1424,8 +1425,9 @@ void RasterizerCache::UpdatePagesCachedCount(PAddr addr, u32 size, int delta) const auto interval = pair.first & pages_interval; const int count = pair.second; - const PAddr interval_start_addr = boost::icl::first(interval) << Memory::CITRA_PAGE_BITS; - const PAddr interval_end_addr = boost::icl::last_next(interval) << Memory::CITRA_PAGE_BITS; + const PAddr interval_start_addr = boost::icl::first(interval) << Memory::LIME3DS_PAGE_BITS; + const PAddr interval_end_addr = boost::icl::last_next(interval) + << Memory::LIME3DS_PAGE_BITS; const u32 interval_size = interval_end_addr - interval_start_addr; if (delta > 0 && count == delta) { diff --git a/src/video_core/rasterizer_cache/rasterizer_cache_base.h b/src/video_core/rasterizer_cache/rasterizer_cache_base.h index afd3625be..9a49d1234 100644 --- a/src/video_core/rasterizer_cache/rasterizer_cache_base.h +++ b/src/video_core/rasterizer_cache/rasterizer_cache_base.h @@ -60,7 +60,7 @@ class RendererBase; template class RasterizerCache { /// Address shift for caching surfaces into a hash table - static constexpr u64 CITRA_PAGEBITS = 18; + static constexpr u64 LIME3DS_PAGEBITS = 18; using Runtime = typename T::Runtime; using Sampler = typename T::Sampler; @@ -141,8 +141,8 @@ private: template void ForEachPage(PAddr addr, std::size_t size, Func&& func) { static constexpr bool RETURNS_BOOL = std::is_same_v, bool>; - const u64 page_end = (addr + size - 1) >> CITRA_PAGEBITS; - for (u64 page = addr >> CITRA_PAGEBITS; page <= page_end; ++page) { + const u64 page_end = (addr + size - 1) >> LIME3DS_PAGEBITS; + for (u64 page = addr >> LIME3DS_PAGEBITS; page <= page_end; ++page) { if constexpr (RETURNS_BOOL) { if (func(page)) { break; diff --git a/src/video_core/renderer_opengl/post_processing_opengl.cpp b/src/video_core/renderer_opengl/post_processing_opengl.cpp index 3f26ee3cb..75e0f82f7 100644 --- a/src/video_core/renderer_opengl/post_processing_opengl.cpp +++ b/src/video_core/renderer_opengl/post_processing_opengl.cpp @@ -19,7 +19,7 @@ namespace OpenGL { // The Dolphin shader header is added here for drop-in compatibility with most // of Dolphin's "glsl" shaders, which use hlsl types, hence the #define's below // It's fairly complete, but the features it's missing are: -// The font texture for the ascii shader (Citra doesn't have an overlay font) +// The font texture for the ascii shader (Lime3DS doesn't have an overlay font) // GetTime (not used in any shader provided by Dolphin) // GetOption* (used in only one shader provided by Dolphin; would require more // configuration/frontend work) diff --git a/src/video_core/renderer_opengl/post_processing_opengl.h b/src/video_core/renderer_opengl/post_processing_opengl.h index 3e9ea3e45..6a6ceb864 100644 --- a/src/video_core/renderer_opengl/post_processing_opengl.h +++ b/src/video_core/renderer_opengl/post_processing_opengl.h @@ -11,7 +11,7 @@ namespace OpenGL { // Returns a vector of the names of the shaders available in the -// "shaders" directory in citra's data directory +// "shaders" directory in lime3ds's data directory std::vector GetPostProcessingShaderList(bool anaglyph); // Returns the shader code for the shader named "shader_name" diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index b30e1f75e..309c72fdb 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -272,7 +272,7 @@ void RendererOpenGL::LoadFBToScreenInfo(const Pica::FramebufferConfig& framebuff // Update existing texture // TODO: Test what happens on hardware when you change the framebuffer dimensions so that // they differ from the LCD resolution. - // TODO: Applications could theoretically crash Citra here by specifying too large + // TODO: Applications could theoretically crash Lime3DS here by specifying too large // framebuffer sizes. We should make sure that this cannot happen. glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, framebuffer.width, framebuffer.height, screen_info.texture.gl_format, screen_info.texture.gl_type, diff --git a/src/video_core/renderer_vulkan/vk_platform.cpp b/src/video_core/renderer_vulkan/vk_platform.cpp index fa8f76199..937eaa0db 100644 --- a/src/video_core/renderer_vulkan/vk_platform.cpp +++ b/src/video_core/renderer_vulkan/vk_platform.cpp @@ -305,9 +305,9 @@ vk::UniqueInstance CreateInstance(const Common::DynamicLibrary& library, const auto extensions = GetInstanceExtensions(window_type, enable_validation); const vk::ApplicationInfo application_info = { - .pApplicationName = "Citra", + .pApplicationName = "Lime3DS", .applicationVersion = VK_MAKE_VERSION(1, 0, 0), - .pEngineName = "Citra Vulkan", + .pEngineName = "Lime3DS Vulkan", .engineVersion = VK_MAKE_VERSION(1, 0, 0), .apiVersion = TargetVulkanApiVersion, }; diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 180ca7755..603077d00 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -4,7 +4,7 @@ #include "common/arch.h" #include "video_core/shader/shader_interpreter.h" -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) #include "video_core/shader/shader_jit.h" #endif #include "video_core/shader/shader.h" @@ -12,7 +12,7 @@ namespace Pica { std::unique_ptr CreateEngine(bool use_jit) { -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) if (use_jit) { return std::make_unique(); } diff --git a/src/video_core/shader/shader_jit.cpp b/src/video_core/shader/shader_jit.cpp index 644586226..eb2e011f0 100644 --- a/src/video_core/shader/shader_jit.cpp +++ b/src/video_core/shader/shader_jit.cpp @@ -3,17 +3,17 @@ // Refer to the license.txt file included. #include "common/arch.h" -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) #include "common/assert.h" #include "common/hash.h" #include "common/microprofile.h" #include "video_core/shader/shader.h" #include "video_core/shader/shader_jit.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include "video_core/shader/shader_jit_a64_compiler.h" #endif -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include "video_core/shader/shader_jit_x64_compiler.h" #endif @@ -54,4 +54,4 @@ void JitEngine::Run(const ShaderSetup& setup, ShaderUnit& state) const { } // namespace Pica::Shader -#endif // CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) diff --git a/src/video_core/shader/shader_jit.h b/src/video_core/shader/shader_jit.h index 2f3e77b02..d15bfa898 100644 --- a/src/video_core/shader/shader_jit.h +++ b/src/video_core/shader/shader_jit.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#if LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) #include #include @@ -30,4 +30,4 @@ private: } // namespace Pica::Shader -#endif // CITRA_ARCH(x86_64) || CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(x86_64) || LIME3DS_ARCH(arm64) diff --git a/src/video_core/shader/shader_jit_a64_compiler.cpp b/src/video_core/shader/shader_jit_a64_compiler.cpp index 78afda84e..448489854 100644 --- a/src/video_core/shader/shader_jit_a64_compiler.cpp +++ b/src/video_core/shader/shader_jit_a64_compiler.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include #include @@ -1190,4 +1190,4 @@ Label JitShader::CompilePrelude_Exp2() { } // namespace Pica::Shader -#endif // CITRA_ARCH(arm64) +#endif // LIME3DS_ARCH(arm64) diff --git a/src/video_core/shader/shader_jit_a64_compiler.h b/src/video_core/shader/shader_jit_a64_compiler.h index bfdbb558d..7a1fc5447 100644 --- a/src/video_core/shader/shader_jit_a64_compiler.h +++ b/src/video_core/shader/shader_jit_a64_compiler.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(arm64) +#if LIME3DS_ARCH(arm64) #include #include diff --git a/src/video_core/shader/shader_jit_x64_compiler.cpp b/src/video_core/shader/shader_jit_x64_compiler.cpp index f04492eeb..69bddd01a 100644 --- a/src/video_core/shader/shader_jit_x64_compiler.cpp +++ b/src/video_core/shader/shader_jit_x64_compiler.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "common/arch.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include #include @@ -1260,4 +1260,4 @@ Xbyak::Label JitShader::CompilePrelude_Exp2() { } // namespace Pica::Shader -#endif // CITRA_ARCH(x86_64) +#endif // LIME3DS_ARCH(x86_64) diff --git a/src/video_core/shader/shader_jit_x64_compiler.h b/src/video_core/shader/shader_jit_x64_compiler.h index 911183296..ba4cdad87 100644 --- a/src/video_core/shader/shader_jit_x64_compiler.h +++ b/src/video_core/shader/shader_jit_x64_compiler.h @@ -5,7 +5,7 @@ #pragma once #include "common/arch.h" -#if CITRA_ARCH(x86_64) +#if LIME3DS_ARCH(x86_64) #include #include diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt index 0d3fbfe7e..60ee8bcbc 100644 --- a/src/web_service/CMakeLists.txt +++ b/src/web_service/CMakeLists.txt @@ -21,6 +21,6 @@ if(WIN32) target_link_libraries(web_service PRIVATE crypt32) endif() -if (CITRA_USE_PRECOMPILED_HEADERS) +if (LIME3DS_USE_PRECOMPILED_HEADERS) target_precompile_headers(web_service PRIVATE precompiled_headers.h) endif() diff --git a/src/web_service/announce_room_json.h b/src/web_service/announce_room_json.h index b87af60eb..b12ed60e3 100644 --- a/src/web_service/announce_room_json.h +++ b/src/web_service/announce_room_json.h @@ -13,7 +13,7 @@ namespace WebService { /** * Implementation of AnnounceMultiplayerRoom::Backend that (de)serializes room information into/from - * JSON, and submits/gets it to/from the Citra web service + * JSON, and submits/gets it to/from the Lime3DS web service */ class RoomJson : public AnnounceMultiplayerRoom::Backend { public: diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h index f2cb19840..e6306d0c1 100644 --- a/src/web_service/telemetry_json.h +++ b/src/web_service/telemetry_json.h @@ -13,7 +13,7 @@ namespace WebService { /** * Implementation of VisitorInterface that serialized telemetry into JSON, and submits it to the - * Citra web service + * Lime3DS web service */ class TelemetryJson : public Common::Telemetry::VisitorInterface { public: diff --git a/src/web_service/verify_login.h b/src/web_service/verify_login.h index 5dcc006dc..35fa88170 100644 --- a/src/web_service/verify_login.h +++ b/src/web_service/verify_login.h @@ -11,8 +11,8 @@ namespace WebService { /** * Checks if username and token is valid * @param host the web API URL - * @param username Citra username to use for authentication. - * @param token Citra token to use for authentication. + * @param username Lime3DS username to use for authentication. + * @param token Lime3DS token to use for authentication. * @returns a bool indicating whether the verification succeeded */ bool VerifyLogin(const std::string& host, const std::string& username, const std::string& token); diff --git a/src/web_service/verify_user_jwt.cpp b/src/web_service/verify_user_jwt.cpp index 27e08db9e..5095096b3 100644 --- a/src/web_service/verify_user_jwt.cpp +++ b/src/web_service/verify_user_jwt.cpp @@ -33,7 +33,7 @@ Network::VerifyUser::UserData VerifyUserJWT::LoadUserData(const std::string& ver using namespace jwt::params; std::error_code error; auto decoded = - jwt::decode(token, algorithms({"rs256"}), error, secret(pub_key), issuer("citra-core"), + jwt::decode(token, algorithms({"rs256"}), error, secret(pub_key), issuer("lime3ds-core"), aud(audience), validate_iat(true), validate_jti(true)); if (error) { LOG_INFO(WebService, "Verification failed: category={}, code={}, message={}",