From 2ccb264a8695200c2b06061c9fc01c594cb102e2 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Mon, 21 Jul 2025 01:59:46 +0300 Subject: [PATCH 01/27] HLE DSP: Implement partial embedded buffer updates (#782) --- include/audio/hle_core.hpp | 4 +++- src/core/audio/hle_core.cpp | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/audio/hle_core.hpp b/include/audio/hle_core.hpp index d374e304..f04ed6c2 100644 --- a/include/audio/hle_core.hpp +++ b/include/audio/hle_core.hpp @@ -69,7 +69,9 @@ namespace Audio { // In order to save up on CPU time. uint enabledMixStages = 0; - u32 samplePosition; // Sample number into the current audio buffer + u32 samplePosition; // Sample number into the current audio buffer + u32 currentBufferPaddr; // Physical address of current audio buffer + float rateMultiplier; u16 syncCount; u16 currentBufferID; diff --git a/src/core/audio/hle_core.cpp b/src/core/audio/hle_core.cpp index 97a6211e..059318c8 100644 --- a/src/core/audio/hle_core.cpp +++ b/src/core/audio/hle_core.cpp @@ -396,7 +396,28 @@ namespace Audio { if (config.partialEmbeddedBufferDirty) { config.partialEmbeddedBufferDirty = 0; - printf("Partial embedded buffer dirty for voice %d\n", source.index); + + const u8* data = getPointerPhys(source.currentBufferPaddr & ~0x3); + + if (data != nullptr) { + switch (source.sampleFormat) { + case SampleFormat::PCM8: source.currentSamples = decodePCM8(data, config.length, source); break; + case SampleFormat::PCM16: source.currentSamples = decodePCM16(data, config.length, source); break; + case SampleFormat::ADPCM: source.currentSamples = decodeADPCM(data, config.length, source); break; + + default: + Helpers::warn("Invalid DSP sample format"); + source.currentSamples = {}; + break; + } + + // We're skipping the first samplePosition samples, so remove them from the buffer so as not to consume them later + if (source.samplePosition > 0) { + auto start = source.currentSamples.begin(); + auto end = std::next(start, source.samplePosition); + source.currentSamples.erase(start, end); + } + } } if (config.bufferQueueDirty) { @@ -478,6 +499,7 @@ namespace Audio { return; } + source.currentBufferPaddr = buffer.paddr; source.currentBufferID = buffer.bufferID; source.previousBufferID = 0; // For looping buffers, this is only set for the first time we play it. Loops do not set the dirty bit. @@ -766,6 +788,7 @@ namespace Audio { interpolationMode = InterpolationMode::Linear; samplePosition = 0; + currentBufferPaddr = 0; previousBufferID = 0; currentBufferID = 0; syncCount = 0; From 1e7e41187d3bffa7f4778a80709071ed2a7895e6 Mon Sep 17 00:00:00 2001 From: sylvieee-iot Date: Mon, 21 Jul 2025 03:13:53 +0300 Subject: [PATCH 02/27] Very important work (#783) --- src/core/screen_layout.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/screen_layout.cpp b/src/core/screen_layout.cpp index 93407986..90dc2dd3 100644 --- a/src/core/screen_layout.cpp +++ b/src/core/screen_layout.cpp @@ -147,4 +147,3 @@ const char* ScreenLayout::layoutToString(Layout layout) { default: return "invalid"; } } - \ No newline at end of file From 74ee07bec951f439906006b103846cf13e3d5006 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 02:21:33 +0300 Subject: [PATCH 03/27] Tests: Fix shader test compilation on MacOS (#784) --- tests/shader.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/shader.cpp b/tests/shader.cpp index f5e70d87..12929c55 100644 --- a/tests/shader.cpp +++ b/tests/shader.cpp @@ -1,3 +1,4 @@ +#include #include #include @@ -106,7 +107,7 @@ namespace Catch { template <> struct StringMaker> { static std::string convert(std::array value) { - return std::format("({}, {}, {}, {})", value[0].toFloat32(), value[1].toFloat32(), value[2].toFloat32(), value[3].toFloat32()); + return fmt::format("({}, {}, {}, {})", value[0].toFloat32(), value[1].toFloat32(), value[2].toFloat32(), value[3].toFloat32()); } }; } // namespace Catch @@ -292,8 +293,8 @@ SHADER_TEST_CASE("FLR", "[shader][vertex]") { SHADER_TEST_CASE("Uniform Read", "[shader][vertex][uniform]") { const auto constant0 = nihstro::SourceRegister::MakeFloat(0); auto shader = TestType::assembleTest({ - {nihstro::OpCode::Id::MOVA, nihstro::DestRegister{}, "x", input0, "x", nihstro::SourceRegister{}, "", nihstro::InlineAsm::RelativeAddress::A1 - }, + {nihstro::OpCode::Id::MOVA, nihstro::DestRegister{}, "x", input0, "x", nihstro::SourceRegister{}, "", + nihstro::InlineAsm::RelativeAddress::A1}, {nihstro::OpCode::Id::MOV, output0, "xyzw", constant0, "xyzw", nihstro::SourceRegister{}, "", nihstro::InlineAsm::RelativeAddress::A1}, {nihstro::OpCode::Id::END}, }); @@ -322,8 +323,8 @@ SHADER_TEST_CASE("Address Register Offset", "[video_core][shader][shader_jit]") const auto constant40 = nihstro::SourceRegister::MakeFloat(40); auto shader = TestType::assembleTest({ // mova a0.x, sh_input.x - {nihstro::OpCode::Id::MOVA, nihstro::DestRegister{}, "x", input0, "x", nihstro::SourceRegister{}, "", nihstro::InlineAsm::RelativeAddress::A1 - }, + {nihstro::OpCode::Id::MOVA, nihstro::DestRegister{}, "x", input0, "x", nihstro::SourceRegister{}, "", + nihstro::InlineAsm::RelativeAddress::A1}, // mov sh_output.xyzw, c40[a0.x].xyzw {nihstro::OpCode::Id::MOV, output0, "xyzw", constant40, "xyzw", nihstro::SourceRegister{}, "", nihstro::InlineAsm::RelativeAddress::A1}, {nihstro::OpCode::Id::END}, From 3c473a5fce36a75a31d919112e944e55f350c6df Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 02:55:27 +0300 Subject: [PATCH 04/27] Shader interpreter: Fix out-of-bounds float uniform edge cases (#786) --- src/core/PICA/shader_interpreter.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/core/PICA/shader_interpreter.cpp b/src/core/PICA/shader_interpreter.cpp index a85c7464..9be382b3 100644 --- a/src/core/PICA/shader_interpreter.cpp +++ b/src/core/PICA/shader_interpreter.cpp @@ -124,16 +124,24 @@ u8 PICAShader::getIndexedSource(u32 source, u32 index) { switch (index) { // No offset applied case 0: [[likely]] return u8(source); - // Address register + + // An address register (if index == 1 or 2) or the loop counter (if index == 3) is used as the offset + // There's several edge cases to handle, which have been verified with our shader tests and on a real 3DS case 1: - case 2: { - const s32 offset = addrRegister[index - 1]; + case 2: + case 3: { + s32 offset = (index == 3) ? s32(loopCounter) : addrRegister[index - 1]; if (offset < -128 || offset > 127) [[unlikely]] { - return u8(source); + offset = 0; } - return u8(source + offset); + + // Subtract 0x20 to get the index of the float uniform. Add the offset to it, then mask the sum with 0x7F like the PICA does + // After that, add 0x20 again to undo the initial subtraction + u8 floatUniformIndex = u8(((source - 0x20) + offset) & 0x7F); + floatUniformIndex += 0x20; + + return floatUniformIndex; } - case 3: return u8(source + loopCounter); } Helpers::panic("Reached unreachable path in PICAShader::getIndexedSource"); From 97b2557391d42a41275cc7867293b18c2780ba28 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 03:45:50 +0300 Subject: [PATCH 05/27] Enable audio by default on all frontends --- include/config.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/config.hpp b/include/config.hpp index b890e251..7030a8e3 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -49,12 +49,7 @@ struct EmulatorConfig { static constexpr bool ubershaderDefault = true; #endif static constexpr bool accelerateShadersDefault = true; - -#if defined(__LIBRETRO__) static constexpr bool audioEnabledDefault = true; -#else - static constexpr bool audioEnabledDefault = false; -#endif // We default to OpenGL on all platforms other than iOS #if defined(PANDA3DS_IOS) From b8cbfcca8919be6f78a54f4f3c2f236e582bdd5c Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 03:54:05 +0300 Subject: [PATCH 06/27] GPU: Fix VertexShaderOutputMask in non-accelerated draws (#787) --- src/core/PICA/gpu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/PICA/gpu.cpp b/src/core/PICA/gpu.cpp index f5d26784..e38f4416 100644 --- a/src/core/PICA/gpu.cpp +++ b/src/core/PICA/gpu.cpp @@ -138,7 +138,7 @@ void GPU::drawArrays(bool indexed) { if (config.accelerateShaders) { // If we are potentially going to use hw shaders, gather necessary to do vertex fetch, index buffering, etc on the GPU - // This includes parsing which vertices to upload, getting pointers to the index buffer data & vertex data, and so on + // This includes parsing which vertices to upload, getting pointers to the index buffer data & vertex data, and so on getAcceleratedDrawInfo(accel, indexed); } @@ -182,6 +182,7 @@ void GPU::drawArrays() { // We can have up to 16 attributes, each one consisting of 4 floats constexpr u32 maxAttrSizeInFloats = 16 * 4; + setVsOutputMask(regs[PICA::InternalRegs::VertexShaderOutputMask]); // Base address for vertex attributes // The vertex base is always on a quadword boundary because the PICA does weird alignment shit any time possible From 5beb9d8b17b33f9aab2cc0febec12ec4582b77e5 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 05:21:42 +0300 Subject: [PATCH 07/27] MacOS: Make app icons round (#788) --- .github/mac-bundle-qt.sh | 30 ++++++++++++++++++------------ .github/mac-bundle.sh | 30 ++++++++++++++++++------------ 2 files changed, 36 insertions(+), 24 deletions(-) mode change 100644 => 100755 .github/mac-bundle-qt.sh diff --git a/.github/mac-bundle-qt.sh b/.github/mac-bundle-qt.sh old mode 100644 new mode 100755 index f8083936..e6b3e8ee --- a/.github/mac-bundle-qt.sh +++ b/.github/mac-bundle-qt.sh @@ -2,26 +2,32 @@ # For Plist buddy PATH="$PATH:/usr/libexec" - # Construct the app iconset. mkdir alber.iconset -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png + +# Create a mask for rounding our icon. We don't want it to be square, as most MacOS icons are rounded +convert -size 1024x1024 xc:none -draw "roundrectangle 0,0,1024,1024,220,220" rounded_mask.png +convert docs/img/mac_icon.ico -alpha on -background none -resize 1024x1024 PNG32:temp.png +# Apply the mask to our icon +convert temp.png rounded_mask.png -compose DstIn -composite temp.png + +convert temp.png -resize 16x16 alber.iconset/icon_16x16.png +convert temp.png -resize 32x32 alber.iconset/icon_16x16@2x.png +convert temp.png -resize 32x32 alber.iconset/icon_32x32.png +convert temp.png -resize 64x64 alber.iconset/icon_32x32@2x.png +convert temp.png -resize 128x128 alber.iconset/icon_128x128.png +convert temp.png -resize 256x256 alber.iconset/icon_128x128@2x.png +convert temp.png -resize 256x256 alber.iconset/icon_256x256.png +convert temp.png -resize 512x512 alber.iconset/icon_256x256@2x.png +convert temp.png -resize 512x512 alber.iconset/icon_512x512.png +convert temp.png -resize 1024x1024 alber.iconset/icon_512x512@2x.png iconutil --convert icns alber.iconset +rm rounded_mask.png temp.png # Set up the .app directory mkdir -p Alber.app/Contents/MacOS/Libraries mkdir Alber.app/Contents/Resources - # Copy binary into App cp ./build/Alber Alber.app/Contents/MacOS/Alber chmod a+x Alber.app/Contents/Macos/Alber diff --git a/.github/mac-bundle.sh b/.github/mac-bundle.sh index 3349d6d3..e5f0e82c 100755 --- a/.github/mac-bundle.sh +++ b/.github/mac-bundle.sh @@ -2,26 +2,32 @@ # For Plist buddy PATH="$PATH:/usr/libexec" - # Construct the app iconset. mkdir alber.iconset -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png -convert docs/img/mac_icon.ico -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png + +# Create a mask for rounding our icon. We don't want it to be square, as most MacOS icons are rounded +convert -size 1024x1024 xc:none -draw "roundrectangle 0,0,1024,1024,220,220" rounded_mask.png +convert docs/img/mac_icon.ico -alpha on -background none -resize 1024x1024 PNG32:temp.png +# Apply the mask to our icon +convert temp.png rounded_mask.png -compose DstIn -composite temp.png + +convert temp.png -resize 16x16 alber.iconset/icon_16x16.png +convert temp.png -resize 32x32 alber.iconset/icon_16x16@2x.png +convert temp.png -resize 32x32 alber.iconset/icon_32x32.png +convert temp.png -resize 64x64 alber.iconset/icon_32x32@2x.png +convert temp.png -resize 128x128 alber.iconset/icon_128x128.png +convert temp.png -resize 256x256 alber.iconset/icon_128x128@2x.png +convert temp.png -resize 256x256 alber.iconset/icon_256x256.png +convert temp.png -resize 512x512 alber.iconset/icon_256x256@2x.png +convert temp.png -resize 512x512 alber.iconset/icon_512x512.png +convert temp.png -resize 1024x1024 alber.iconset/icon_512x512@2x.png iconutil --convert icns alber.iconset +rm rounded_mask.png temp.png # Set up the .app directory mkdir -p Alber.app/Contents/MacOS/Libraries mkdir Alber.app/Contents/Resources - # Copy binary into App cp ./build/Alber Alber.app/Contents/MacOS/Alber chmod a+x Alber.app/Contents/Macos/Alber From b286306648ce09ae1bb00a45b18c4d4ea58dc0db Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 05:26:44 +0300 Subject: [PATCH 08/27] Fix MacOS icon oopsie (#789) --- .github/mac-bundle-qt.sh | 26 ++++++++++++++++---------- .github/mac-bundle.sh | 26 ++++++++++++++++---------- alber.iconset/icon_64x64.png | Bin 0 -> 10897 bytes alber.iconset/icon_64x64@2x.png | Bin 0 -> 35029 bytes 4 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 alber.iconset/icon_64x64.png create mode 100644 alber.iconset/icon_64x64@2x.png diff --git a/.github/mac-bundle-qt.sh b/.github/mac-bundle-qt.sh index e6b3e8ee..aed59d60 100755 --- a/.github/mac-bundle-qt.sh +++ b/.github/mac-bundle-qt.sh @@ -11,16 +11,22 @@ convert docs/img/mac_icon.ico -alpha on -background none -resize 1024x1024 PNG32 # Apply the mask to our icon convert temp.png rounded_mask.png -compose DstIn -composite temp.png -convert temp.png -resize 16x16 alber.iconset/icon_16x16.png -convert temp.png -resize 32x32 alber.iconset/icon_16x16@2x.png -convert temp.png -resize 32x32 alber.iconset/icon_32x32.png -convert temp.png -resize 64x64 alber.iconset/icon_32x32@2x.png -convert temp.png -resize 128x128 alber.iconset/icon_128x128.png -convert temp.png -resize 256x256 alber.iconset/icon_128x128@2x.png -convert temp.png -resize 256x256 alber.iconset/icon_256x256.png -convert temp.png -resize 512x512 alber.iconset/icon_256x256@2x.png -convert temp.png -resize 512x512 alber.iconset/icon_512x512.png -convert temp.png -resize 1024x1024 alber.iconset/icon_512x512@2x.png +# Normal icons +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 64x64 alber.iconset/icon_64x64.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png + +# High DPI icons +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 128x128 alber.iconset/icon_64x64@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png + iconutil --convert icns alber.iconset rm rounded_mask.png temp.png diff --git a/.github/mac-bundle.sh b/.github/mac-bundle.sh index e5f0e82c..274f1115 100755 --- a/.github/mac-bundle.sh +++ b/.github/mac-bundle.sh @@ -11,16 +11,22 @@ convert docs/img/mac_icon.ico -alpha on -background none -resize 1024x1024 PNG32 # Apply the mask to our icon convert temp.png rounded_mask.png -compose DstIn -composite temp.png -convert temp.png -resize 16x16 alber.iconset/icon_16x16.png -convert temp.png -resize 32x32 alber.iconset/icon_16x16@2x.png -convert temp.png -resize 32x32 alber.iconset/icon_32x32.png -convert temp.png -resize 64x64 alber.iconset/icon_32x32@2x.png -convert temp.png -resize 128x128 alber.iconset/icon_128x128.png -convert temp.png -resize 256x256 alber.iconset/icon_128x128@2x.png -convert temp.png -resize 256x256 alber.iconset/icon_256x256.png -convert temp.png -resize 512x512 alber.iconset/icon_256x256@2x.png -convert temp.png -resize 512x512 alber.iconset/icon_512x512.png -convert temp.png -resize 1024x1024 alber.iconset/icon_512x512@2x.png +# Normal icons +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 16x16 alber.iconset/icon_16x16.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 32x32 alber.iconset/icon_32x32.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 64x64 alber.iconset/icon_64x64.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 128x128 alber.iconset/icon_128x128.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 256x256 alber.iconset/icon_256x256.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 72 -resize 512x512 alber.iconset/icon_512x512.png + +# High DPI icons +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 32x32 alber.iconset/icon_16x16@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 64x64 alber.iconset/icon_32x32@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 128x128 alber.iconset/icon_64x64@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 256x256 alber.iconset/icon_128x128@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 512x512 alber.iconset/icon_256x256@2x.png +convert temp.png -alpha on -background none -units PixelsPerInch -density 144 -resize 1024x1024 alber.iconset/icon_512x512@2x.png + iconutil --convert icns alber.iconset rm rounded_mask.png temp.png diff --git a/alber.iconset/icon_64x64.png b/alber.iconset/icon_64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..c5703c8c4210ab98f7732f4ff6843a97a1c77b1d GIT binary patch literal 10897 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 literal 0 HcmV?d00001 diff --git a/alber.iconset/icon_64x64@2x.png b/alber.iconset/icon_64x64@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..29aa4a7d9c2c036108754fad4db752057b18184d GIT binary patch literal 35029 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 literal 0 HcmV?d00001 From 95231514e2c6875ce00b990abae3fb90e49184f7 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 05:31:45 +0300 Subject: [PATCH 09/27] Remove iconset files --- alber.iconset/icon_64x64.png | Bin 10897 -> 0 bytes alber.iconset/icon_64x64@2x.png | Bin 35029 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 alber.iconset/icon_64x64.png delete mode 100644 alber.iconset/icon_64x64@2x.png diff --git a/alber.iconset/icon_64x64.png b/alber.iconset/icon_64x64.png deleted file mode 100644 index c5703c8c4210ab98f7732f4ff6843a97a1c77b1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10897 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 diff --git a/alber.iconset/icon_64x64@2x.png b/alber.iconset/icon_64x64@2x.png deleted file mode 100644 index 29aa4a7d9c2c036108754fad4db752057b18184d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35029 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 From 89426db797c01cbf4d0f57191a1a4f1deda958ed Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 13:54:07 +0300 Subject: [PATCH 10/27] Tests: Cleanup (#790) --- tests/DetectEmulator/source/main.c | 134 ++++++++--------- tests/HelloWorldSVC/source/main.c | 3 +- tests/ImmediateModeTriangles/source/main.c | 140 +++++++++--------- tests/PICA_LITP/source/main.c | 159 ++++++++++----------- tests/SimplerTri/source/main.c | 136 +++++++++--------- 5 files changed, 285 insertions(+), 287 deletions(-) diff --git a/tests/DetectEmulator/source/main.c b/tests/DetectEmulator/source/main.c index a66edd69..6e1e644d 100644 --- a/tests/DetectEmulator/source/main.c +++ b/tests/DetectEmulator/source/main.c @@ -6,16 +6,16 @@ #define CLEAR_COLOR 0x68B0D8FF #define DISPLAY_TRANSFER_FLAGS \ - (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \ - GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \ - GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) + (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \ + GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \ + GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) typedef struct { float x, y, z; } vertex; static const vertex vertex_list[] = { - { 200.0f, 200.0f, 0.5f }, - { 100.0f, 40.0f, 0.5f }, - { 300.0f, 40.0f, 0.5f }, + { 200.0f, 200.0f, 0.5f }, + { 100.0f, 40.0f, 0.5f }, + { 300.0f, 40.0f, 0.5f }, }; typedef enum { @@ -69,22 +69,22 @@ static C3D_Mtx projection; static void* vbo_data; static void sceneInit(void) { - // Load the vertex shader, create a shader program and bind it - vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); - shaderProgramInit(&program); - shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); - C3D_BindProgram(&program); + // Load the vertex shader, create a shader program and bind it + vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); + shaderProgramInit(&program); + shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); + C3D_BindProgram(&program); - // Get the location of the uniforms - uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); + // Get the location of the uniforms + uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); - // Configure attributes for use with the vertex shader - C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); - AttrInfo_Init(attrInfo); - AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position - AttrInfo_AddFixed(attrInfo, 1); // v1=color + // Configure attributes for use with the vertex shader + C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); + AttrInfo_Init(attrInfo); + AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position + AttrInfo_AddFixed(attrInfo, 1); // v1=color - // Set the fixed attribute (color) to a colour depending on the emulator + // Set the fixed attribute (color) to a colour depending on the emulator Platform platform = getPlatform(); switch (platform) { @@ -104,78 +104,78 @@ static void sceneInit(void) { break; } - // Compute the projection matrix - Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); + // Compute the projection matrix + Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); - // Create the VBO (vertex buffer object) - vbo_data = linearAlloc(sizeof(vertex_list)); - memcpy(vbo_data, vertex_list, sizeof(vertex_list)); + // Create the VBO (vertex buffer object) + vbo_data = linearAlloc(sizeof(vertex_list)); + memcpy(vbo_data, vertex_list, sizeof(vertex_list)); - // Configure buffers - C3D_BufInfo* bufInfo = C3D_GetBufInfo(); - BufInfo_Init(bufInfo); - BufInfo_Add(bufInfo, vbo_data, sizeof(vertex), 1, 0x0); + // Configure buffers + C3D_BufInfo* bufInfo = C3D_GetBufInfo(); + BufInfo_Init(bufInfo); + BufInfo_Add(bufInfo, vbo_data, sizeof(vertex), 1, 0x0); - // Configure the first fragment shading substage to just pass through the vertex color - // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight - C3D_TexEnv* env = C3D_GetTexEnv(0); - C3D_TexEnvInit(env); - C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); - C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); + // Configure the first fragment shading substage to just pass through the vertex color + // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight + C3D_TexEnv* env = C3D_GetTexEnv(0); + C3D_TexEnvInit(env); + C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); + C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); } static void sceneRender(void) { - // Update the uniforms - C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); + // Update the uniforms + C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); - // Draw the VBO - C3D_DrawArrays(GPU_TRIANGLES, 0, vertex_list_count); + // Draw the VBO + C3D_DrawArrays(GPU_TRIANGLES, 0, vertex_list_count); } static void sceneExit(void) { - // Free the VBO - linearFree(vbo_data); + // Free the VBO + linearFree(vbo_data); - // Free the shader program - shaderProgramFree(&program); - DVLB_Free(vshader_dvlb); + // Free the shader program + shaderProgramFree(&program); + DVLB_Free(vshader_dvlb); } int main() { emuPrint("Entering main\n"); - // Initialize graphics - gfxInitDefault(); - C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); + // Initialize graphics + gfxInitDefault(); + C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); - // Initialize the render target - C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); - C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); + // Initialize the render target + C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); + C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); - // Initialize the scene - sceneInit(); + // Initialize the scene + sceneInit(); - // Main loop - while (true) - { - // Render the scene + // Main loop + while (true) + { + // Render the scene emuPrint("Entering C3D_FrameBegin"); - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); emuPrint("Clearing render target"); - C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); + C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); emuPrint("Calling C3D_FrameDrawOn"); - C3D_FrameDrawOn(target); + C3D_FrameDrawOn(target); emuPrint("Calling sceneRender"); - sceneRender(); + sceneRender(); emuPrint("Entering C3D_FrameEnd"); - C3D_FrameEnd(0); + C3D_FrameEnd(0); emuPrint("Exited C3D_FrameEnd"); - } + } - // Deinitialize the scene - sceneExit(); + // Deinitialize the scene + sceneExit(); - // Deinitialize graphics - C3D_Fini(); - gfxExit(); - return 0; + // Deinitialize graphics + C3D_Fini(); + gfxExit(); + return 0; } diff --git a/tests/HelloWorldSVC/source/main.c b/tests/HelloWorldSVC/source/main.c index 7c2a0972..073c14a1 100644 --- a/tests/HelloWorldSVC/source/main.c +++ b/tests/HelloWorldSVC/source/main.c @@ -1,5 +1,4 @@ #include <3ds.h> -#include #include #include #include @@ -16,5 +15,5 @@ int main(int argc, char** argv) { __asm__ volatile ("" ::: "memory"); } - return 0; + return 0; } diff --git a/tests/ImmediateModeTriangles/source/main.c b/tests/ImmediateModeTriangles/source/main.c index 4eda609f..57fd15be 100644 --- a/tests/ImmediateModeTriangles/source/main.c +++ b/tests/ImmediateModeTriangles/source/main.c @@ -6,9 +6,9 @@ #define CLEAR_COLOR 0x68B0D8FF #define DISPLAY_TRANSFER_FLAGS \ - (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \ - GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \ - GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) + (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \ + GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \ + GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) static DVLB_s* vshader_dvlb; static shaderProgram_s program; @@ -17,105 +17,105 @@ static C3D_Mtx projection; static void sceneInit(void) { - // Load the vertex shader, create a shader program and bind it - vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); - shaderProgramInit(&program); - shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); - C3D_BindProgram(&program); + // Load the vertex shader, create a shader program and bind it + vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); + shaderProgramInit(&program); + shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); + C3D_BindProgram(&program); - // Get the location of the uniforms - uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); + // Get the location of the uniforms + uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); - // Configure attributes for use with the vertex shader - // Attribute format and element count are ignored in immediate mode - C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); - AttrInfo_Init(attrInfo); - AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position - AttrInfo_AddLoader(attrInfo, 1, GPU_FLOAT, 3); // v1=color + // Configure attributes for use with the vertex shader + // Attribute format and element count are ignored in immediate mode + C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); + AttrInfo_Init(attrInfo); + AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position + AttrInfo_AddLoader(attrInfo, 1, GPU_FLOAT, 3); // v1=color - // Compute the projection matrix - Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); + // Compute the projection matrix + Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); - // Configure the first fragment shading substage to just pass through the vertex color - // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight - C3D_TexEnv* env = C3D_GetTexEnv(0); - C3D_TexEnvInit(env); - C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); - C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); + // Configure the first fragment shading substage to just pass through the vertex color + // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight + C3D_TexEnv* env = C3D_GetTexEnv(0); + C3D_TexEnvInit(env); + C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); + C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); } static void sceneRender(void) { - // Update the uniforms - C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); + // Update the uniforms + C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); - // Draw the triangle directly - C3D_ImmDrawBegin(GPU_TRIANGLES); + // Draw the triangle directly + C3D_ImmDrawBegin(GPU_TRIANGLES); // Triangle 1 - C3D_ImmSendAttrib(200.0f, 200.0f, 0.5f, 0.0f); // v0=position - C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); // v1=color + C3D_ImmSendAttrib(200.0f, 200.0f, 0.5f, 0.0f); // v0=position + C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); // v1=color - C3D_ImmSendAttrib(100.0f, 40.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(0.0f, 1.0f, 0.0f, 1.0f); + C3D_ImmSendAttrib(100.0f, 40.0f, 0.5f, 0.0f); + C3D_ImmSendAttrib(0.0f, 1.0f, 0.0f, 1.0f); - C3D_ImmSendAttrib(300.0f, 40.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(0.0f, 0.0f, 1.0f, 1.0f); + C3D_ImmSendAttrib(300.0f, 40.0f, 0.5f, 0.0f); + C3D_ImmSendAttrib(0.0f, 0.0f, 1.0f, 1.0f); // Triangle 2 C3D_ImmSendAttrib(10.0f, 20.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); + C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); C3D_ImmSendAttrib(90.0f, 20.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); + C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); C3D_ImmSendAttrib(40.0f, 40.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); - C3D_ImmDrawEnd(); + C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); + C3D_ImmDrawEnd(); } static void sceneExit(void) { - // Free the shader program - shaderProgramFree(&program); - DVLB_Free(vshader_dvlb); + // Free the shader program + shaderProgramFree(&program); + DVLB_Free(vshader_dvlb); } int main() { - // Initialize graphics - gfxInitDefault(); - C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); + // Initialize graphics + gfxInitDefault(); + C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); - // Initialize the render target - C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); - C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); + // Initialize the render target + C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); + C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); - // Initialize the scene - sceneInit(); + // Initialize the scene + sceneInit(); - // Main loop - while (aptMainLoop()) - { - hidScanInput(); + // Main loop + while (aptMainLoop()) + { + hidScanInput(); - // Respond to user input - u32 kDown = hidKeysDown(); - if (kDown & KEY_START) - break; // break in order to return to hbmenu + // Respond to user input + u32 kDown = hidKeysDown(); + if (kDown & KEY_START) + break; // break in order to return to hbmenu - // Render the scene - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); - C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); - C3D_FrameDrawOn(target); - sceneRender(); - C3D_FrameEnd(0); - } + // Render the scene + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); + C3D_FrameDrawOn(target); + sceneRender(); + C3D_FrameEnd(0); + } - // Deinitialize the scene - sceneExit(); + // Deinitialize the scene + sceneExit(); - // Deinitialize graphics - C3D_Fini(); - gfxExit(); - return 0; + // Deinitialize graphics + C3D_Fini(); + gfxExit(); + return 0; } diff --git a/tests/PICA_LITP/source/main.c b/tests/PICA_LITP/source/main.c index 9bcab5b9..ea5b112f 100644 --- a/tests/PICA_LITP/source/main.c +++ b/tests/PICA_LITP/source/main.c @@ -4,12 +4,11 @@ #include "vshader_shbin.h" - #define CLEAR_COLOR 0x68B0D8FF #define DISPLAY_TRANSFER_FLAGS \ - (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | \ - GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) + (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | \ + GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) static DVLB_s* vshader_dvlb; static shaderProgram_s program; @@ -17,107 +16,107 @@ static int uLoc_projection; static C3D_Mtx projection; static void sceneInit(void) { - // Load the vertex shader, create a shader program and bind it - vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); - shaderProgramInit(&program); - shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); - C3D_BindProgram(&program); + // Load the vertex shader, create a shader program and bind it + vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); + shaderProgramInit(&program); + shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); + C3D_BindProgram(&program); - // Get the location of the uniforms - uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); + // Get the location of the uniforms + uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); - // Configure attributes for use with the vertex shader - // Attribute format and element count are ignored in immediate mode - C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); - AttrInfo_Init(attrInfo); - AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position - AttrInfo_AddLoader(attrInfo, 1, GPU_FLOAT, 3); // v1=color + // Configure attributes for use with the vertex shader + // Attribute format and element count are ignored in immediate mode + C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); + AttrInfo_Init(attrInfo); + AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position + AttrInfo_AddLoader(attrInfo, 1, GPU_FLOAT, 3); // v1=color - // Compute the projection matrix - Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); + // Compute the projection matrix + Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); - // Configure the first fragment shading substage to just pass through the vertex color - // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight - C3D_TexEnv* env = C3D_GetTexEnv(0); - C3D_TexEnvInit(env); - C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); - C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); + // Configure the first fragment shading substage to just pass through the vertex color + // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight + C3D_TexEnv* env = C3D_GetTexEnv(0); + C3D_TexEnvInit(env); + C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); + C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); } static void sceneRender(void) { - // Update the uniforms - C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); + // Update the uniforms + C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); - // Draw the triangle directly - C3D_ImmDrawBegin(GPU_TRIANGLES); - // Triangle 1 - // This vertex has r >= 0 and a >= 0 so the shader should output magenta (cmp.x = cmp.y = 1) - C3D_ImmSendAttrib(200.0f, 200.0f, 0.5f, 0.0f); // v0=position - C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); // v1=color + // Draw the triangle directly + C3D_ImmDrawBegin(GPU_TRIANGLES); + // Triangle 1 + // This vertex has r >= 0 and a >= 0 so the shader should output magenta (cmp.x = cmp.y = 1) + C3D_ImmSendAttrib(200.0f, 200.0f, 0.5f, 0.0f); // v0=position + C3D_ImmSendAttrib(1.0f, 0.0f, 0.0f, 1.0f); // v1=color - // This vertex only has a >= 0, so the shader should output lime (cmp.x = 0, cmp.y = 1) - C3D_ImmSendAttrib(100.0f, 40.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(-0.5f, 1.0f, 0.0f, 1.0f); + // This vertex only has a >= 0, so the shader should output lime (cmp.x = 0, cmp.y = 1) + C3D_ImmSendAttrib(100.0f, 40.0f, 0.5f, 0.0f); + C3D_ImmSendAttrib(-0.5f, 1.0f, 0.0f, 1.0f); - // This vertex only has r >= 0, so the shader should output cyan (cmp.x = 1, cmp.y = 0) - C3D_ImmSendAttrib(300.0f, 40.0f, 0.5f, 0.0f); - C3D_ImmSendAttrib(0.5f, 0.0f, 1.0f, -1.0f); + // This vertex only has r >= 0, so the shader should output cyan (cmp.x = 1, cmp.y = 0) + C3D_ImmSendAttrib(300.0f, 40.0f, 0.5f, 0.0f); + C3D_ImmSendAttrib(0.5f, 0.0f, 1.0f, -1.0f); - // Triangle 2 - // The next 3 vertices have r < 0, a < 0, so the output of the shader should be the output of litp with alpha set to 1 (cmp.x = cmp.y = 0) - C3D_ImmSendAttrib(10.0f, 20.0f, 0.5f, 0.0f); - // Output g component should be 64 / 128 = 0.5 - C3D_ImmSendAttrib(-1.0f, 64.0f, 0.0f, -1.0f); + // Triangle 2 + // The next 3 vertices have r < 0, a < 0, so the output of the shader should be the output of litp with alpha set to 1 (cmp.x = cmp.y = 0) + C3D_ImmSendAttrib(10.0f, 20.0f, 0.5f, 0.0f); + // Output g component should be 64 / 128 = 0.5 + C3D_ImmSendAttrib(-1.0f, 64.0f, 0.0f, -1.0f); - C3D_ImmSendAttrib(90.0f, 20.0f, 0.5f, 0.0f); - // Output g component should be 128 / 128 = 1.0 - C3D_ImmSendAttrib(-1.0f, 256.0f, 1.0f, -1.0f); + C3D_ImmSendAttrib(90.0f, 20.0f, 0.5f, 0.0f); + // Output g component should be 128 / 128 = 1.0 + C3D_ImmSendAttrib(-1.0f, 256.0f, 1.0f, -1.0f); - C3D_ImmSendAttrib(40.0f, 40.0f, 0.5f, 0.0f); - // Output g component should be 0 / 128 = 0 - C3D_ImmSendAttrib(-1.0f, 0.0f, 0.5f, -1.0f); - C3D_ImmDrawEnd(); + C3D_ImmSendAttrib(40.0f, 40.0f, 0.5f, 0.0f); + // Output g component should be 0 / 128 = 0 + C3D_ImmSendAttrib(-1.0f, 0.0f, 0.5f, -1.0f); + C3D_ImmDrawEnd(); } static void sceneExit(void) { - // Free the shader program - shaderProgramFree(&program); - DVLB_Free(vshader_dvlb); + // Free the shader program + shaderProgramFree(&program); + DVLB_Free(vshader_dvlb); } int main() { - // Initialize graphics - gfxInitDefault(); - C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); + // Initialize graphics + gfxInitDefault(); + C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); - // Initialize the render target - C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); - C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); + // Initialize the render target + C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); + C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); - // Initialize the scene - sceneInit(); + // Initialize the scene + sceneInit(); - // Main loop - while (aptMainLoop()) { - hidScanInput(); + // Main loop + while (aptMainLoop()) { + hidScanInput(); - // Respond to user input - u32 kDown = hidKeysDown(); - if (kDown & KEY_START) break; // break in order to return to hbmenu + // Respond to user input + u32 kDown = hidKeysDown(); + if (kDown & KEY_START) break; // break in order to return to hbmenu - // Render the scene - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); - C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); - C3D_FrameDrawOn(target); - sceneRender(); - C3D_FrameEnd(0); - } + // Render the scene + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); + C3D_FrameDrawOn(target); + sceneRender(); + C3D_FrameEnd(0); + } - // Deinitialize the scene - sceneExit(); + // Deinitialize the scene + sceneExit(); - // Deinitialize graphics - C3D_Fini(); - gfxExit(); - return 0; + // Deinitialize graphics + C3D_Fini(); + gfxExit(); + return 0; } \ No newline at end of file diff --git a/tests/SimplerTri/source/main.c b/tests/SimplerTri/source/main.c index 0ebd936d..e8fdc4fb 100644 --- a/tests/SimplerTri/source/main.c +++ b/tests/SimplerTri/source/main.c @@ -6,17 +6,17 @@ #define CLEAR_COLOR 0x68B0D8FF #define DISPLAY_TRANSFER_FLAGS \ - (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \ - GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \ - GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) + (GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \ + GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \ + GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO)) typedef struct { float x, y, z; } vertex; static const vertex vertex_list[] = { - { 200.0f, 200.0f, 0.5f }, - { 100.0f, 40.0f, 0.5f }, - { 300.0f, 40.0f, 0.5f }, + { 200.0f, 200.0f, 0.5f }, + { 100.0f, 40.0f, 0.5f }, + { 300.0f, 40.0f, 0.5f }, }; #define vertex_list_count (sizeof(vertex_list)/sizeof(vertex_list[0])) @@ -30,61 +30,61 @@ static void* vbo_data; static void sceneInit(void) { - // Load the vertex shader, create a shader program and bind it - vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); - shaderProgramInit(&program); - shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); - C3D_BindProgram(&program); + // Load the vertex shader, create a shader program and bind it + vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size); + shaderProgramInit(&program); + shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]); + C3D_BindProgram(&program); - // Get the location of the uniforms - uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); + // Get the location of the uniforms + uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection"); - // Configure attributes for use with the vertex shader - C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); - AttrInfo_Init(attrInfo); - AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position - AttrInfo_AddFixed(attrInfo, 1); // v1=color + // Configure attributes for use with the vertex shader + C3D_AttrInfo* attrInfo = C3D_GetAttrInfo(); + AttrInfo_Init(attrInfo); + AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3); // v0=position + AttrInfo_AddFixed(attrInfo, 1); // v1=color - // Set the fixed attribute (color) to orange - C3D_FixedAttribSet(1, 1.0, 0.5, 0.2, 1.0); + // Set the fixed attribute (color) to orange + C3D_FixedAttribSet(1, 1.0, 0.5, 0.2, 1.0); - // Compute the projection matrix - Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); + // Compute the projection matrix + Mtx_OrthoTilt(&projection, 0.0, 400.0, 0.0, 240.0, 0.0, 1.0, true); - // Create the VBO (vertex buffer object) - vbo_data = linearAlloc(sizeof(vertex_list)); - memcpy(vbo_data, vertex_list, sizeof(vertex_list)); + // Create the VBO (vertex buffer object) + vbo_data = linearAlloc(sizeof(vertex_list)); + memcpy(vbo_data, vertex_list, sizeof(vertex_list)); - // Configure buffers - C3D_BufInfo* bufInfo = C3D_GetBufInfo(); - BufInfo_Init(bufInfo); - BufInfo_Add(bufInfo, vbo_data, sizeof(vertex), 1, 0x0); + // Configure buffers + C3D_BufInfo* bufInfo = C3D_GetBufInfo(); + BufInfo_Init(bufInfo); + BufInfo_Add(bufInfo, vbo_data, sizeof(vertex), 1, 0x0); - // Configure the first fragment shading substage to just pass through the vertex color - // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight - C3D_TexEnv* env = C3D_GetTexEnv(0); - C3D_TexEnvInit(env); - C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); - C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); + // Configure the first fragment shading substage to just pass through the vertex color + // See https://www.opengl.org/sdk/docs/man2/xhtml/glTexEnv.xml for more insight + C3D_TexEnv* env = C3D_GetTexEnv(0); + C3D_TexEnvInit(env); + C3D_TexEnvSrc(env, C3D_Both, GPU_PRIMARY_COLOR, 0, 0); + C3D_TexEnvFunc(env, C3D_Both, GPU_REPLACE); } static void sceneRender(void) { - // Update the uniforms - C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); + // Update the uniforms + C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projection); - // Draw the VBO - C3D_DrawArrays(GPU_TRIANGLES, 0, vertex_list_count); + // Draw the VBO + C3D_DrawArrays(GPU_TRIANGLES, 0, vertex_list_count); } static void sceneExit(void) { - // Free the VBO - linearFree(vbo_data); + // Free the VBO + linearFree(vbo_data); - // Free the shader program - shaderProgramFree(&program); - DVLB_Free(vshader_dvlb); + // Free the shader program + shaderProgramFree(&program); + DVLB_Free(vshader_dvlb); } // Print string in emulator terminal @@ -96,39 +96,39 @@ static void emuPrint(const char* str) int main() { emuPrint("Entering main\n"); - // Initialize graphics - gfxInitDefault(); - C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); + // Initialize graphics + gfxInitDefault(); + C3D_Init(C3D_DEFAULT_CMDBUF_SIZE); - // Initialize the render target - C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); - C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); + // Initialize the render target + C3D_RenderTarget* target = C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8); + C3D_RenderTargetSetOutput(target, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS); - // Initialize the scene - sceneInit(); + // Initialize the scene + sceneInit(); - // Main loop - while (true) - { - // Render the scene + // Main loop + while (true) + { + // Render the scene emuPrint("Entering C3D_FrameBegin"); - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_FrameBegin(C3D_FRAME_SYNCDRAW); emuPrint("Clearing render target"); - C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); + C3D_RenderTargetClear(target, C3D_CLEAR_ALL, CLEAR_COLOR, 0); emuPrint("Calling C3D_FrameDrawOn"); - C3D_FrameDrawOn(target); + C3D_FrameDrawOn(target); emuPrint("Calling sceneRender"); - sceneRender(); + sceneRender(); emuPrint("Entering C3D_FrameEnd"); - C3D_FrameEnd(0); + C3D_FrameEnd(0); emuPrint("Exited C3D_FrameEnd"); - } + } - // Deinitialize the scene - sceneExit(); + // Deinitialize the scene + sceneExit(); - // Deinitialize graphics - C3D_Fini(); - gfxExit(); - return 0; + // Deinitialize graphics + C3D_Fini(); + gfxExit(); + return 0; } From ece809d368177db35c6cfc92d75d80dda03938ac Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 14:18:02 +0300 Subject: [PATCH 11/27] Build hardware tests on CI (#791) * Build tests on CI * Update workflows * Update Test_Build.yml * Update Test_Build.yml * Update Test_Build.yml * Update Test_Build.yml --- .github/workflows/Test_Build.yml | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/Test_Build.yml diff --git a/.github/workflows/Test_Build.yml b/.github/workflows/Test_Build.yml new file mode 100644 index 00000000..b560405f --- /dev/null +++ b/.github/workflows/Test_Build.yml @@ -0,0 +1,42 @@ +name: Hardware Test Build + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + container: devkitpro/devkitarm + + steps: + - uses: actions/checkout@v4 + + - name: Install and update packages + run: | + apt-get -y install python3 python3-pip p7zip-full libarchive13 + python3 --version + python3 -m pip install --upgrade pip setuptools + + - name: Compile tests + run: | + make -C tests/AppCpuTimeLimit + make -C tests/DetectEmulator + make -C tests/HelloWorldSVC + make -C tests/ImmediateModeTriangles + make -C tests/PICA_LITP + make -C tests/SimplerTri + + - name: Clone and compile 3ds-examples + run: | + git clone --recursive https://github.com/devkitPro/3ds-examples tests/3ds-examples + find tests/3ds-examples -type f -name Makefile -execdir make \; + + - name: Upload binaries + uses: actions/upload-artifact@v4 + with: + name: Source & Binaries + path: tests + From f8c3ddff9a4251c29671be0f9f7f131f723aaedc Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 23 Jul 2025 14:59:10 +0300 Subject: [PATCH 12/27] Update Test_Build.yml --- .github/workflows/Test_Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Test_Build.yml b/.github/workflows/Test_Build.yml index b560405f..54bef27b 100644 --- a/.github/workflows/Test_Build.yml +++ b/.github/workflows/Test_Build.yml @@ -32,7 +32,7 @@ jobs: - name: Clone and compile 3ds-examples run: | git clone --recursive https://github.com/devkitPro/3ds-examples tests/3ds-examples - find tests/3ds-examples -type f -name Makefile -execdir make \; + make -C tests/3ds-examples - name: Upload binaries uses: actions/upload-artifact@v4 From 3ac5f1b0c6d304d27d9ce7f61b95d271d769d86d Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 24 Jul 2025 17:17:40 +0300 Subject: [PATCH 13/27] Qt: Fix race condition when using cheats (#792) * Qt: Fix race condition when using cheats * Nit --- src/panda_qt/cheats_window.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/panda_qt/cheats_window.cpp b/src/panda_qt/cheats_window.cpp index 2485c677..3627406a 100644 --- a/src/panda_qt/cheats_window.cpp +++ b/src/panda_qt/cheats_window.cpp @@ -70,8 +70,6 @@ void CheatEntryWidget::editClicked() { CheatEditDialog::CheatEditDialog(Emulator* emu, CheatEntryWidget& cheatEntry) : QDialog(), emu(emu), cheatEntry(cheatEntry) { setWindowTitle(tr("Edit Cheat")); - - setAttribute(Qt::WA_DeleteOnClose); setModal(true); QVBoxLayout* layout = new QVBoxLayout; @@ -147,6 +145,9 @@ void CheatEditDialog::accepted() { cheatEntry.setMetadata(metadata); cheatEntry.Update(); } + + // Delete the CheatEditDialog when the main thread is done using it + QObject::deleteLater(); }); }); } @@ -157,6 +158,9 @@ void CheatEditDialog::rejected() { // Was adding a cheat but user pressed cancel cheatEntry.Remove(); } + + // We have to manually memory-manage the CheatEditDialog object since it's accessed via multiple threads + QObject::deleteLater(); } CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath, QWidget* parent) From 0815707613977d254a407bbbb6a3f1758377673f Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 24 Jul 2025 23:25:34 +0300 Subject: [PATCH 14/27] GL: Use StreamBuffer for shadergen UBOs (#793) * GL: Use StreamBuffer for shadergen UBOs * Clean up UBO sizes --- include/renderer_gl/renderer_gl.hpp | 7 +++--- src/core/renderer_gl/renderer_gl.cpp | 34 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/renderer_gl/renderer_gl.hpp b/include/renderer_gl/renderer_gl.hpp index b105f3e9..f5eaea84 100644 --- a/include/renderer_gl/renderer_gl.hpp +++ b/include/renderer_gl/renderer_gl.hpp @@ -92,11 +92,12 @@ class RendererGL final : public Renderer { // The "default" vertex shader to use when using specialized shaders but not PICA vertex shader -> GLSL recompilation // We can compile this once and then link it with all other generated fragment shaders OpenGL::Shader defaultShadergenVs; - GLuint shadergenFragmentUBO; - // UBO for uploading the PICA uniforms when using hw shaders - GLuint hwShaderUniformUBO; using StreamBuffer = OpenGLStreamBuffer; + + std::unique_ptr shadergenFragmentUBO; + // UBO for uploading the PICA uniforms when using hw shaders + std::unique_ptr hwShaderUniformUBO; std::unique_ptr hwVertexBuffer; std::unique_ptr hwIndexBuffer; diff --git a/src/core/renderer_gl/renderer_gl.cpp b/src/core/renderer_gl/renderer_gl.cpp index 57ccca18..35a99bc4 100644 --- a/src/core/renderer_gl/renderer_gl.cpp +++ b/src/core/renderer_gl/renderer_gl.cpp @@ -11,10 +11,10 @@ #include "PICA/pica_hash.hpp" #include "PICA/pica_simd.hpp" #include "PICA/regs.hpp" -#include "screen_layout.hpp" #include "PICA/shader_decompiler.hpp" #include "config.hpp" #include "math_util.hpp" +#include "screen_layout.hpp" CMRC_DECLARE(RendererGL); @@ -71,19 +71,13 @@ void RendererGL::initGraphicsContextInternal() { // Create stream buffers for vertex, index and uniform buffers static constexpr usize hwIndexBufferSize = 2_MB; static constexpr usize hwVertexBufferSize = 16_MB; + static constexpr usize hwShaderUniformUBOSize = 4_MB; + static constexpr usize shadergenFragmentUBOSize = 4_MB; hwIndexBuffer = StreamBuffer::Create(GL_ELEMENT_ARRAY_BUFFER, hwIndexBufferSize); hwVertexBuffer = StreamBuffer::Create(GL_ARRAY_BUFFER, hwVertexBufferSize); - - // Allocate memory for the shadergen fragment uniform UBO - glGenBuffers(1, &shadergenFragmentUBO); - gl.bindUBO(shadergenFragmentUBO); - glBufferData(GL_UNIFORM_BUFFER, sizeof(PICA::FragmentUniforms), nullptr, GL_DYNAMIC_DRAW); - - // Allocate memory for the accelerated vertex shader uniform UBO - glGenBuffers(1, &hwShaderUniformUBO); - gl.bindUBO(hwShaderUniformUBO); - glBufferData(GL_UNIFORM_BUFFER, PICAShader::totalUniformSize(), nullptr, GL_DYNAMIC_DRAW); + hwShaderUniformUBO = StreamBuffer::Create(GL_UNIFORM_BUFFER, hwShaderUniformUBOSize); + shadergenFragmentUBO = StreamBuffer::Create(GL_UNIFORM_BUFFER, shadergenFragmentUBOSize); vbo.createFixedSize(sizeof(Vertex) * vertexBufferSize * 2, GL_STREAM_DRAW); vbo.bind(); @@ -936,9 +930,10 @@ OpenGL::Program& RendererGL::getSpecializedShader() { glUniformBlockBinding(program.handle(), vertexUBOIndex, vsUBOBlockBinding); } } - glBindBufferBase(GL_UNIFORM_BUFFER, fsUBOBlockBinding, shadergenFragmentUBO); + glBindBufferBase(GL_UNIFORM_BUFFER, fsUBOBlockBinding, shadergenFragmentUBO->GetGLBufferId()); + if (usingAcceleratedShader) { - glBindBufferBase(GL_UNIFORM_BUFFER, vsUBOBlockBinding, hwShaderUniformUBO); + glBindBufferBase(GL_UNIFORM_BUFFER, vsUBOBlockBinding, hwShaderUniformUBO->GetGLBufferId()); } // Upload uniform data to our shader's UBO @@ -1023,8 +1018,11 @@ OpenGL::Program& RendererGL::getSpecializedShader() { } } - gl.bindUBO(shadergenFragmentUBO); - glBufferSubData(GL_UNIFORM_BUFFER, 0, sizeof(PICA::FragmentUniforms), &uniforms); + // Upload fragment uniforms to UBO + shadergenFragmentUBO->Bind(); + auto mapRes = shadergenFragmentUBO->Map(4, sizeof(PICA::FragmentUniforms)); + std::memcpy(mapRes.pointer, &uniforms, sizeof(PICA::FragmentUniforms)); + shadergenFragmentUBO->Unmap(sizeof(PICA::FragmentUniforms)); return program; } @@ -1074,11 +1072,13 @@ bool RendererGL::prepareForDraw(ShaderUnit& shaderUnit, PICA::DrawAcceleration* usingAcceleratedShader = false; } else { generatedVertexShader = &(*shader); - gl.bindUBO(hwShaderUniformUBO); + hwShaderUniformUBO->Bind(); if (shaderUnit.vs.uniformsDirty) { shaderUnit.vs.uniformsDirty = false; - glBufferSubData(GL_UNIFORM_BUFFER, 0, PICAShader::totalUniformSize(), shaderUnit.vs.getUniformPointer()); + auto mapRes = hwShaderUniformUBO->Map(4, PICAShader::totalUniformSize()); + std::memcpy(mapRes.pointer, shaderUnit.vs.getUniformPointer(), PICAShader::totalUniformSize()); + hwShaderUniformUBO->Unmap(PICAShader::totalUniformSize()); } performIndexedRender = accel->indexed; From 8b0b1939cfd9a74fa4edd7235b9e1444919b8ae2 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Fri, 25 Jul 2025 01:24:23 +0300 Subject: [PATCH 15/27] GL: Respect minimum UBO alignment requirement (#794) * GL: Respect minimum UBO alignment requirement * Use glBindBufferRange for UBOs * Fix fragment shadergen UBO bindings * Nit --- include/renderer_gl/gl_driver.hpp | 4 ++++ include/renderer_gl/renderer_gl.hpp | 3 +++ src/core/renderer_gl/renderer_gl.cpp | 32 ++++++++++++++++++++-------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/include/renderer_gl/gl_driver.hpp b/include/renderer_gl/gl_driver.hpp index 4a0b3727..dfb78ffe 100644 --- a/include/renderer_gl/gl_driver.hpp +++ b/include/renderer_gl/gl_driver.hpp @@ -1,4 +1,5 @@ #pragma once +#include "opengl.hpp" // Information about our OpenGL/OpenGL ES driver that we should keep track of // Stuff like whether specific extensions are supported, and potentially things like OpenGL context information @@ -8,6 +9,9 @@ namespace OpenGL { bool supportsExtFbFetch = false; bool supportsArmFbFetch = false; + // Minimum alignment for UBO offsets. Fetched by the OpenGL renderer using glGetIntegerV. + GLuint uboAlignment = 16; + bool supportFbFetch() const { return supportsExtFbFetch || supportsArmFbFetch; } }; } // namespace OpenGL \ No newline at end of file diff --git a/include/renderer_gl/renderer_gl.hpp b/include/renderer_gl/renderer_gl.hpp index f5eaea84..4708fdee 100644 --- a/include/renderer_gl/renderer_gl.hpp +++ b/include/renderer_gl/renderer_gl.hpp @@ -101,6 +101,9 @@ class RendererGL final : public Renderer { std::unique_ptr hwVertexBuffer; std::unique_ptr hwIndexBuffer; + // Current offset for our hw shader uniform UBO + u32 hwShaderUniformUBOOffset = 0; + // Cache of fixed attribute values so that we don't do any duplicate updates std::array, 16> fixedAttrValues; diff --git a/src/core/renderer_gl/renderer_gl.cpp b/src/core/renderer_gl/renderer_gl.cpp index 35a99bc4..8ab7f1df 100644 --- a/src/core/renderer_gl/renderer_gl.cpp +++ b/src/core/renderer_gl/renderer_gl.cpp @@ -2,6 +2,7 @@ #include +#include #include #include @@ -179,6 +180,10 @@ void RendererGL::initGraphicsContextInternal() { driverInfo.supportsExtFbFetch = (GLAD_GL_EXT_shader_framebuffer_fetch != 0); driverInfo.supportsArmFbFetch = (GLAD_GL_ARM_shader_framebuffer_fetch != 0); + // UBOs have an alignment requirement we have to respect + glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, reinterpret_cast(&driverInfo.uboAlignment)); + driverInfo.uboAlignment = std::max(driverInfo.uboAlignment, 16); + // Initialize the default vertex shader used with shadergen std::string defaultShadergenVSSource = fragShaderGen.getDefaultVertexShader(); defaultShadergenVs.create({defaultShadergenVSSource.c_str(), defaultShadergenVSSource.size()}, OpenGL::Vertex); @@ -930,11 +935,6 @@ OpenGL::Program& RendererGL::getSpecializedShader() { glUniformBlockBinding(program.handle(), vertexUBOIndex, vsUBOBlockBinding); } } - glBindBufferBase(GL_UNIFORM_BUFFER, fsUBOBlockBinding, shadergenFragmentUBO->GetGLBufferId()); - - if (usingAcceleratedShader) { - glBindBufferBase(GL_UNIFORM_BUFFER, vsUBOBlockBinding, hwShaderUniformUBO->GetGLBufferId()); - } // Upload uniform data to our shader's UBO PICA::FragmentUniforms uniforms; @@ -1020,10 +1020,21 @@ OpenGL::Program& RendererGL::getSpecializedShader() { // Upload fragment uniforms to UBO shadergenFragmentUBO->Bind(); - auto mapRes = shadergenFragmentUBO->Map(4, sizeof(PICA::FragmentUniforms)); - std::memcpy(mapRes.pointer, &uniforms, sizeof(PICA::FragmentUniforms)); + auto uboRes = shadergenFragmentUBO->Map(driverInfo.uboAlignment, sizeof(PICA::FragmentUniforms)); + std::memcpy(uboRes.pointer, &uniforms, sizeof(PICA::FragmentUniforms)); shadergenFragmentUBO->Unmap(sizeof(PICA::FragmentUniforms)); + // Bind our UBOs + glBindBufferRange( + GL_UNIFORM_BUFFER, fsUBOBlockBinding, shadergenFragmentUBO->GetGLBufferId(), uboRes.buffer_offset, sizeof(PICA::FragmentUniforms) + ); + + if (usingAcceleratedShader) { + glBindBufferRange( + GL_UNIFORM_BUFFER, vsUBOBlockBinding, hwShaderUniformUBO->GetGLBufferId(), hwShaderUniformUBOOffset, PICAShader::totalUniformSize() + ); + } + return program; } @@ -1074,11 +1085,14 @@ bool RendererGL::prepareForDraw(ShaderUnit& shaderUnit, PICA::DrawAcceleration* generatedVertexShader = &(*shader); hwShaderUniformUBO->Bind(); + // Upload shader uniforms to our UBO if (shaderUnit.vs.uniformsDirty) { shaderUnit.vs.uniformsDirty = false; - auto mapRes = hwShaderUniformUBO->Map(4, PICAShader::totalUniformSize()); - std::memcpy(mapRes.pointer, shaderUnit.vs.getUniformPointer(), PICAShader::totalUniformSize()); + auto uboRes = hwShaderUniformUBO->Map(driverInfo.uboAlignment, PICAShader::totalUniformSize()); + std::memcpy(uboRes.pointer, shaderUnit.vs.getUniformPointer(), PICAShader::totalUniformSize()); hwShaderUniformUBO->Unmap(PICAShader::totalUniformSize()); + + hwShaderUniformUBOOffset = uboRes.buffer_offset; } performIndexedRender = accel->indexed; From 0446bcdaa1e11e5b46f73cce756a78109cffc295 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sat, 26 Jul 2025 23:13:08 +0300 Subject: [PATCH 16/27] Add Metal support to Qt frontend and clean up renderer creation code (#795) * Qt: Initial support for Metal renderer * Clean up graphics context code * Nits * More nits * Qt: Move screen-related stuff to own folder * Qt: Make screen widget polymorphic * Qt: Re-add Metal * Add factory for screen widget * Qt: Support compilation without Metal * Qt: Fix build without Metal * Oops * oops --- CMakeLists.txt | 15 +++-- include/PICA/gpu.hpp | 6 +- include/emulator.hpp | 8 +-- include/panda_qt/main_window.hpp | 4 +- include/panda_qt/{ => screen}/screen.hpp | 36 +++++++----- include/panda_qt/screen/screen_gl.hpp | 18 ++++++ include/panda_qt/screen/screen_mtl.hpp | 18 ++++++ include/renderer.hpp | 13 ++--- include/renderer_gl/renderer_gl.hpp | 6 +- include/renderer_mtl/renderer_mtl.hpp | 7 +-- include/renderer_null/renderer_null.hpp | 6 +- include/renderer_sw/renderer_sw.hpp | 6 +- include/renderer_vk/renderer_vk.hpp | 2 +- src/core/renderer_gl/renderer_gl.cpp | 2 +- src/core/renderer_mtl/renderer_mtl.cpp | 14 ++--- src/core/renderer_null/renderer_null.cpp | 2 +- src/core/renderer_sw/renderer_sw.cpp | 2 +- src/core/renderer_vk/renderer_vk.cpp | 22 +++++--- src/panda_qt/main_window.cpp | 54 +++++++++++------- src/panda_qt/screen/metal_context.mm | 71 ++++++++++++++++++++++++ src/panda_qt/{ => screen}/screen.cpp | 68 ++++++++--------------- src/panda_qt/screen/screen_gl.cpp | 64 +++++++++++++++++++++ src/panda_qt/screen/screen_mtl.cpp | 33 +++++++++++ 23 files changed, 331 insertions(+), 146 deletions(-) rename include/panda_qt/{ => screen}/screen.hpp (54%) create mode 100644 include/panda_qt/screen/screen_gl.hpp create mode 100644 include/panda_qt/screen/screen_mtl.hpp create mode 100644 src/panda_qt/screen/metal_context.mm rename src/panda_qt/{ => screen}/screen.cpp (66%) create mode 100644 src/panda_qt/screen/screen_gl.cpp create mode 100644 src/panda_qt/screen/screen_mtl.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e522bdb..8e8e9428 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -675,7 +675,7 @@ if(ENABLE_METAL AND APPLE) target_sources(AlberCore PRIVATE ${RENDERER_MTL_SOURCE_FILES}) target_compile_definitions(AlberCore PUBLIC "PANDA3DS_ENABLE_METAL=1") - target_include_directories(AlberCore PRIVATE third_party/metal-cpp) + target_include_directories(AlberCore PUBLIC third_party/metal-cpp) # TODO: check if all of them are needed target_link_libraries(AlberCore PUBLIC "-framework Metal" "-framework Foundation" "-framework QuartzCore" resources_renderer_mtl) endif() @@ -730,18 +730,25 @@ if(NOT BUILD_HYDRA_CORE AND NOT BUILD_LIBRETRO_CORE) option(GENERATE_QT_TRANSLATION "Generate Qt translation file" OFF) set(QT_LANGUAGES docs/translations) - set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/screen.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp + set(FRONTEND_SOURCE_FILES src/panda_qt/main.cpp src/panda_qt/main_window.cpp src/panda_qt/about_window.cpp src/panda_qt/config_window.cpp src/panda_qt/zep.cpp src/panda_qt/text_editor.cpp src/panda_qt/cheats_window.cpp src/panda_qt/mappings.cpp src/panda_qt/patch_window.cpp src/panda_qt/elided_label.cpp src/panda_qt/shader_editor.cpp src/panda_qt/translations.cpp src/panda_qt/thread_debugger.cpp src/panda_qt/cpu_debugger.cpp src/panda_qt/dsp_debugger.cpp src/panda_qt/input_window.cpp + src/panda_qt/screen/screen.cpp src/panda_qt/screen/screen_gl.cpp src/panda_qt/screen/screen_mtl.cpp ) - set(FRONTEND_HEADER_FILES include/panda_qt/screen.hpp include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp + + set(FRONTEND_HEADER_FILES include/panda_qt/main_window.hpp include/panda_qt/about_window.hpp include/panda_qt/config_window.hpp include/panda_qt/text_editor.hpp include/panda_qt/cheats_window.hpp include/panda_qt/patch_window.hpp include/panda_qt/elided_label.hpp include/panda_qt/shader_editor.hpp include/panda_qt/thread_debugger.hpp include/panda_qt/cpu_debugger.hpp include/panda_qt/dsp_debugger.hpp - include/panda_qt/disabled_widget_overlay.hpp include/panda_qt/input_window.hpp + include/panda_qt/disabled_widget_overlay.hpp include/panda_qt/input_window.hpp include/panda_qt/screen/screen.hpp + include/panda_qt/screen/screen_gl.hpp include/panda_qt/screen/screen_mtl.hpp ) + if (APPLE AND ENABLE_METAL) + set(FRONTEND_SOURCE_FILES ${FRONTEND_SOURCE_FILES} src/panda_qt/screen/metal_context.mm) + endif() + source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES}) source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES}) include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS}) diff --git a/include/PICA/gpu.hpp b/include/PICA/gpu.hpp index 77bfb8ed..e62f41b3 100644 --- a/include/PICA/gpu.hpp +++ b/include/PICA/gpu.hpp @@ -109,11 +109,7 @@ class GPU { void screenshot(const std::string& name) { renderer->screenshot(name); } void deinitGraphicsContext() { renderer->deinitGraphicsContext(); } -#if defined(PANDA3DS_FRONTEND_SDL) - void initGraphicsContext(SDL_Window* window) { renderer->initGraphicsContext(window); } -#elif defined(PANDA3DS_FRONTEND_QT) - void initGraphicsContext(GL::Context* context) { renderer->initGraphicsContext(context); } -#endif + void initGraphicsContext(void* context) { renderer->initGraphicsContext(context); } void fireDMA(u32 dest, u32 source, u32 size); void reset(); diff --git a/include/emulator.hpp b/include/emulator.hpp index bed01937..366f86f2 100644 --- a/include/emulator.hpp +++ b/include/emulator.hpp @@ -106,12 +106,8 @@ class Emulator { bool loadELF(const std::filesystem::path& path); bool loadELF(std::ifstream& file); -#ifdef PANDA3DS_FRONTEND_QT - // For passing the GL context from Qt to the renderer - void initGraphicsContext(GL::Context* glContext) { gpu.initGraphicsContext(nullptr); } -#else - void initGraphicsContext(SDL_Window* window) { gpu.initGraphicsContext(window); } -#endif + // For passing the SDL Window, GL context, etc from the frontend to the renderer + void initGraphicsContext(void* context) { gpu.initGraphicsContext(context); } RomFS::DumpingResult dumpRomFS(const std::filesystem::path& path); void setOutputSize(u32 width, u32 height) { gpu.setOutputSize(width, height); } diff --git a/include/panda_qt/main_window.hpp b/include/panda_qt/main_window.hpp index 7bdf6b96..b259a1bc 100644 --- a/include/panda_qt/main_window.hpp +++ b/include/panda_qt/main_window.hpp @@ -20,7 +20,7 @@ #include "panda_qt/cpu_debugger.hpp" #include "panda_qt/dsp_debugger.hpp" #include "panda_qt/patch_window.hpp" -#include "panda_qt/screen.hpp" +#include "panda_qt/screen/screen.hpp" #include "panda_qt/shader_editor.hpp" #include "panda_qt/text_editor.hpp" #include "panda_qt/thread_debugger.hpp" @@ -136,7 +136,7 @@ class MainWindow : public QMainWindow { void loadKeybindings(); void saveKeybindings(); - // Tracks whether we are using an OpenGL-backed renderer or a Vulkan-backed renderer + // Tracks what graphics API is backing our renderer bool usingGL = false; bool usingVk = false; bool usingMtl = false; diff --git a/include/panda_qt/screen.hpp b/include/panda_qt/screen/screen.hpp similarity index 54% rename from include/panda_qt/screen.hpp rename to include/panda_qt/screen/screen.hpp index 270bf10f..4908b096 100644 --- a/include/panda_qt/screen.hpp +++ b/include/panda_qt/screen/screen.hpp @@ -1,25 +1,27 @@ #pragma once #include #include -#include #include "gl/context.h" #include "screen_layout.hpp" #include "window_info.h" -// OpenGL widget for drawing the 3DS screen +// Abstract screen widget for drawing the 3DS screen. We've got a child class for each graphics API (ScreenWidgetGL, ScreenWidgetMTL, ...) class ScreenWidget : public QWidget { Q_OBJECT public: using ResizeCallback = std::function; - ScreenWidget(ResizeCallback resizeCallback, QWidget* parent = nullptr); - void resizeEvent(QResizeEvent* event) override; - // Called by the emulator thread for resizing the actual GL surface, since the emulator thread owns the GL context - void resizeSurface(u32 width, u32 height); + enum class API { OpenGL, Metal, Vulkan }; - GL::Context* getGLContext() { return glContext.get(); } + ScreenWidget(API api, ResizeCallback resizeCallback, QWidget* parent = nullptr); + virtual ~ScreenWidget() {} + + void resizeEvent(QResizeEvent* event) override; + + virtual GL::Context* getGLContext() { return nullptr; } + virtual void* getMTKLayer() { return nullptr; } // Dimensions of our output surface u32 surfaceWidth = 0; @@ -30,8 +32,9 @@ class ScreenWidget : public QWidget { u32 previousWidth = 0; u32 previousHeight = 0; - // Coordinates (x/y/width/height) for the two screens in window space, used for properly handling touchscreen regardless - // of layout or resizing + API api = API::OpenGL; + + // Coordinates (x/y/width/height) for the two screens in window space, used for properly handling touchscreen ScreenLayout::WindowCoordinates screenCoordinates; // Screen layouts and sizes ScreenLayout::Layout screenLayout = ScreenLayout::Layout::Default; @@ -39,16 +42,23 @@ class ScreenWidget : public QWidget { void reloadScreenLayout(ScreenLayout::Layout newLayout, float newTopScreenSize); - private: - std::unique_ptr glContext = nullptr; + // Creates a screen widget depending on the graphics API we're using + static ScreenWidget* getWidget(API api, ResizeCallback resizeCallback, QWidget* parent = nullptr); + + // Called by the emulator thread on OpenGL for resizing the actual GL surface, since the emulator thread owns the GL context + virtual void resizeSurface(u32 width, u32 height) {}; + + protected: ResizeCallback resizeCallback; - bool createGLContext(); + virtual bool createContext() = 0; + virtual void resizeDisplay() = 0; + std::optional getWindowInfo(); + private: qreal devicePixelRatioFromScreen() const; int scaledWindowWidth() const; int scaledWindowHeight() const; - std::optional getWindowInfo(); void reloadScreenCoordinates(); }; diff --git a/include/panda_qt/screen/screen_gl.hpp b/include/panda_qt/screen/screen_gl.hpp new file mode 100644 index 00000000..04a2c11b --- /dev/null +++ b/include/panda_qt/screen/screen_gl.hpp @@ -0,0 +1,18 @@ +#pragma once +#include + +#include "gl/context.h" +#include "panda_qt/screen/screen.hpp" + +class ScreenWidgetGL : public ScreenWidget { + std::unique_ptr glContext = nullptr; + + public: + ScreenWidgetGL(API api, ResizeCallback resizeCallback, QWidget* parent = nullptr); + + virtual GL::Context* getGLContext() override; + virtual bool createContext() override; + + virtual void resizeDisplay() override; + virtual void resizeSurface(u32 width, u32 height) override; +}; \ No newline at end of file diff --git a/include/panda_qt/screen/screen_mtl.hpp b/include/panda_qt/screen/screen_mtl.hpp new file mode 100644 index 00000000..cdd240e6 --- /dev/null +++ b/include/panda_qt/screen/screen_mtl.hpp @@ -0,0 +1,18 @@ +#pragma once +#include "panda_qt/screen/screen.hpp" + +class ScreenWidgetMTL : public ScreenWidget { + void* mtkLayer = nullptr; + + // Objective-C++ functions for handling the Metal context + bool createMetalContext(); + void resizeMetalView(); + + public: + ScreenWidgetMTL(API api, ResizeCallback resizeCallback, QWidget* parent = nullptr); + ~ScreenWidgetMTL() override; + + virtual void* getMTKLayer() override; + virtual bool createContext() override; + virtual void resizeDisplay() override; +}; \ No newline at end of file diff --git a/include/renderer.hpp b/include/renderer.hpp index 40f244db..b3f81faf 100644 --- a/include/renderer.hpp +++ b/include/renderer.hpp @@ -69,7 +69,7 @@ class Renderer { virtual void reset() = 0; virtual void display() = 0; // Display the 3DS screen contents to the window - virtual void initGraphicsContext(SDL_Window* window) = 0; // Initialize graphics context + virtual void initGraphicsContext(void* context) = 0; // Initialize graphics context virtual void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) = 0; // Clear a GPU buffer in VRAM virtual void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) = 0; // Perform display transfer virtual void textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) = 0; @@ -91,9 +91,9 @@ class Renderer { // Called to notify the core to use OpenGL ES and not desktop GL virtual void setupGLES() {} - // Only relevant for Metal renderer on iOS - // Passes a SwiftUI MTKView's layer (CAMetalLayer) to the renderer - virtual void setMTKLayer(void* layer) {}; + // Used for Metal renderer on Qt and iOS + // Passes an NSView's backing layer (CAMetalLayer) to the renderer + virtual void setMTKLayer(void* layer) { Helpers::panic("Renderer doesn't support MTK Layer"); }; // This function is called on every draw call before parsing vertex data. // It is responsible for things like looking up which vertex/fragment shaders to use, recompiling them if they don't exist, choosing between @@ -101,11 +101,6 @@ class Renderer { // Returns whether this draw is eligible for using hardware-accelerated shaders or if shaders should run on the CPU virtual bool prepareForDraw(ShaderUnit& shaderUnit, PICA::DrawAcceleration* accel) { return false; } - // Functions for initializing the graphics context for the Qt frontend, where we don't have the convenience of SDL_Window -#ifdef PANDA3DS_FRONTEND_QT - virtual void initGraphicsContext(GL::Context* context) { Helpers::panic("Tried to initialize incompatible renderer with GL context"); } -#endif - void setFBSize(u32 width, u32 height) { fbSize[0] = width; fbSize[1] = height; diff --git a/include/renderer_gl/renderer_gl.hpp b/include/renderer_gl/renderer_gl.hpp index 4708fdee..2023966f 100644 --- a/include/renderer_gl/renderer_gl.hpp +++ b/include/renderer_gl/renderer_gl.hpp @@ -191,7 +191,7 @@ class RendererGL final : public Renderer { void reset() override; void display() override; // Display the 3DS screen contents to the window - void initGraphicsContext(SDL_Window* window) override; // Initialize graphics context + void initGraphicsContext(void* context) override; // Initialize graphics context void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) override; // Clear a GPU buffer in VRAM void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) override; // Perform display transfer void textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) override; @@ -211,10 +211,6 @@ class RendererGL final : public Renderer { void resetStateManager() { gl.reset(); } void initUbershader(OpenGL::Program& program); -#ifdef PANDA3DS_FRONTEND_QT - virtual void initGraphicsContext([[maybe_unused]] GL::Context* context) override { initGraphicsContextInternal(); } -#endif - // Take a screenshot of the screen and store it in a file void screenshot(const std::string& name) override; }; \ No newline at end of file diff --git a/include/renderer_mtl/renderer_mtl.hpp b/include/renderer_mtl/renderer_mtl.hpp index c9b4b9b6..29eb02d4 100644 --- a/include/renderer_mtl/renderer_mtl.hpp +++ b/include/renderer_mtl/renderer_mtl.hpp @@ -13,7 +13,6 @@ #include "mtl_vertex_buffer_cache.hpp" #include "renderer.hpp" - // HACK: use the OpenGL cache #include "../renderer_gl/surface_cache.hpp" @@ -30,7 +29,7 @@ class RendererMTL final : public Renderer { void reset() override; void display() override; - void initGraphicsContext(SDL_Window* window) override; + void initGraphicsContext(void* context) override; void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) override; void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) override; void textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) override; @@ -38,10 +37,6 @@ class RendererMTL final : public Renderer { void screenshot(const std::string& name) override; void deinitGraphicsContext() override; -#ifdef PANDA3DS_FRONTEND_QT - virtual void initGraphicsContext([[maybe_unused]] GL::Context* context) override {} -#endif - virtual void setMTKLayer(void* layer) override; private: diff --git a/include/renderer_null/renderer_null.hpp b/include/renderer_null/renderer_null.hpp index 50a724d8..28ab41af 100644 --- a/include/renderer_null/renderer_null.hpp +++ b/include/renderer_null/renderer_null.hpp @@ -9,7 +9,7 @@ class RendererNull final : public Renderer { void reset() override; void display() override; - void initGraphicsContext(SDL_Window* window) override; + void initGraphicsContext(void* context) override; void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) override; void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) override; void textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) override; @@ -20,8 +20,4 @@ class RendererNull final : public Renderer { // Tell the GPU core that we'll handle vertex fetch & shader execution in the renderer in order to speed up execution. // Of course, we don't do this and geometry is never actually processed, since this is the null renderer. virtual bool prepareForDraw(ShaderUnit& shaderUnit, PICA::DrawAcceleration* accel) override { return true; }; - -#ifdef PANDA3DS_FRONTEND_QT - virtual void initGraphicsContext([[maybe_unused]] GL::Context* context) override {} -#endif }; diff --git a/include/renderer_sw/renderer_sw.hpp b/include/renderer_sw/renderer_sw.hpp index dd12bf0a..e2dd90cb 100644 --- a/include/renderer_sw/renderer_sw.hpp +++ b/include/renderer_sw/renderer_sw.hpp @@ -9,15 +9,11 @@ class RendererSw final : public Renderer { void reset() override; void display() override; - void initGraphicsContext(SDL_Window* window) override; + void initGraphicsContext(void* context) override; void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) override; void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) override; void textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) override; void drawVertices(PICA::PrimType primType, std::span vertices) override; void screenshot(const std::string& name) override; void deinitGraphicsContext() override; - -#ifdef PANDA3DS_FRONTEND_QT - virtual void initGraphicsContext([[maybe_unused]] GL::Context* context) override {} -#endif }; diff --git a/include/renderer_vk/renderer_vk.hpp b/include/renderer_vk/renderer_vk.hpp index 25cc26f8..a274e1c7 100644 --- a/include/renderer_vk/renderer_vk.hpp +++ b/include/renderer_vk/renderer_vk.hpp @@ -113,7 +113,7 @@ class RendererVK final : public Renderer { void reset() override; void display() override; - void initGraphicsContext(SDL_Window* window) override; + void initGraphicsContext(void* context) override; void clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) override; void displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) override; void textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) override; diff --git a/src/core/renderer_gl/renderer_gl.cpp b/src/core/renderer_gl/renderer_gl.cpp index 8ab7f1df..659a1e1d 100644 --- a/src/core/renderer_gl/renderer_gl.cpp +++ b/src/core/renderer_gl/renderer_gl.cpp @@ -191,7 +191,7 @@ void RendererGL::initGraphicsContextInternal() { // The OpenGL renderer doesn't need to do anything with the GL context (For Qt frontend) or the SDL window (For SDL frontend) // So we just call initGraphicsContextInternal for both -void RendererGL::initGraphicsContext([[maybe_unused]] SDL_Window* window) { initGraphicsContextInternal(); } +void RendererGL::initGraphicsContext([[maybe_unused]] void* context) { initGraphicsContextInternal(); } // Set up the OpenGL blending context to match the emulated PICA void RendererGL::setupBlending() { diff --git a/src/core/renderer_mtl/renderer_mtl.cpp b/src/core/renderer_mtl/renderer_mtl.cpp index 71cdd616..8f924d43 100644 --- a/src/core/renderer_mtl/renderer_mtl.cpp +++ b/src/core/renderer_mtl/renderer_mtl.cpp @@ -10,8 +10,8 @@ #include "PICA/gpu.hpp" #include "PICA/pica_hash.hpp" -#include "screen_layout.hpp" #include "SDL_metal.h" +#include "screen_layout.hpp" using namespace PICA; @@ -57,9 +57,7 @@ void RendererMTL::reset() { colorRenderTargetCache.reset(); } -void RendererMTL::setMTKLayer(void* layer) { - metalLayer = (CA::MetalLayer*)layer; -} +void RendererMTL::setMTKLayer(void* layer) { metalLayer = (CA::MetalLayer*)layer; } void RendererMTL::display() { CA::MetalDrawable* drawable = metalLayer->nextDrawable(); @@ -151,13 +149,13 @@ void RendererMTL::display() { drawable->release(); } -void RendererMTL::initGraphicsContext(SDL_Window* window) { - // On iOS, the SwiftUI side handles the MetalLayer -#ifdef PANDA3DS_IOS +void RendererMTL::initGraphicsContext(void* window) { + // On Qt and IOS, the frontend handles the MetalLayer +#if defined(PANDA3DS_FRONTEND_QT) || defined(PANDA3DS_IOS) device = MTL::CreateSystemDefaultDevice(); #else // TODO: what should be the type of the view? - void* view = SDL_Metal_CreateView(window); + void* view = SDL_Metal_CreateView((SDL_Window*)window); metalLayer = (CA::MetalLayer*)SDL_Metal_GetLayer(view); device = MTL::CreateSystemDefaultDevice(); metalLayer->setDevice(device); diff --git a/src/core/renderer_null/renderer_null.cpp b/src/core/renderer_null/renderer_null.cpp index 4be9d089..4db2696f 100644 --- a/src/core/renderer_null/renderer_null.cpp +++ b/src/core/renderer_null/renderer_null.cpp @@ -6,7 +6,7 @@ RendererNull::~RendererNull() {} void RendererNull::reset() {} void RendererNull::display() {} -void RendererNull::initGraphicsContext(SDL_Window* window) {} +void RendererNull::initGraphicsContext(void* context) {} void RendererNull::clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) {} void RendererNull::displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) {} void RendererNull::textureCopy(u32 inputAddr, u32 outputAddr, u32 totalBytes, u32 inputSize, u32 outputSize, u32 flags) {} diff --git a/src/core/renderer_sw/renderer_sw.cpp b/src/core/renderer_sw/renderer_sw.cpp index 86b6032f..a117e373 100644 --- a/src/core/renderer_sw/renderer_sw.cpp +++ b/src/core/renderer_sw/renderer_sw.cpp @@ -7,7 +7,7 @@ RendererSw::~RendererSw() {} void RendererSw::reset() { printf("RendererSW: Unimplemented reset call\n"); } void RendererSw::display() { printf("RendererSW: Unimplemented display call\n"); } -void RendererSw::initGraphicsContext(SDL_Window* window) { printf("RendererSW: Unimplemented initGraphicsContext call\n"); } +void RendererSw::initGraphicsContext(void* context) { printf("RendererSW: Unimplemented initGraphicsContext call\n"); } void RendererSw::clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 control) { printf("RendererSW: Unimplemented clearBuffer call\n"); } void RendererSw::displayTransfer(u32 inputAddr, u32 outputAddr, u32 inputSize, u32 outputSize, u32 flags) { diff --git a/src/core/renderer_vk/renderer_vk.cpp b/src/core/renderer_vk/renderer_vk.cpp index 57533bde..0bf9fae5 100644 --- a/src/core/renderer_vk/renderer_vk.cpp +++ b/src/core/renderer_vk/renderer_vk.cpp @@ -173,7 +173,8 @@ std::tuple createGraphicsPipeline( vk::PipelineDynamicStateCreateInfo dynamicState = {}; static vk::DynamicState dynamicStates[] = {// The viewport and scissor of the framebuffer will be dynamic at // run-time - vk::DynamicState::eViewport, vk::DynamicState::eScissor}; + vk::DynamicState::eViewport, vk::DynamicState::eScissor + }; dynamicState.dynamicStateCount = std::size(dynamicStates); dynamicState.pDynamicStates = dynamicStates; @@ -469,7 +470,8 @@ vk::RenderPass RendererVK::getRenderPass(vk::Format colorFormat, std::optional("vkGetInstanceProcAddr")); @@ -978,8 +980,8 @@ void RendererVK::initGraphicsContext(SDL_Window* window) { } // Create surface - if (window) { - if (VkSurfaceKHR newSurface; SDL_Vulkan_CreateSurface(window, instance.get(), &newSurface)) { + if (targetWindow) { + if (VkSurfaceKHR newSurface; SDL_Vulkan_CreateSurface(targetWindow, instance.get(), &newSurface)) { swapchainSurface = newSurface; } else { Helpers::warn("Error creating Vulkan surface"); @@ -1127,7 +1129,7 @@ void RendererVK::initGraphicsContext(SDL_Window* window) { vk::Extent2D swapchainExtent; { int windowWidth, windowHeight; - SDL_Vulkan_GetDrawableSize(window, &windowWidth, &windowHeight); + SDL_Vulkan_GetDrawableSize(targetWindow, &windowWidth, &windowHeight); swapchainExtent.width = windowWidth; swapchainExtent.height = windowHeight; } @@ -1275,7 +1277,8 @@ void RendererVK::initGraphicsContext(SDL_Window* window) { static vk::DescriptorSetLayoutBinding displayShaderLayout[] = { {// Just a singular texture slot - 0, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment}, + 0, vk::DescriptorType::eCombinedImageSampler, 1, vk::ShaderStageFlagBits::eFragment + }, }; if (auto createResult = Vulkan::DescriptorUpdateBatch::create(device.get()); createResult.has_value()) { @@ -1407,7 +1410,8 @@ void RendererVK::clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 co static vk::ImageSubresourceRange depthStencilRanges[2] = { vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth, 0, 1, 0, 1), - vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1)}; + vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1) + }; // Clear RenderTarget getCurrentCommandBuffer().clearDepthStencilImage( diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp index b592226b..f74f2061 100644 --- a/src/panda_qt/main_window.cpp +++ b/src/panda_qt/main_window.cpp @@ -10,6 +10,7 @@ #include "cheats.hpp" #include "input_mappings.hpp" #include "panda_qt/dsp_debugger.hpp" +#include "panda_qt/screen/screen.hpp" #include "sdl_sensors.hpp" #include "services/dsp.hpp" #include "version.hpp" @@ -25,8 +26,19 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent) resize(800, 240 * 4); show(); + const RendererType rendererType = emu->getConfig().rendererType; + usingGL = (rendererType == RendererType::OpenGL || rendererType == RendererType::Software || rendererType == RendererType::Null); + usingVk = (rendererType == RendererType::Vulkan); + usingMtl = (rendererType == RendererType::Metal); + + ScreenWidget::API api = ScreenWidget::API::OpenGL; + if (usingVk) + api = ScreenWidget::API::Vulkan; + else if (usingMtl) + api = ScreenWidget::API::Metal; + // We pass a callback to the screen widget that will be triggered every time we resize the screen - screen = new ScreenWidget([this](u32 width, u32 height) { handleScreenResize(width, height); }, this); + screen = ScreenWidget::getWidget(api, [this](u32 width, u32 height) { handleScreenResize(width, height); }, this); setCentralWidget(screen); appRunning = true; @@ -149,28 +161,29 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent) // The emulator graphics context for the thread should be initialized in the emulator thread due to how GL contexts work emuThread = std::thread([this]() { - const RendererType rendererType = emu->getConfig().rendererType; - usingGL = (rendererType == RendererType::OpenGL || rendererType == RendererType::Software || rendererType == RendererType::Null); - usingVk = (rendererType == RendererType::Vulkan); - usingMtl = (rendererType == RendererType::Metal); + switch (screen->api) { + case ScreenWidget::API::OpenGL: { + // Make GL context current for this thread, enable VSync + GL::Context* glContext = screen->getGLContext(); + glContext->MakeCurrent(); + glContext->SetSwapInterval(emu->getConfig().vsyncEnabled ? 1 : 0); - if (usingGL) { - // Make GL context current for this thread, enable VSync - GL::Context* glContext = screen->getGLContext(); - glContext->MakeCurrent(); - glContext->SetSwapInterval(emu->getConfig().vsyncEnabled ? 1 : 0); + if (glContext->IsGLES()) { + emu->getRenderer()->setupGLES(); + } - if (glContext->IsGLES()) { - emu->getRenderer()->setupGLES(); + emu->initGraphicsContext(glContext); + break; } - emu->initGraphicsContext(glContext); - } else if (usingVk) { - Helpers::panic("Vulkan on Qt is currently WIP, try the SDL frontend instead!"); - } else if (usingMtl) { - Helpers::panic("Metal on Qt currently doesn't work, try the SDL frontend instead!"); - } else { - Helpers::panic("Unsupported graphics backend for Qt frontend!"); + case ScreenWidget::API::Metal: { + emu->initGraphicsContext(nullptr); + emu->getRenderer()->setMTKLayer(screen->getMTKLayer()); + break; + } + + case ScreenWidget::API::Vulkan: Helpers::panic("Vulkan on Qt is currently WIP, try the SDL frontend instead!"); break; + default: Helpers::panic("Unsupported graphics backend for Qt frontend!"); break; } // We have to initialize controllers on the same thread they'll be polled in @@ -213,6 +226,8 @@ void MainWindow::emuThreadMainLoop() { void MainWindow::swapEmuBuffer() { if (usingGL) { screen->getGLContext()->SwapBuffers(); + } else if (usingMtl) { + // The renderer itself calls presentDrawable to swap buffers on Metal } else { Helpers::panic("[Qt] Don't know how to swap buffers for the current rendering backend :("); } @@ -290,6 +305,7 @@ MainWindow::~MainWindow() { delete aboutWindow; delete configWindow; delete cheatsEditor; + delete screen; delete luaEditor; } diff --git a/src/panda_qt/screen/metal_context.mm b/src/panda_qt/screen/metal_context.mm new file mode 100644 index 00000000..e7a508e4 --- /dev/null +++ b/src/panda_qt/screen/metal_context.mm @@ -0,0 +1,71 @@ +#import +#import +#import +#import +#import +#import + +#import "panda_qt/screen/screen_mtl.hpp" + +id metalDevice = nil; + +bool ScreenWidgetMTL::createMetalContext() { + NSView* nativeView = (NSView*)this->winId(); + // Retain the layer so that we can manually memory manage it. + CAMetalLayer* metalLayer = [[CAMetalLayer layer] retain]; + + if (!metalLayer) { + return false; + } + + metalDevice = MTLCreateSystemDefaultDevice(); + + if (!metalDevice) { + NSLog(@"Failed to create metal device"); + return false; + } + + metalLayer.device = metalDevice; + metalLayer.framebufferOnly = NO; + metalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm; + + CGFloat scale = [nativeView window].backingScaleFactor; + CGSize pointSize = nativeView.bounds.size; + + metalLayer.contentsScale = scale; + metalLayer.drawableSize = CGSizeMake(pointSize.width * scale, pointSize.height * scale); + + [nativeView setLayer:metalLayer]; + [nativeView setWantsLayer:YES]; + + CA::MetalLayer* cppLayer = (CA::MetalLayer*)metalLayer; + mtkLayer = static_cast(cppLayer); + + return true; +} + +void ScreenWidgetMTL::resizeMetalView() { + NSView* view = (NSView*)this->windowHandle()->winId(); + CAMetalLayer* metalLayer = (CAMetalLayer*)[view layer]; + + if (metalLayer) { + metalLayer.drawableSize = CGSizeMake(surfaceWidth, surfaceHeight); + } +} + +ScreenWidgetMTL::~ScreenWidgetMTL() { + if (mtkLayer) { + CAMetalLayer* metalLayer = (__bridge CAMetalLayer*)static_cast(mtkLayer); + + NSView* view = (NSView*)this->winId(); + [view setLayer:nil]; + [view setWantsLayer:NO]; + + // Release Metal device and layer + metalLayer.device = nil; + [metalLayer release]; + [metalDevice release]; + + mtkLayer = nullptr; + } +} \ No newline at end of file diff --git a/src/panda_qt/screen.cpp b/src/panda_qt/screen/screen.cpp similarity index 66% rename from src/panda_qt/screen.cpp rename to src/panda_qt/screen/screen.cpp index 0876bb71..94835284 100644 --- a/src/panda_qt/screen.cpp +++ b/src/panda_qt/screen/screen.cpp @@ -1,10 +1,12 @@ +#ifdef PANDA3DS_ENABLE_OPENGL #include "opengl.hpp" +#endif // opengl.hpp must be included at the very top. This comment exists to make clang-format not reorder it :p + #include #include #include #include -#include #include #include @@ -12,16 +14,16 @@ #include #endif -#include "panda_qt/screen.hpp" +#include "panda_qt/screen/screen.hpp" +#include "panda_qt/screen/screen_gl.hpp" +#include "panda_qt/screen/screen_mtl.hpp" -// OpenGL screen widget, based on https://github.com/stenzek/duckstation/blob/master/src/duckstation-qt/displaywidget.cpp +// Screen widget, based on https://github.com/stenzek/duckstation/blob/master/src/duckstation-qt/displaywidget.cpp // and https://github.com/melonDS-emu/melonDS/blob/master/src/frontend/qt_sdl/main.cpp #ifdef PANDA3DS_ENABLE_OPENGL -ScreenWidget::ScreenWidget(ResizeCallback resizeCallback, QWidget* parent) : QWidget(parent), resizeCallback(resizeCallback) { +ScreenWidget::ScreenWidget(API api, ResizeCallback resizeCallback, QWidget* parent) : api(api), QWidget(parent), resizeCallback(resizeCallback) { // Create a native window for use with our graphics API of choice - resize(800, 240 * 4); - setAutoFillBackground(false); setAttribute(Qt::WA_NativeWindow, true); setAttribute(Qt::WA_NoSystemBackground, true); @@ -29,11 +31,8 @@ ScreenWidget::ScreenWidget(ResizeCallback resizeCallback, QWidget* parent) : QWi setAttribute(Qt::WA_KeyCompression, false); setFocusPolicy(Qt::StrongFocus); setMouseTracking(true); - show(); - if (!createGLContext()) { - Helpers::panic("Failed to create GL context for display"); - } + // The graphics context, as well as resizing and showing the widget, is handled by the screen backend } void ScreenWidget::resizeEvent(QResizeEvent* event) { @@ -48,18 +47,7 @@ void ScreenWidget::resizeEvent(QResizeEvent* event) { } reloadScreenCoordinates(); - - // This will call take care of calling resizeSurface from the emulator thread - resizeCallback(surfaceWidth, surfaceHeight); -} - -// Note: This will run on the emulator thread, we don't want any Qt calls happening there. -void ScreenWidget::resizeSurface(u32 width, u32 height) { - if (previousWidth != width || previousHeight != height) { - if (glContext) { - glContext->ResizeSurface(width, height); - } - } + resizeDisplay(); } void ScreenWidget::reloadScreenCoordinates() { @@ -73,30 +61,6 @@ void ScreenWidget::reloadScreenLayout(ScreenLayout::Layout newLayout, float newT reloadScreenCoordinates(); } -bool ScreenWidget::createGLContext() { - // List of GL context versions we will try. Anything 4.1+ is good for desktop OpenGL, and 3.1+ for OpenGL ES - static constexpr std::array versionsToTry = { - GL::Context::Version{GL::Context::Profile::Core, 4, 6}, GL::Context::Version{GL::Context::Profile::Core, 4, 5}, - GL::Context::Version{GL::Context::Profile::Core, 4, 4}, GL::Context::Version{GL::Context::Profile::Core, 4, 3}, - GL::Context::Version{GL::Context::Profile::Core, 4, 2}, GL::Context::Version{GL::Context::Profile::Core, 4, 1}, - GL::Context::Version{GL::Context::Profile::ES, 3, 2}, GL::Context::Version{GL::Context::Profile::ES, 3, 1}, - }; - - std::optional windowInfo = getWindowInfo(); - if (windowInfo.has_value()) { - this->windowInfo = *windowInfo; - - glContext = GL::Context::Create(*getWindowInfo(), versionsToTry); - if (glContext == nullptr) { - return false; - } - - glContext->DoneCurrent(); - } - - return glContext != nullptr; -} - qreal ScreenWidget::devicePixelRatioFromScreen() const { const QScreen* screenForRatio = windowHandle()->screen(); if (!screenForRatio) { @@ -156,3 +120,15 @@ std::optional ScreenWidget::getWindowInfo() { return wi; } #endif + +ScreenWidget* ScreenWidget::getWidget(API api, ResizeCallback resizeCallback, QWidget* parent) { + if (api == API::OpenGL) { + return new ScreenWidgetGL(api, resizeCallback, parent); + } else if (api == API::Metal) { + return new ScreenWidgetMTL(api, resizeCallback, parent); + } else if (api == API::Vulkan) { + Helpers::panic("Vulkan is not yet supported on Panda3DS-Qt. Try SDL instead"); + } else { + Helpers::panic("ScreenWidget::getWidget: Unimplemented graphics API"); + } +} \ No newline at end of file diff --git a/src/panda_qt/screen/screen_gl.cpp b/src/panda_qt/screen/screen_gl.cpp new file mode 100644 index 00000000..0d737f94 --- /dev/null +++ b/src/panda_qt/screen/screen_gl.cpp @@ -0,0 +1,64 @@ +#include "panda_qt/screen/screen_gl.hpp" + +#include + +#ifdef PANDA3DS_ENABLE_OPENGL +ScreenWidgetGL::ScreenWidgetGL(API api, ResizeCallback resizeCallback, QWidget* parent) : ScreenWidget(api, resizeCallback, parent) { + // On Wayland + OpenGL, we have to show the window before we can create a graphics context. + resize(800, 240 * 4); + show(); + + if (!createContext()) { + Helpers::panic("Failed to create GL context for display"); + } +} + +bool ScreenWidgetGL::createContext() { + // List of GL context versions we will try. Anything 4.1+ is good for desktop OpenGL, and 3.1+ for OpenGL ES + static constexpr std::array versionsToTry = { + GL::Context::Version{GL::Context::Profile::Core, 4, 6}, GL::Context::Version{GL::Context::Profile::Core, 4, 5}, + GL::Context::Version{GL::Context::Profile::Core, 4, 4}, GL::Context::Version{GL::Context::Profile::Core, 4, 3}, + GL::Context::Version{GL::Context::Profile::Core, 4, 2}, GL::Context::Version{GL::Context::Profile::Core, 4, 1}, + GL::Context::Version{GL::Context::Profile::ES, 3, 2}, GL::Context::Version{GL::Context::Profile::ES, 3, 1}, + }; + + std::optional windowInfo = getWindowInfo(); + if (windowInfo.has_value()) { + this->windowInfo = *windowInfo; + + glContext = GL::Context::Create(*getWindowInfo(), versionsToTry); + if (glContext == nullptr) { + return false; + } + + glContext->DoneCurrent(); + } + + return glContext != nullptr; +} + +void ScreenWidgetGL::resizeDisplay() { + // This will call take care of calling resizeSurface from the emulator thread, as the GL renderer must resize from the emu thread + resizeCallback(surfaceWidth, surfaceHeight); +} + +// Note: This will run on the emulator thread, we don't want any Qt calls happening there. +void ScreenWidgetGL::resizeSurface(u32 width, u32 height) { + if (previousWidth != width || previousHeight != height) { + if (glContext) { + glContext->ResizeSurface(width, height); + } + } +} + +GL::Context* ScreenWidgetGL::getGLContext() { return glContext.get(); } +#else +ScreenWidgetGL::ScreenWidgetGL(API api, ResizeCallback resizeCallback, QWidget* parent) : ScreenWidget(api, resizeCallback, parent) { + Helpers::panic("OpenGL renderer not supported. Make sure you've compiled with OpenGL support and that you're on a compatible platform"); +} + +GL::Context* ScreenWidgetGL::getGLContext() { nullptr; } +bool ScreenWidgetGL::createContext() { return false; } +void ScreenWidgetGL::resizeDisplay() {} +void ScreenWidgetGL::resizeSurface(u32 width, u32 height) {} +#endif \ No newline at end of file diff --git a/src/panda_qt/screen/screen_mtl.cpp b/src/panda_qt/screen/screen_mtl.cpp new file mode 100644 index 00000000..472b166b --- /dev/null +++ b/src/panda_qt/screen/screen_mtl.cpp @@ -0,0 +1,33 @@ +#include "panda_qt/screen/screen_mtl.hpp" + +#ifdef PANDA3DS_ENABLE_METAL +ScreenWidgetMTL::ScreenWidgetMTL(API api, ResizeCallback resizeCallback, QWidget* parent) : ScreenWidget(api, resizeCallback, parent) { + if (!createContext()) { + Helpers::panic("Failed to create Metal context for display"); + } + + resize(800, 240 * 4); + show(); +} + +void ScreenWidgetMTL::resizeDisplay() { + resizeMetalView(); + resizeCallback(surfaceWidth, surfaceHeight); +} + +bool ScreenWidgetMTL::createContext() { return createMetalContext(); } +void* ScreenWidgetMTL::getMTKLayer() { return mtkLayer; } + +#else +ScreenWidgetMTL::ScreenWidgetMTL(API api, ResizeCallback resizeCallback, QWidget* parent) : ScreenWidget(api, resizeCallback, parent) { + Helpers::panic("Metal renderer not supported. Make sure you've compiled with Metal support and that you're on a compatible platform"); +} + +ScreenWidgetMTL::~ScreenWidgetMTL() {} +bool ScreenWidgetMTL::createContext() { return false; } +bool ScreenWidgetMTL::createMetalContext() { return false; } +void* ScreenWidgetMTL::getMTKLayer() { return nullptr; } + +void ScreenWidgetMTL::resizeDisplay() {} +void ScreenWidgetMTL::resizeMetalView() {} +#endif \ No newline at end of file From 948ae5ef4a4911cafec66792fcb30165f9ed3141 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sun, 27 Jul 2025 08:12:11 +0300 Subject: [PATCH 17/27] Qt: Fix ScreenWidgetGL when OpenGL is disabled --- src/panda_qt/screen/screen_gl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panda_qt/screen/screen_gl.cpp b/src/panda_qt/screen/screen_gl.cpp index 0d737f94..87cb2738 100644 --- a/src/panda_qt/screen/screen_gl.cpp +++ b/src/panda_qt/screen/screen_gl.cpp @@ -57,8 +57,8 @@ ScreenWidgetGL::ScreenWidgetGL(API api, ResizeCallback resizeCallback, QWidget* Helpers::panic("OpenGL renderer not supported. Make sure you've compiled with OpenGL support and that you're on a compatible platform"); } -GL::Context* ScreenWidgetGL::getGLContext() { nullptr; } +GL::Context* ScreenWidgetGL::getGLContext() { return nullptr; } bool ScreenWidgetGL::createContext() { return false; } void ScreenWidgetGL::resizeDisplay() {} void ScreenWidgetGL::resizeSurface(u32 width, u32 height) {} -#endif \ No newline at end of file +#endif From a8ebc71f11e77770a5cefc6b2e1d8c830c59441b Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Mon, 28 Jul 2025 19:01:34 +0300 Subject: [PATCH 18/27] Fix nits --- src/core/renderer_mtl/renderer_mtl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/renderer_mtl/renderer_mtl.cpp b/src/core/renderer_mtl/renderer_mtl.cpp index 8f924d43..adee8f3c 100644 --- a/src/core/renderer_mtl/renderer_mtl.cpp +++ b/src/core/renderer_mtl/renderer_mtl.cpp @@ -150,7 +150,7 @@ void RendererMTL::display() { } void RendererMTL::initGraphicsContext(void* window) { - // On Qt and IOS, the frontend handles the MetalLayer + // On Qt and iOS, the frontend handles the Metal layer #if defined(PANDA3DS_FRONTEND_QT) || defined(PANDA3DS_IOS) device = MTL::CreateSystemDefaultDevice(); #else From 21c25d2fb81d40804f9cc9f32292d154c9f758d8 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 29 Jul 2025 03:55:00 +0300 Subject: [PATCH 19/27] AAC: Remove unused code --- src/core/audio/aac_decoder.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/audio/aac_decoder.cpp b/src/core/audio/aac_decoder.cpp index af88485c..58cebda6 100644 --- a/src/core/audio/aac_decoder.cpp +++ b/src/core/audio/aac_decoder.cpp @@ -45,8 +45,6 @@ void AAC::Decoder::decode(AAC::Message& response, const AAC::Message& request, A std::array frame; std::array, 2> audioStreams; - bool queriedStreamInfo = false; - while (bytesValid != 0) { if (aacDecoder_Fill(decoderHandle, &input, &bufferSize, &bytesValid) != AAC_DEC_OK) { Helpers::warn("Failed to fill AAC decoder with samples"); @@ -143,4 +141,4 @@ AAC::Decoder::~Decoder() { aacDecoder_Close(decoderHandle); decoderHandle = nullptr; } -} \ No newline at end of file +} From 115368491fba78523dfdcaafec7b92fd74c158fa Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 30 Jul 2025 09:41:46 +0300 Subject: [PATCH 20/27] Libretro: Add ZL/ZR support (#796) * iOS: Remove unused hidService * Libretro: Add ZL/ZR support * Test build: Create venv * Install python3-venv package * Update Test_Build.yml --- .github/workflows/Test_Build.yml | 4 +- src/ios_driver.mm | 2 - src/libretro_core.cpp | 82 ++++++++++---------------------- 3 files changed, 27 insertions(+), 61 deletions(-) diff --git a/.github/workflows/Test_Build.yml b/.github/workflows/Test_Build.yml index 54bef27b..edfa9fa9 100644 --- a/.github/workflows/Test_Build.yml +++ b/.github/workflows/Test_Build.yml @@ -16,8 +16,10 @@ jobs: - name: Install and update packages run: | - apt-get -y install python3 python3-pip p7zip-full libarchive13 + apt-get -y install python3 python3-pip python3-venv p7zip-full libarchive13 python3 --version + python3 -m venv venv + . ./venv/bin/activate python3 -m pip install --upgrade pip setuptools - name: Compile tests diff --git a/src/ios_driver.mm b/src/ios_driver.mm index cb98b269..87bd057a 100644 --- a/src/ios_driver.mm +++ b/src/ios_driver.mm @@ -15,13 +15,11 @@ extern "C" { #define IOS_EXPORT extern "C" __attribute__((visibility("default"))) std::unique_ptr emulator = nullptr; -HIDService* hidService = nullptr; IOS_EXPORT void iosCreateEmulator() { printf("Creating emulator\n"); emulator = std::make_unique(); - hidService = &emulator->getServiceManager().getHID(); emulator->initGraphicsContext(nullptr); } diff --git a/src/libretro_core.cpp b/src/libretro_core.cpp index 4786b317..aca8330d 100644 --- a/src/libretro_core.cpp +++ b/src/libretro_core.cpp @@ -1,12 +1,11 @@ -#include +#include + #include #include -#include - -#include -#include -#include +#include "emulator.hpp" +#include "renderer_gl/renderer_gl.hpp" +#include "version.hpp" static retro_environment_t envCallback; static retro_video_refresh_t videoCallback; @@ -23,17 +22,11 @@ static bool usingGLES = false; std::unique_ptr emulator; RendererGL* renderer; -std::filesystem::path Emulator::getConfigPath() { - return std::filesystem::path(savePath / "config.toml"); -} +std::filesystem::path Emulator::getConfigPath() { return std::filesystem::path(savePath / "config.toml"); } +std::filesystem::path Emulator::getAppDataRoot() { return std::filesystem::path(savePath / "Emulator Files"); } -std::filesystem::path Emulator::getAppDataRoot() { - return std::filesystem::path(savePath / "Emulator Files"); -} - -static void* getGLProcAddress(const char* name) { - return (void*)hwRender.get_proc_address(name); -} +static void* getGLProcAddress(const char* name) { return (void*)hwRender.get_proc_address(name); } +static void videoDestroyContext() { emulator->deinitGraphicsContext(); } static void videoResetContext() { if (usingGLES) { @@ -53,10 +46,6 @@ static void videoResetContext() { emulator->initGraphicsContext(nullptr); } -static void videoDestroyContext() { - emulator->deinitGraphicsContext(); -} - static bool setHWRender(retro_hw_context_type type) { hwRender.context_type = type; hwRender.context_reset = videoResetContext; @@ -159,13 +148,8 @@ static int fetchVariableInt(std::string key, int def) { return 0; } -static bool fetchVariableBool(std::string key, bool def) { - return fetchVariable(key, def ? "enabled" : "disabled") == "enabled"; -} - -static int fetchVariableRange(std::string key, int min, int max) { - return std::clamp(fetchVariableInt(key, min), min, max); -} +static bool fetchVariableBool(std::string key, bool def) { return fetchVariable(key, def ? "enabled" : "disabled") == "enabled"; } +static int fetchVariableRange(std::string key, int min, int max) { return std::clamp(fetchVariableInt(key, min), min, max); } static void configInit() { static const retro_variable values[] = { @@ -259,27 +243,13 @@ void retro_get_system_av_info(retro_system_av_info* info) { info->timing.sample_rate = 32768; } -void retro_set_environment(retro_environment_t cb) { - envCallback = cb; -} - -void retro_set_video_refresh(retro_video_refresh_t cb) { - videoCallback = cb; -} - -void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { - audioBatchCallback = cb; -} +void retro_set_environment(retro_environment_t cb) { envCallback = cb; } +void retro_set_video_refresh(retro_video_refresh_t cb) { videoCallback = cb; } +void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { audioBatchCallback = cb; } void retro_set_audio_sample(retro_audio_sample_t cb) {} - -void retro_set_input_poll(retro_input_poll_t cb) { - inputPollCallback = cb; -} - -void retro_set_input_state(retro_input_state_t cb) { - inputStateCallback = cb; -} +void retro_set_input_poll(retro_input_poll_t cb) { inputPollCallback = cb; } +void retro_set_input_state(retro_input_state_t cb) { inputStateCallback = cb; } void retro_init() { enum retro_pixel_format xrgb888 = RETRO_PIXEL_FORMAT_XRGB8888; @@ -297,9 +267,7 @@ void retro_init() { emulator = std::make_unique(); } -void retro_deinit() { - emulator = nullptr; -} +void retro_deinit() { emulator = nullptr; } bool retro_load_game(const retro_game_info* game) { configInit(); @@ -325,9 +293,8 @@ void retro_unload_game() { renderer = nullptr; } -void retro_reset() { - emulator->reset(Emulator::ReloadOption::Reload); -} +void retro_reset() { emulator->reset(Emulator::ReloadOption::Reload); } +void retro_cheat_reset() { emulator->getCheats().reset(); } void retro_run() { configCheckVariables(); @@ -345,13 +312,16 @@ void retro_run() { hid.setKey(HID::Keys::Y, getButtonState(RETRO_DEVICE_ID_JOYPAD_Y)); hid.setKey(HID::Keys::L, getButtonState(RETRO_DEVICE_ID_JOYPAD_L)); hid.setKey(HID::Keys::R, getButtonState(RETRO_DEVICE_ID_JOYPAD_R)); + hid.setKey(HID::Keys::ZL, getButtonState(RETRO_DEVICE_ID_JOYPAD_L2)); + hid.setKey(HID::Keys::ZR, getButtonState(RETRO_DEVICE_ID_JOYPAD_R2)); + hid.setKey(HID::Keys::Start, getButtonState(RETRO_DEVICE_ID_JOYPAD_START)); hid.setKey(HID::Keys::Select, getButtonState(RETRO_DEVICE_ID_JOYPAD_SELECT)); hid.setKey(HID::Keys::Up, getButtonState(RETRO_DEVICE_ID_JOYPAD_UP)); hid.setKey(HID::Keys::Down, getButtonState(RETRO_DEVICE_ID_JOYPAD_DOWN)); hid.setKey(HID::Keys::Left, getButtonState(RETRO_DEVICE_ID_JOYPAD_LEFT)); hid.setKey(HID::Keys::Right, getButtonState(RETRO_DEVICE_ID_JOYPAD_RIGHT)); - // TODO: N3DS buttons + // TODO: C-Stick // Get analog values for the left analog stick (Right analog stick is N3DS-only and unimplemented) float xLeft = getAxisState(RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X); @@ -443,8 +413,4 @@ void retro_cheat_set(uint index, bool enabled, const char* code) { } else { emulator->getCheats().disableCheat(id); } -} - -void retro_cheat_reset() { - emulator->getCheats().reset(); -} +} \ No newline at end of file From 9d04f40c3f65bc09e2293fd24e9779b32d4190b5 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 30 Jul 2025 14:23:28 +0300 Subject: [PATCH 21/27] HID: Update comments --- src/core/services/hid.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/services/hid.cpp b/src/core/services/hid.cpp index 695e0329..c149a2a3 100644 --- a/src/core/services/hid.cpp +++ b/src/core/services/hid.cpp @@ -118,7 +118,6 @@ void HIDService::getGyroscopeCoefficient(u32 messagePointer) { // The volume here is in the range [0, 0x3F] // It is read directly from I2C Device 3 register 0x09 -// Since we currently do not have audio, set the volume a bit below max (0x30) void HIDService::getSoundVolume(u32 messagePointer) { log("HID::GetSoundVolume\n"); constexpr u8 volume = 0x30; @@ -237,7 +236,7 @@ void HIDService::updateInputs(u64 currentTick) { // For some reason, the original developers decided to signal the HID events each time the OS rescanned inputs // Rather than once every time the state of a key, or the accelerometer state, etc is updated - // This means that the OS will signal the events even if literally nothing happened + // This means that the OS will signal the events even if nothing happened // Some games such as Majora's Mask rely on this behaviour. if (eventsInitialized) { for (auto& e : events) { From 2699dcd82e20cb95e45845374bb443ac176fde13 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 31 Jul 2025 17:04:15 +0300 Subject: [PATCH 22/27] Build Android libretro core on CI (#797) * Attempt to build Android libretro core on CI * Hopefully fix Android libretro compilation * Try fix libretro android again * Fix SO name * Rename .so again * Nit * Update Android Libretro build * Remove ccache for Android libretro --- .github/workflows/Hydra_Build.yml | 29 +++++++++++++++++++++++++++++ src/jni_driver.cpp | 10 +++++----- src/libretro_core.cpp | 4 ++-- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Hydra_Build.yml b/.github/workflows/Hydra_Build.yml index dbdfbf1b..66cd2e27 100644 --- a/.github/workflows/Hydra_Build.yml +++ b/.github/workflows/Hydra_Build.yml @@ -213,3 +213,32 @@ jobs: path: | ${{github.workspace}}/build/panda3ds_libretro.so ${{github.workspace}}/docs/libretro/panda3ds_libretro.info + + ARM-Libretro-Android: + runs-on: ubuntu-24.04 + + steps: + - uses: actions/checkout@v4 + - name: Fetch submodules + run: git submodule update --init --recursive + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build -DBUILD_LIBRETRO_CORE=1 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DENABLE_VULKAN=0 -DENABLE_USER_BUILD=ON -DCMAKE_CXX_FLAGS="-march=armv8-a+crypto" + + - name: Build + run: | + # Apply patch for GLES compatibility + git apply ./.github/gles.patch + # Build the project with CMake + cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }} + + # Strip the generated library + ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip --strip-unneeded ./build/panda3ds_libretro.so + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: Android arm64 Libretro core + path: | + ${{github.workspace}}/build/panda3ds_libretro.so + ${{github.workspace}}/docs/libretro/panda3ds_libretro.info diff --git a/src/jni_driver.cpp b/src/jni_driver.cpp index 6a156360..7274c9c4 100644 --- a/src/jni_driver.cpp +++ b/src/jni_driver.cpp @@ -10,11 +10,11 @@ #include "android_utils.hpp" #include "sdl_sensors.hpp" -std::unique_ptr emulator = nullptr; -HIDService* hidService = nullptr; -RendererGL* renderer = nullptr; -bool romLoaded = false; -JavaVM* jvm = nullptr; +static std::unique_ptr emulator = nullptr; +static HIDService* hidService = nullptr; +static RendererGL* renderer = nullptr; +static bool romLoaded = false; +static JavaVM* jvm = nullptr; jclass alberClass; jmethodID alberClassOpenDocument; diff --git a/src/libretro_core.cpp b/src/libretro_core.cpp index aca8330d..b44687b2 100644 --- a/src/libretro_core.cpp +++ b/src/libretro_core.cpp @@ -19,8 +19,8 @@ static std::filesystem::path savePath; static bool screenTouched = false; static bool usingGLES = false; -std::unique_ptr emulator; -RendererGL* renderer; +static std::unique_ptr emulator; +static RendererGL* renderer; std::filesystem::path Emulator::getConfigPath() { return std::filesystem::path(savePath / "config.toml"); } std::filesystem::path Emulator::getAppDataRoot() { return std::filesystem::path(savePath / "Emulator Files"); } From 3e2553e6c71299551560d2f3aefe050c2c777b38 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Thu, 31 Jul 2025 13:52:40 -0400 Subject: [PATCH 23/27] libretro: enable android builds on gitlab (#799) --- .gitlab-ci.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94ea8193..5fb1065c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,10 +102,17 @@ libretro-build-osx-arm64: # - .core-defs # Android ARMv8a -# android-arm64-v8a: -# extends: -# - .libretro-android-cmake-arm64-v8a -# - .core-defs +android-arm64-v8a: + extends: + - .libretro-android-cmake-arm64-v8a + - .core-defs + before_script: + - export NUMPROC=$(($(nproc)/5)) + - export ANDROID_NDK_VERSION=26.2.11394342 + - export NDK_ROOT=/android-sdk-linux/ndk/$ANDROID_NDK_VERSION + - /android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "ndk;$ANDROID_NDK_VERSION" + - /android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3" + - export PATH=/android-sdk-linux/cmake/3.30.3/bin:$PATH # Android 64-bit x86 # android-x86_64: From 5ebee8ea7211796b271b18d7a1030b24b92e625e Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Mon, 4 Aug 2025 00:22:51 +0300 Subject: [PATCH 24/27] SOC: Demote panic to warn --- src/core/services/soc.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/services/soc.cpp b/src/core/services/soc.cpp index 4ad546b0..4e74c5c3 100644 --- a/src/core/services/soc.cpp +++ b/src/core/services/soc.cpp @@ -15,7 +15,11 @@ void SOCService::handleSyncRequest(u32 messagePointer) { const u32 command = mem.read32(messagePointer); switch (command) { case SOCCommands::InitializeSockets: initializeSockets(messagePointer); break; - default: Helpers::panic("SOC service requested. Command: %08X\n", command); + + default: + Helpers::warn("SOC service requested. Command: %08X\n", command); + mem.write32(messagePointer + 4, Result::Success); + break; } } @@ -30,4 +34,4 @@ void SOCService::initializeSockets(u32 messagePointer) { mem.write32(messagePointer, IPC::responseHeader(0x01, 1, 0)); mem.write32(messagePointer + 4, Result::Success); -} \ No newline at end of file +} From 6d1ef7cb4ffdb0f048ca55df502a3f37d925ae15 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 7 Aug 2025 20:18:09 +0300 Subject: [PATCH 25/27] Memory rework pt 2 (#801) * Memory: Rework FCRAM management entirely Disables a lot of functionality... but I didn't want to commit too much to this commit Also reworks virtual memory management somewhat (but needs more work) * Accurately handle MemoryState for virtual memory Previously all non-free blocks were marked as Reserved * Memory: Consolidate state and permission changes Can now use a single function to change either state, permissions, or both Also merge vmem blocks that have the same state and permissions * Memory: Fix double reset for FCRAM manager Fix minor bug with permission tracking * Memory: Implement Protect operation in ControlMemory * Memory: Implement Unmap in ControlMemory Also do a sanity check to make sure the memory region is free for linear allocations * Memory: Make TLS only 0x200 bytes for each thread Also move TLS to Base region * RO: Unmap CROs when unloaded Thanks @noumidev * Kernel: Return used app memory for Commit ResourceLimit Not quite correct, but nothing to be done until process management is improved Also remove the stack limit for CXIs (thanks amogus) * Kernel: Report used app memory for GetProcessInfo 2 Not really correct, but it should be accurate for applications at least * Formatting changes * Initial fastmem support * PCSX2 fastmem depression * Move away from PCSX2 fastmem * Add enum_flag_ops.hpp * Finally building on Windows * Almost got a PoC * Fix arm64 builds * This somehow works * This also works... * Properly fix fastmem * Add free region manager * Update boost * Add ScopeExit * Comment out asserts on Linux/Mac/Android * Comment out ASSERT_MSG asserts too * Fix derp * Attempt to fix Android * Disable fastmem on Android * Fix Android again maybe pt 2 * android pls * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * Update host_memory.cpp * Properly reset memory arena on reset * Proper ashmem code for Android * more * Add temporary Android buildjet script for faster prototype builds * Fix fastmem (again) * Clean up shared memory * Remove Android BuildJet runner * a * Revert "a" This reverts commit 5443ad6f2a794c19c9b1a1567ca1c7f58eed78cd. * Re-add ELF support * Re-add 3DSX support * GetSystemInfo, GetProcessInfo: Memory sizes should be in bytes * Update Boost * Update metal-cpp * Fix metal renderer compilation * Fix fastmem mapping * Clean up fastmem code * Fix oopsie again * Emulator: Reorder struct * Kernel types: Cleanup * Cleanup * More cleanup * Make invalid mprotects warn instead of panicking * Add setting for toggling fastmem * More cleanup * Properly initialize BSS to zeroes * Remove unused code * Formatting * Cleanup * Memory/CRO: Workaround for Pokemon XY * NCSD loader: Fix BSS (again) * NCSD loader: Fix BSS (again) (again) * More memory fixes * Memory: Remove unused code * FS: Warn on unimplemented functions instead of panic * Update software_keyboard.cpp * Libretro: Add fastmem option * FRD: Stub SaveLocalAccountData --------- Co-authored-by: PSI-Rockin --- CMakeLists.txt | 14 +- include/config.hpp | 4 +- include/dynamic_library.hpp | 73 ++ include/emulator.hpp | 5 +- include/enum_flag_ops.hpp | 60 ++ include/kernel/fcram.hpp | 63 ++ include/kernel/kernel.hpp | 4 + include/kernel/kernel_types.hpp | 222 +++--- include/memory.hpp | 190 +++-- include/renderer_mtl/pica_to_mtl.hpp | 13 +- include/services/frd.hpp | 1 + src/config.cpp | 2 + src/core/CPU/cpu_dynarmic.cpp | 7 + src/core/applets/software_keyboard.cpp | 2 +- src/core/kernel/fcram.cpp | 102 +++ src/core/kernel/idle_thread.cpp | 12 +- src/core/kernel/kernel.cpp | 10 +- src/core/kernel/memory_management.cpp | 66 +- src/core/kernel/resource_limits.cpp | 4 +- src/core/loader/3dsx.cpp | 26 +- src/core/loader/elf.cpp | 10 +- src/core/loader/ncsd.cpp | 50 +- src/core/memory.cpp | 447 ++++++----- src/core/renderer_mtl/pica_to_mtl.cpp | 30 +- src/core/services/frd.cpp | 9 + src/core/services/fs.cpp | 6 +- src/core/services/ldr_ro.cpp | 102 ++- src/dynamic_library.cpp | 96 +++ src/emulator.cpp | 36 +- src/libretro_core.cpp | 4 +- src/panda_qt/config_window.cpp | 4 + third_party/boost | 2 +- third_party/host_memory/LICENSE.txt | 674 ++++++++++++++++ third_party/host_memory/host_memory.cpp | 753 ++++++++++++++++++ .../include/host_memory/free_region_manager.h | 55 ++ .../include/host_memory/host_memory.h | 75 ++ .../include/host_memory/scope_exit.h | 78 ++ .../include/host_memory/virtual_buffer.h | 68 ++ third_party/host_memory/virtual_buffer.cpp | 46 ++ third_party/metal-cpp | 2 +- 40 files changed, 2901 insertions(+), 526 deletions(-) create mode 100644 include/dynamic_library.hpp create mode 100644 include/enum_flag_ops.hpp create mode 100644 include/kernel/fcram.hpp create mode 100644 src/core/kernel/fcram.cpp create mode 100644 src/dynamic_library.cpp create mode 100644 third_party/host_memory/LICENSE.txt create mode 100644 third_party/host_memory/host_memory.cpp create mode 100644 third_party/host_memory/include/host_memory/free_region_manager.h create mode 100644 third_party/host_memory/include/host_memory/host_memory.h create mode 100644 third_party/host_memory/include/host_memory/scope_exit.h create mode 100644 third_party/host_memory/include/host_memory/virtual_buffer.h create mode 100644 third_party/host_memory/virtual_buffer.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e8e9428..8eded674 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ option(BUILD_HYDRA_CORE "Build a Hydra core" OFF) option(BUILD_LIBRETRO_CORE "Build a Libretro core" OFF) option(ENABLE_RENDERDOC_API "Build with support for Renderdoc's capture API for graphics debugging" ON) option(DISABLE_SSE4 "Build with SSE4 instructions disabled, may reduce performance" OFF) +option(ENABLE_FASTMEM "Build with support for hardware fastmem" ON) option(USE_LIBRETRO_AUDIO "Enable to use the LR audio device with the LR core. Otherwise our own device is used" OFF) option(IOS_SIMULATOR_BUILD "Compiling for IOS simulator (Set to off if compiling for a real iPhone)" ON) @@ -188,6 +189,7 @@ include_directories(third_party/toml11) include_directories(third_party/glm) include_directories(third_party/renderdoc) include_directories(third_party/duckstation) +include_directories(third_party/host_memory/include) add_subdirectory(third_party/cmrc) @@ -329,6 +331,7 @@ set(SOURCE_FILES src/emulator.cpp src/io_file.cpp src/config.cpp src/http_server.cpp src/stb_image_write.c src/core/cheats.cpp src/core/action_replay.cpp src/discord_rpc.cpp src/lua.cpp src/memory_mapped_file.cpp src/renderdoc.cpp src/frontend_settings.cpp src/miniaudio/miniaudio.cpp src/core/screen_layout.cpp + src/dynamic_library.cpp ) set(CRYPTO_SOURCE_FILES src/core/crypto/aes_engine.cpp) set(KERNEL_SOURCE_FILES src/core/kernel/kernel.cpp src/core/kernel/resource_limits.cpp @@ -337,6 +340,7 @@ set(KERNEL_SOURCE_FILES src/core/kernel/kernel.cpp src/core/kernel/resource_limi src/core/kernel/address_arbiter.cpp src/core/kernel/error.cpp src/core/kernel/file_operations.cpp src/core/kernel/directory_operations.cpp src/core/kernel/idle_thread.cpp src/core/kernel/timers.cpp + src/core/kernel/fcram.cpp ) set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services/apt.cpp src/core/services/hid.cpp src/core/services/fs.cpp src/core/services/gsp_gpu.cpp src/core/services/gsp_lcd.cpp @@ -416,7 +420,8 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/fs/archive_twl_sound.hpp include/fs/archive_card_spi.hpp include/services/ns.hpp include/audio/audio_device.hpp include/audio/audio_device_interface.hpp include/audio/libretro_audio_device.hpp include/services/ir/ir_types.hpp include/services/ir/ir_device.hpp include/services/ir/circlepad_pro.hpp include/services/service_intercept.hpp - include/screen_layout.hpp include/services/service_map.hpp include/audio/dsp_binary.hpp + include/screen_layout.hpp include/services/service_map.hpp include/audio/dsp_binary.hpp include/dynamic_library.hpp + include/enum_flag_ops.hpp include/kernel/fcram.hpp ) if(IOS) @@ -443,6 +448,9 @@ set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp third_party/cityhash/cityhash.cpp third_party/xxhash/xxhash.c + + third_party/host_memory/host_memory.cpp + third_party/host_memory/virtual_buffer.cpp ) if(ENABLE_LUAJIT AND NOT ANDROID) @@ -710,6 +718,10 @@ if(ENABLE_HTTP_SERVER) target_compile_definitions(AlberCore PRIVATE PANDA3DS_ENABLE_HTTP_SERVER=1) endif() +if(ENABLE_FASTMEM) + target_compile_definitions(AlberCore PRIVATE PANDA3DS_HARDWARE_FASTMEM=1) +endif() + # Configure frontend if(ENABLE_QT_GUI) diff --git a/include/config.hpp b/include/config.hpp index 7030a8e3..4aa4cce1 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -2,10 +2,10 @@ #include #include -#include "screen_layout.hpp" #include "audio/dsp_core.hpp" #include "frontend_settings.hpp" #include "renderer.hpp" +#include "screen_layout.hpp" #include "services/region_codes.hpp" struct AudioDeviceConfig { @@ -58,11 +58,13 @@ struct EmulatorConfig { static constexpr RendererType rendererDefault = RendererType::OpenGL; #endif + static constexpr bool enableFastmemDefault = true; static constexpr bool hashTexturesDefault = false; bool shaderJitEnabled = shaderJitDefault; bool useUbershaders = ubershaderDefault; bool accelerateShaders = accelerateShadersDefault; + bool fastmemEnabled = enableFastmemDefault; bool hashTextures = hashTexturesDefault; ScreenLayout::Layout screenLayout = ScreenLayout::Layout::Default; diff --git a/include/dynamic_library.hpp b/include/dynamic_library.hpp new file mode 100644 index 00000000..95f86920 --- /dev/null +++ b/include/dynamic_library.hpp @@ -0,0 +1,73 @@ +// SPDX-FileCopyrightText: 2019 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +namespace Common { + /** + * Provides a platform-independent interface for loading a dynamic library and retrieving symbols. + * The interface maintains an internal reference count to allow one handle to be shared between + * multiple users. + */ + class DynamicLibrary final { + public: + /// Default constructor, does not load a library. + explicit DynamicLibrary(); + + /// Automatically loads the specified library. Call IsOpen() to check validity before use. + explicit DynamicLibrary(const char* filename); + + /// Initializes the dynamic library with an already opened handle. + explicit DynamicLibrary(void* handle_); + + /// Moves the library. + DynamicLibrary(DynamicLibrary&&) noexcept; + DynamicLibrary& operator=(DynamicLibrary&&) noexcept; + + /// Delete copies, we can't copy a dynamic library. + DynamicLibrary(const DynamicLibrary&) = delete; + DynamicLibrary& operator=(const DynamicLibrary&) = delete; + + /// Closes the library. + ~DynamicLibrary(); + + /// Returns the specified library name with the platform-specific suffix added. + [[nodiscard]] static std::string getUnprefixedFilename(const char* filename); + + /// Returns the specified library name in platform-specific format. + /// Major/minor versions will not be included if set to -1. + /// If libname already contains the "lib" prefix, it will not be added again. + /// Windows: LIBNAME-MAJOR-MINOR.dll + /// Linux: libLIBNAME.so.MAJOR.MINOR + /// Mac: libLIBNAME.MAJOR.MINOR.dylib + [[nodiscard]] static std::string getVersionedFilename(const char* libname, int major = -1, int minor = -1); + + /// Returns true if a module is loaded, otherwise false. + [[nodiscard]] bool isOpen() const { return handle != nullptr; } + + /// Loads (or replaces) the handle with the specified library file name. + /// Returns true if the library was loaded and can be used. + [[nodiscard]] bool open(const char* filename); + + /// Unloads the library, any function pointers from this library are no longer valid. + void close(); + + /// Returns the address of the specified symbol (function or variable) as an untyped pointer. + /// If the specified symbol does not exist in this library, nullptr is returned. + [[nodiscard]] void* getSymbolAddress(const char* name) const; + + /// Obtains the address of the specified symbol, automatically casting to the correct type. + /// Returns true if the symbol was found and assigned, otherwise false. + template + [[nodiscard]] bool getSymbol(const char* name, T* ptr) const { + *ptr = reinterpret_cast(getSymbolAddress(name)); + return *ptr != nullptr; + } + + private: + /// Platform-dependent data type representing a dynamic library handle. + void* handle = nullptr; + }; +} // namespace Common \ No newline at end of file diff --git a/include/emulator.hpp b/include/emulator.hpp index 366f86f2..cd39f1c4 100644 --- a/include/emulator.hpp +++ b/include/emulator.hpp @@ -39,10 +39,13 @@ enum class ROMType { }; class Emulator { + // Config should be initialized before anything else EmulatorConfig config; + + Memory memory; + // We want memory to be constructed before the rest of the emulator, so it's at the top of the struct CPU cpu; GPU gpu; - Memory memory; Kernel kernel; std::unique_ptr dsp; Scheduler scheduler; diff --git a/include/enum_flag_ops.hpp b/include/enum_flag_ops.hpp new file mode 100644 index 00000000..e41eac28 --- /dev/null +++ b/include/enum_flag_ops.hpp @@ -0,0 +1,60 @@ +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +#define DECLARE_ENUM_FLAG_OPERATORS(type) \ + [[nodiscard]] constexpr type operator|(type a, type b) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(static_cast(a) | static_cast(b)); \ + } \ + [[nodiscard]] constexpr type operator&(type a, type b) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(static_cast(a) & static_cast(b)); \ + } \ + [[nodiscard]] constexpr type operator^(type a, type b) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(static_cast(a) ^ static_cast(b)); \ + } \ + [[nodiscard]] constexpr type operator<<(type a, type b) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(static_cast(a) << static_cast(b)); \ + } \ + [[nodiscard]] constexpr type operator>>(type a, type b) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(static_cast(a) >> static_cast(b)); \ + } \ + constexpr type& operator|=(type& a, type b) noexcept { \ + a = a | b; \ + return a; \ + } \ + constexpr type& operator&=(type& a, type b) noexcept { \ + a = a & b; \ + return a; \ + } \ + constexpr type& operator^=(type& a, type b) noexcept { \ + a = a ^ b; \ + return a; \ + } \ + constexpr type& operator<<=(type& a, type b) noexcept { \ + a = a << b; \ + return a; \ + } \ + constexpr type& operator>>=(type& a, type b) noexcept { \ + a = a >> b; \ + return a; \ + } \ + [[nodiscard]] constexpr type operator~(type key) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(~static_cast(key)); \ + } \ + [[nodiscard]] constexpr bool True(type key) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(key) != 0; \ + } \ + [[nodiscard]] constexpr bool False(type key) noexcept { \ + using T = std::underlying_type_t; \ + return static_cast(key) == 0; \ + } \ No newline at end of file diff --git a/include/kernel/fcram.hpp b/include/kernel/fcram.hpp new file mode 100644 index 00000000..e1690ad0 --- /dev/null +++ b/include/kernel/fcram.hpp @@ -0,0 +1,63 @@ +#pragma once +#include +#include + +#include "helpers.hpp" + +class Memory; + +enum class FcramRegion { + App = 0x100, + Sys = 0x200, + Base = 0x300, +}; + +struct FcramBlock { + u32 paddr; + s32 pages; + + FcramBlock(u32 paddr, s32 pages) : paddr(paddr), pages(pages) {} +}; + +using FcramBlockList = std::list; + +class KFcram { + struct Region { + struct Block { + s32 pages; + s32 pageOffset; + bool used; + + Block(s32 pages, u32 pageOffset) : pages(pages), pageOffset(pageOffset), used(false) {} + }; + + std::list blocks; + u32 start; + s32 pages; + s32 freePages; + + public: + Region() : start(0), pages(0) {} + void reset(u32 start, size_t size); + void alloc(std::list& out, s32 pages, bool linear); + + u32 getUsedCount(); + u32 getFreeCount(); + }; + + Memory& mem; + + Region appRegion, sysRegion, baseRegion; + uint8_t* fcram; + std::unique_ptr refs; + + public: + KFcram(Memory& memory); + void reset(size_t ramSize, size_t appSize, size_t sysSize, size_t baseSize); + void alloc(FcramBlockList& out, s32 pages, FcramRegion region, bool linear); + + void incRef(FcramBlockList& list); + void decRef(FcramBlockList& list); + + u32 getUsedCount(FcramRegion region); +}; \ No newline at end of file diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp index 3d801c7a..7bda8c0a 100644 --- a/include/kernel/kernel.hpp +++ b/include/kernel/kernel.hpp @@ -7,6 +7,7 @@ #include #include "config.hpp" +#include "fcram.hpp" #include "helpers.hpp" #include "kernel_types.hpp" #include "logger.hpp" @@ -25,6 +26,8 @@ class Kernel { CPU& cpu; Memory& mem; + KFcram fcramManager; + // The handle number for the next kernel object to be created u32 handleCounter; // A list of our OS threads, the max number of which depends on the resource limit (hardcoded 32 per process on retail it seems). @@ -247,6 +250,7 @@ class Kernel { } ServiceManager& getServiceManager() { return serviceManager; } + KFcram& getFcramManager() { return fcramManager; } Scheduler& getScheduler(); void sendGPUInterrupt(GPUInterrupt type) { serviceManager.sendGPUInterrupt(type); } diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp index a3a60c34..a55d2742 100644 --- a/include/kernel/kernel_types.hpp +++ b/include/kernel/kernel_types.hpp @@ -1,93 +1,108 @@ #pragma once #include #include + #include "fs/archive_base.hpp" #include "handles.hpp" #include "helpers.hpp" #include "result/result.hpp" enum class KernelObjectType : u8 { - AddressArbiter, Archive, Directory, File, MemoryBlock, Process, ResourceLimit, Session, Dummy, - // Bundle waitable objects together in the enum to let the compiler optimize certain checks better - Event, Mutex, Port, Semaphore, Timer, Thread + AddressArbiter, + Archive, + Directory, + File, + MemoryBlock, + Process, + ResourceLimit, + Session, + Dummy, + // Bundle waitable objects together in the enum to let the compiler optimize certain checks better + Event, + Mutex, + Port, + Semaphore, + Timer, + Thread }; enum class ResourceLimitCategory : int { - Application = 0, - SystemApplet = 1, - LibraryApplet = 2, - Misc = 3 + Application = 0, + SystemApplet = 1, + LibraryApplet = 2, + Misc = 3, }; // Reset types (for use with events and timers) enum class ResetType { - OneShot = 0, // When the primitive is signaled, it will wake up exactly one thread and will clear itself automatically. - Sticky = 1, // When the primitive is signaled, it will wake up all threads and it won't clear itself automatically. - Pulse = 2, // Only meaningful for timers: same as ONESHOT but it will periodically signal the timer instead of just once. + OneShot = 0, // When the primitive is signaled, it will wake up exactly one thread and will clear itself automatically. + Sticky = 1, // When the primitive is signaled, it will wake up all threads and it won't clear itself automatically. + Pulse = 2, // Only meaningful for timers: same as ONESHOT but it will periodically signal the timer instead of just once. }; enum class ArbitrationType { - Signal = 0, - WaitIfLess = 1, - DecrementAndWaitIfLess = 2, - WaitIfLessTimeout = 3, - DecrementAndWaitIfLessTimeout = 4 + Signal = 0, + WaitIfLess = 1, + DecrementAndWaitIfLess = 2, + WaitIfLessTimeout = 3, + DecrementAndWaitIfLessTimeout = 4, }; enum class ProcessorID : s32 { - AllCPUs = -1, - Default = -2, - - AppCore = 0, - Syscore = 1, - New3DSExtra1 = 2, - New3DSExtra2 = 3 + AllCPUs = -1, + Default = -2, + + AppCore = 0, + Syscore = 1, + New3DSExtra1 = 2, + New3DSExtra2 = 3 }; struct AddressArbiter {}; struct ResourceLimits { - HorizonHandle handle; + HorizonHandle handle; - s32 currentCommit = 0; + s32 currentCommit = 0; }; struct Process { - // Resource limits for this process - ResourceLimits limits; - // Process ID - u32 id; + // Resource limits for this process + ResourceLimits limits; + // Process ID + u32 id; - Process(u32 id) : id(id) {} + Process(u32 id) : id(id) {} }; struct Event { - // Some events (for now, only the DSP semaphore events) need to execute a callback when signalled - // This enum stores what kind of callback they should execute - enum class CallbackType : u32 { - None, DSPSemaphore, - }; + // Some events (for now, only the DSP semaphore events) need to execute a callback when signalled + // This enum stores what kind of callback they should execute + enum class CallbackType : u32 { + None, + DSPSemaphore, + }; - u64 waitlist; // A bitfield where each bit symbolizes if the thread with thread with the corresponding index is waiting on the event - ResetType resetType = ResetType::OneShot; - CallbackType callback = CallbackType::None; - bool fired = false; + u64 waitlist; // A bitfield where each bit symbolizes if the thread with thread with the corresponding index is waiting on the event + ResetType resetType = ResetType::OneShot; + CallbackType callback = CallbackType::None; + bool fired = false; - Event(ResetType resetType) : resetType(resetType), waitlist(0) {} - Event(ResetType resetType, CallbackType cb) : resetType(resetType), waitlist(0), callback(cb) {} + Event(ResetType resetType) : resetType(resetType), waitlist(0) {} + Event(ResetType resetType, CallbackType cb) : resetType(resetType), waitlist(0), callback(cb) {} }; struct Port { - static constexpr u32 maxNameLen = 11; + static constexpr u32 maxNameLen = 11; - char name[maxNameLen + 1] = {}; - bool isPublic = false; // Setting name=NULL creates a private port not accessible from svcConnectToPort. + char name[maxNameLen + 1] = {}; + bool isPublic = false; // Setting name=NULL creates a private port not accessible from svcConnectToPort. - Port(const char* name) { - // If the name is empty (ie the first char is the null terminator) then the port is private - isPublic = name[0] != '\0'; - std::strncpy(this->name, name, maxNameLen); - } + Port(const char* name) { + // If the name is empty (ie the first char is the null terminator) then the port is private + isPublic = name[0] != '\0'; + std::strncpy(this->name, name, maxNameLen); + } }; struct Session { @@ -145,92 +160,90 @@ struct Thread { }; static const char* kernelObjectTypeToString(KernelObjectType t) { - switch (t) { - case KernelObjectType::AddressArbiter: return "address arbiter"; - case KernelObjectType::Archive: return "archive"; - case KernelObjectType::Directory: return "directory"; - case KernelObjectType::Event: return "event"; - case KernelObjectType::File: return "file"; - case KernelObjectType::MemoryBlock: return "memory block"; - case KernelObjectType::Port: return "port"; - case KernelObjectType::Process: return "process"; - case KernelObjectType::ResourceLimit: return "resource limit"; - case KernelObjectType::Session: return "session"; - case KernelObjectType::Mutex: return "mutex"; - case KernelObjectType::Semaphore: return "semaphore"; - case KernelObjectType::Thread: return "thread"; - case KernelObjectType::Dummy: return "dummy"; - default: return "unknown"; - } + switch (t) { + case KernelObjectType::AddressArbiter: return "address arbiter"; + case KernelObjectType::Archive: return "archive"; + case KernelObjectType::Directory: return "directory"; + case KernelObjectType::Event: return "event"; + case KernelObjectType::File: return "file"; + case KernelObjectType::MemoryBlock: return "memory block"; + case KernelObjectType::Port: return "port"; + case KernelObjectType::Process: return "process"; + case KernelObjectType::ResourceLimit: return "resource limit"; + case KernelObjectType::Session: return "session"; + case KernelObjectType::Mutex: return "mutex"; + case KernelObjectType::Semaphore: return "semaphore"; + case KernelObjectType::Thread: return "thread"; + case KernelObjectType::Dummy: return "dummy"; + default: return "unknown"; + } } struct Mutex { - using Handle = HorizonHandle; + using Handle = HorizonHandle; - u64 waitlist; // Refer to the getWaitlist function below for documentation - Handle ownerThread = 0; // Index of the thread that holds the mutex if it's locked - Handle handle; // Handle of the mutex itself - u32 lockCount; // Number of times this mutex has been locked by its daddy. 0 = not locked - bool locked; + u64 waitlist; // Refer to the getWaitlist function below for documentation + Handle ownerThread = 0; // Index of the thread that holds the mutex if it's locked + Handle handle; // Handle of the mutex itself + u32 lockCount; // Number of times this mutex has been locked by its daddy. 0 = not locked + bool locked; - Mutex(bool lock, Handle handle) : locked(lock), waitlist(0), lockCount(lock ? 1 : 0), handle(handle) {} + Mutex(bool lock, Handle handle) : locked(lock), waitlist(0), lockCount(lock ? 1 : 0), handle(handle) {} }; struct Semaphore { - u64 waitlist; // Refer to the getWaitlist function below for documentation - s32 availableCount; - s32 maximumCount; + u64 waitlist; // Refer to the getWaitlist function below for documentation + s32 availableCount; + s32 maximumCount; - Semaphore(s32 initialCount, s32 maximumCount) : availableCount(initialCount), maximumCount(maximumCount), waitlist(0) {} + Semaphore(s32 initialCount, s32 maximumCount) : availableCount(initialCount), maximumCount(maximumCount), waitlist(0) {} }; struct Timer { u64 waitlist; // Refer to the getWaitlist function below for documentation ResetType resetType = ResetType::OneShot; - u64 fireTick; // CPU tick the timer will be fired - u64 interval; // Number of ns until the timer fires for the second and future times - bool fired; // Has this timer been signalled? - bool running; // Is this timer running or stopped? + u64 fireTick; // CPU tick the timer will be fired + u64 interval; // Number of ns until the timer fires for the second and future times + bool fired; // Has this timer been signalled? + bool running; // Is this timer running or stopped? Timer(ResetType type) : resetType(type), fireTick(0), interval(0), waitlist(0), fired(false), running(false) {} }; struct MemoryBlock { - u32 addr = 0; - u32 size = 0; - u32 myPermission = 0; - u32 otherPermission = 0; - bool mapped = false; + u32 addr = 0; + u32 size = 0; + u32 myPermission = 0; + u32 otherPermission = 0; + bool mapped = false; - MemoryBlock(u32 addr, u32 size, u32 myPerm, u32 otherPerm) : addr(addr), size(size), myPermission(myPerm), otherPermission(otherPerm), - mapped(false) {} + MemoryBlock(u32 addr, u32 size, u32 myPerm, u32 otherPerm) + : addr(addr), size(size), myPermission(myPerm), otherPermission(otherPerm), mapped(false) {} }; // Generic kernel object class struct KernelObject { using Handle = HorizonHandle; - Handle handle = 0; // A u32 the OS will use to identify objects - void* data = nullptr; - KernelObjectType type; + Handle handle = 0; // A u32 the OS will use to identify objects + void* data = nullptr; + KernelObjectType type; - KernelObject(Handle handle, KernelObjectType type) : handle(handle), type(type) {} + KernelObject(Handle handle, KernelObjectType type) : handle(handle), type(type) {} - // Our destructor does not free the data in order to avoid it being freed when our std::vector is expanded - // Thus, the kernel needs to delete it when appropriate - ~KernelObject() {} + // Our destructor does not free the data in order to avoid it being freed when our std::vector is expanded + // Thus, the kernel needs to delete it when appropriate + ~KernelObject() {} - template - T* getData() { - return static_cast(data); - } + template + T* getData() { + return static_cast(data); + } - const char* getTypeName() const { - return kernelObjectTypeToString(type); - } + const char* getTypeName() const { return kernelObjectTypeToString(type); } - // Retrieves a reference to the waitlist for a specified object + // Retrieves a reference to the waitlist for a specified object // We return a reference because this function is only called in the kernel threading internals // We want the kernel to be able to easily manage waitlists, by reading/parsing them or setting/clearing bits. // As we mention in the definition of the "Event" struct, the format for wailists is very simple and made to be efficient. @@ -246,8 +259,7 @@ struct KernelObject { case KernelObjectType::Timer: return getData()->waitlist; // This should be unreachable once we fully implement sync objects - default: [[unlikely]] - Helpers::panic("Called GetWaitList on kernel object without a waitlist (Type: %s)", getTypeName()); + default: [[unlikely]] Helpers::panic("Called GetWaitList on kernel object without a waitlist (Type: %s)", getTypeName()); } } -}; \ No newline at end of file +}; diff --git a/include/memory.hpp b/include/memory.hpp index b1dd09de..d21e4be2 100644 --- a/include/memory.hpp +++ b/include/memory.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include #include #include +#include #include #include @@ -10,8 +10,11 @@ #include "crypto/aes_engine.hpp" #include "handles.hpp" #include "helpers.hpp" -#include "loader/ncsd.hpp" +#include "host_memory/host_memory.h" +#include "kernel/fcram.hpp" #include "loader/3dsx.hpp" +#include "loader/ncsd.hpp" +#include "result/result.hpp" #include "services/region_codes.hpp" namespace PhysicalAddrs { @@ -38,15 +41,15 @@ namespace VirtualAddrs { DefaultStackSize = 0x4000, NormalHeapStart = 0x08000000, - LinearHeapStartOld = 0x14000000, // If kernel version < 0x22C + LinearHeapStartOld = 0x14000000, // If kernel version < 0x22C LinearHeapEndOld = 0x1C000000, LinearHeapStartNew = 0x30000000, LinearHeapEndNew = 0x40000000, - // Start of TLS for first thread. Next thread's storage will be at TLSBase + 0x1000, and so on - TLSBase = 0xFF400000, - TLSSize = 0x1000, + // Start of TLS for first thread. Next thread's storage will be at TLSBase + 0x200, and so on + TLSBase = 0x1FF82000, + TLSSize = 0x200, VramStart = 0x1F000000, VramSize = 0x00600000, @@ -76,63 +79,79 @@ namespace KernelMemoryTypes { PERMISSION_W = 1 << 1, PERMISSION_X = 1 << 2 }; - - // I assume this is referring to a single piece of allocated memory? If it's for pages, it makes no sense. - // If it's for multiple allocations, it also makes no sense + struct MemoryInfo { - u32 baseAddr; // Base process virtual address. Used as a paddr in lockedMemoryInfo instead - u32 size; // Of what? - u32 perms; // Is this referring to a single page or? + u32 baseAddr; + u32 pages; + u32 perms; u32 state; - u32 end() { return baseAddr + size; } - MemoryInfo(u32 baseAddr, u32 size, u32 perms, u32 state) : baseAddr(baseAddr), size(size) - , perms(perms), state(state) {} + u32 end() { return baseAddr + (pages << 12); } + MemoryInfo() : baseAddr(0), pages(0), perms(0), state(0) {} + MemoryInfo(u32 baseAddr, u32 pages, u32 perms, u32 state) : baseAddr(baseAddr), pages(pages), perms(perms), state(state) {} }; // Shared memory block for HID, GSP:GPU etc struct SharedMemoryBlock { - u32 paddr; // Physical address of this block's memory - u32 size; // Size of block - u32 handle; // The handle of the shared memory block - bool mapped; // Has this block been mapped at least once? + u32 paddr; // Physical address of this block's memory + u32 size; // Size of block + u32 handle; // The handle of the shared memory block + bool mapped; // Has this block been mapped at least once? SharedMemoryBlock(u32 paddr, u32 size, u32 handle) : paddr(paddr), size(size), handle(handle), mapped(false) {} }; -} +} // namespace KernelMemoryTypes class Memory { + // Used internally by changeMemoryState + struct Operation { + KernelMemoryTypes::MemoryState newState = KernelMemoryTypes::MemoryState::Free; + bool r = false, w = false, x = false; + bool changeState = false; + bool changePerms = false; + }; using Handle = HorizonHandle; u8* fcram; u8* dspRam; // Provided to us by Audio u8* vram; // Provided to the memory class by the GPU class - u64& cpuTicks; // Reference to the CPU tick counter + const u64* cpuTicks = nullptr; // Pointer to the CPU tick counter, provided to us by the CPU class using SharedMemoryBlock = KernelMemoryTypes::SharedMemoryBlock; + // TODO: remove this reference when Peach's excellent page table code is moved to a better home + KFcram& fcramManager; + // Our dynarmic core uses page tables for reads and writes with 4096 byte pages std::vector readTable, writeTable; + // vaddr->paddr translation table + std::vector paddrTable; + // This tracks our OS' memory allocations - std::vector memoryInfo; + std::list memoryInfo; std::array sharedMemBlocks = { - SharedMemoryBlock(0, 0, KernelHandles::FontSharedMemHandle), // Shared memory for the system font (size is 0 because we read the size from the cmrc filesystem - SharedMemoryBlock(0, 0x1000, KernelHandles::GSPSharedMemHandle), // GSP shared memory - SharedMemoryBlock(0, 0x1000, KernelHandles::HIDSharedMemHandle), // HID shared memory - SharedMemoryBlock(0, 0x3000, KernelHandles::CSNDSharedMemHandle), // CSND shared memory + SharedMemoryBlock( + 0, 0, KernelHandles::FontSharedMemHandle + ), // Shared memory for the system font (size is 0 because we read the size from the cmrc filesystem + SharedMemoryBlock(0, 0x1000, KernelHandles::GSPSharedMemHandle), // GSP shared memory + SharedMemoryBlock(0, 0x1000, KernelHandles::HIDSharedMemHandle), // HID shared memory + SharedMemoryBlock(0, 0x3000, KernelHandles::CSNDSharedMemHandle), // CSND shared memory SharedMemoryBlock(0, 0xE7000, KernelHandles::APTCaptureSharedMemHandle), // APT Capture Buffer memory - }; + }; -public: + public: static constexpr u32 pageShift = 12; static constexpr u32 pageSize = 1 << pageShift; static constexpr u32 pageMask = pageSize - 1; static constexpr u32 totalPageCount = 1 << (32 - pageShift); - + static constexpr u32 FCRAM_SIZE = u32(128_MB); - static constexpr u32 FCRAM_APPLICATION_SIZE = u32(80_MB); + static constexpr u32 FCRAM_APPLICATION_SIZE = u32(64_MB + 16_MB); + static constexpr u32 FCRAM_SYSTEM_SIZE = u32(44_MB - 16_MB); + static constexpr u32 FCRAM_BASE_SIZE = u32(20_MB); + static constexpr u32 FCRAM_PAGE_COUNT = FCRAM_SIZE / pageSize; static constexpr u32 FCRAM_APPLICATION_PAGE_COUNT = FCRAM_APPLICATION_SIZE / pageSize; @@ -140,18 +159,48 @@ public: static constexpr u32 DSP_CODE_MEMORY_OFFSET = u32(0_KB); static constexpr u32 DSP_DATA_MEMORY_OFFSET = u32(256_KB); -private: - std::bitset usedFCRAMPages; - std::optional findPaddr(u32 size); + private: + // We also use MMU-accelerated fastmem for fast memory emulation + // This means that we've got a 4GB memory arena which is organized the same way as the emulated 3DS' memory map + // And we can access this directly instead of calling the memory read/write functions, which would be slower + // Regions that are not mapped or can't be accelerated this way will segfault, and the caller (eg dynarmic), will + // handle this segfault and call the Slower memory read/write functions + bool useFastmem = false; + static constexpr size_t FASTMEM_FCRAM_OFFSET = 0; // Offset of FCRAM in the fastmem arena + static constexpr size_t FASTMEM_DSP_RAM_OFFSET = FASTMEM_FCRAM_OFFSET + FCRAM_SIZE; // Offset of DSP RAM + + static constexpr size_t FASTMEM_BACKING_SIZE = FCRAM_SIZE + DSP_RAM_SIZE; + // Total size of the virtual address space we will occupy (4GB) + static constexpr size_t FASTMEM_VIRTUAL_SIZE = 4_GB; + + Common::HostMemory* arena; + + void addFastmemView(u32 guestVaddr, size_t arenaOffset, size_t size, bool w, bool x = false) { + if (useFastmem) { + Common::MemoryPermission perms = Common::MemoryPermission::Read; + if (w) { + perms |= Common::MemoryPermission::Write; + } + + if (x) { + // perms |= Common::MemoryPermission::Execute; + } + + // If anything is mapped at the place we're trying to map, unmap it. Then, create our mapping. + arena->Unmap(guestVaddr, size, false); + arena->Map(guestVaddr, arenaOffset, size, perms, false); + } + } + u64 timeSince3DSEpoch(); // https://www.3dbrew.org/wiki/Configuration_Memory#ENVINFO // Report a retail unit without JTAG static constexpr u32 envInfo = 1; - // Stored in Configuration Memory starting @ 0x1FF80060 + // Stored in Configuration Memory starting @ 0x1FF80060 struct FirmwareInfo { - u8 unk; // Usually 0 according to 3DBrew + u8 unk; // Usually 0 according to 3DBrew u8 revision; u8 minor; u8 major; @@ -167,12 +216,15 @@ private: static constexpr std::array MACAddress = {0x40, 0xF4, 0x07, 0xFF, 0xFF, 0xEE}; + void changeMemoryState(u32 vaddr, s32 pages, const Operation& op); + void queryPhysicalBlocks(std::list& outList, u32 vaddr, s32 pages); + void mapPhysicalMemory(u32 vaddr, u32 paddr, s32 pages, bool r, bool w, bool x); + void unmapPhysicalMemory(u32 vaddr, u32 paddr, s32 pages); + public: u16 kernelVersion = 0; - u32 usedUserMemory = u32(0_MB); // How much of the APPLICATION FCRAM range is used (allocated to the appcore) - u32 usedSystemMemory = u32(0_MB); // Similar for the SYSTEM range (reserved for the syscore) - Memory(u64& cpuTicks, const EmulatorConfig& config); + Memory(KFcram& fcramManager, const EmulatorConfig& config); void reset(); void* getReadPointer(u32 address); void* getWritePointer(u32 address); @@ -198,22 +250,6 @@ private: u32 getLinearHeapVaddr(); u8* getFCRAM() { return fcram; } - // Total amount of OS-only FCRAM available (Can vary depending on how much FCRAM the app requests via the cart exheader) - u32 totalSysFCRAM() { - return FCRAM_SIZE - FCRAM_APPLICATION_SIZE; - } - - // Amount of OS-only FCRAM currently available - u32 remainingSysFCRAM() { - return totalSysFCRAM() - usedSystemMemory; - } - - // Physical FCRAM index to the start of OS FCRAM - // We allocate the first part of physical FCRAM for the application, and the rest to the OS. So the index for the OS = application ram size - u32 sysFCRAMIndex() { - return FCRAM_APPLICATION_SIZE; - } - enum class BatteryLevel { Empty = 0, AlmostEmpty, @@ -224,9 +260,9 @@ private: }; u8 getBatteryState(bool adapterConnected, bool charging, BatteryLevel batteryLevel) { - u8 value = static_cast(batteryLevel) << 2; // Bits 2:4 are the battery level from 0 to 5 - if (adapterConnected) value |= 1 << 0; // Bit 0 shows if the charger is connected - if (charging) value |= 1 << 1; // Bit 1 shows if we're charging + u8 value = static_cast(batteryLevel) << 2; // Bits 2:4 are the battery level from 0 to 5 + if (adapterConnected) value |= 1 << 0; // Bit 0 shows if the charger is connected + if (charging) value |= 1 << 1; // Bit 1 shows if we're charging return value; } @@ -248,27 +284,20 @@ private: } // Returns whether "addr" is aligned to a page (4096 byte) boundary - static constexpr bool isAligned(u32 addr) { - return (addr & pageMask) == 0; - } + static constexpr bool isAligned(u32 addr) { return (addr & pageMask) == 0; } - // Allocate "size" bytes of RAM starting from FCRAM index "paddr" (We pick it ourself if paddr == 0) - // And map them to virtual address "vaddr" (We also pick it ourself if vaddr == 0). - // If the "linear" flag is on, the paddr pages must be adjacent in FCRAM - // This function is for interacting with the *user* portion of FCRAM mainly. For OS RAM, we use other internal functions below - // r, w, x: Permissions for the allocated memory - // adjustAddrs: If it's true paddr == 0 or vaddr == 0 tell the allocator to pick its own addresses. Used for eg svc ControlMemory - // isMap: Shows whether this is a reserve operation, that allocates memory and maps it to the addr space, or if it's a map operation, - // which just maps memory from paddr to vaddr without hassle. The latter is useful for shared memory mapping, the "map" ControlMemory, op, etc - // Returns the vaddr the FCRAM was mapped to or nullopt if allocation failed - std::optional allocateMemory(u32 vaddr, u32 paddr, u32 size, bool linear, bool r = true, bool w = true, bool x = true, - bool adjustsAddrs = false, bool isMap = false); - KernelMemoryTypes::MemoryInfo queryMemory(u32 vaddr); + bool allocMemory(u32 vaddr, s32 pages, FcramRegion region, bool r, bool w, bool x, KernelMemoryTypes::MemoryState state); + bool allocMemoryLinear(u32& outVaddr, u32 inVaddr, s32 pages, FcramRegion region, bool r, bool w, bool x); + bool mapVirtualMemory( + u32 dstVaddr, u32 srcVaddr, s32 pages, bool r, bool w, bool x, KernelMemoryTypes::MemoryState oldDstState, + KernelMemoryTypes::MemoryState oldSrcState, KernelMemoryTypes::MemoryState newDstState, KernelMemoryTypes::MemoryState newSrcState, + bool unmapPages = true + ); + void changePermissions(u32 vaddr, s32 pages, bool r, bool w, bool x); + Result::HorizonResult queryMemory(KernelMemoryTypes::MemoryInfo& out, u32 vaddr); + Result::HorizonResult testMemoryState(u32 vaddr, s32 pages, KernelMemoryTypes::MemoryState desiredState); - // For internal use - // Allocates a "size"-sized chunk of system FCRAM and returns the index of physical FCRAM used for the allocation - // Used for allocating things like shared memory and the like - u32 allocateSysMemory(u32 size); + void copyToVaddr(u32 dstVaddr, const u8* srcHost, s32 size); // Map a shared memory block to virtual address vaddr with permissions "myPerms" // The kernel has a second permission parameter in MapMemoryBlock but not sure what's used for @@ -276,10 +305,6 @@ private: // Returns a pointer to the FCRAM block used for the memory if allocation succeeded u8* mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerms); - // Mirrors the page mapping for "size" bytes starting from sourceAddress, to "size" bytes in destAddress - // All of the above must be page-aligned. - void mirrorMapping(u32 destAddress, u32 sourceAddress, u32 size); - // Backup of the game's CXI partition info, if any std::optional loadedCXI = std::nullopt; std::optional loaded3DSX = std::nullopt; @@ -291,12 +316,15 @@ private: u8* getDSPMem() { return dspRam; } u8* getDSPDataMem() { return &dspRam[DSP_DATA_MEMORY_OFFSET]; } u8* getDSPCodeMem() { return &dspRam[DSP_CODE_MEMORY_OFFSET]; } - u32 getUsedUserMem() { return usedUserMemory; } void setVRAM(u8* pointer) { vram = pointer; } void setDSPMem(u8* pointer) { dspRam = pointer; } + void setCPUTicks(const u64& ticks) { cpuTicks = &ticks; } bool allocateMainThreadStack(u32 size); Regions getConsoleRegion(); void copySharedFont(u8* ptr, u32 vaddr); + + bool isFastmemEnabled() { return useFastmem; } + u8* getFastmemArenaBase() { return arena->VirtualBasePointer(); } }; diff --git a/include/renderer_mtl/pica_to_mtl.hpp b/include/renderer_mtl/pica_to_mtl.hpp index d4c6dc7c..5e9f62c4 100644 --- a/include/renderer_mtl/pica_to_mtl.hpp +++ b/include/renderer_mtl/pica_to_mtl.hpp @@ -14,10 +14,10 @@ namespace PICA { bool needsSwizzle = false; MTL::TextureSwizzleChannels swizzle{ - .red = MTL::TextureSwizzleRed, - .green = MTL::TextureSwizzleGreen, - .blue = MTL::TextureSwizzleBlue, - .alpha = MTL::TextureSwizzleAlpha, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleGreen, + MTL::TextureSwizzleBlue, + MTL::TextureSwizzleAlpha, }; }; @@ -33,7 +33,7 @@ namespace PICA { case ColorFmt::RGBA5551: return MTL::PixelFormatRGBA8Unorm; // TODO: use MTL::PixelFormatBGR5A1Unorm? case ColorFmt::RGB565: return MTL::PixelFormatRGBA8Unorm; // TODO: use MTL::PixelFormatB5G6R5Unorm? #ifdef PANDA3DS_IOS - case ColorFmt::RGBA4: return MTL::PixelFormatRGBA8Unorm; // IOS + Metal doesn't support AGBR4 properly, at least on simulator + case ColorFmt::RGBA4: return MTL::PixelFormatRGBA8Unorm; // IOS + Metal doesn't support AGBR4 properly, at least on simulator #else case ColorFmt::RGBA4: return MTL::PixelFormatABGR4Unorm; #endif @@ -130,8 +130,7 @@ namespace PICA { case PrimType::TriangleFan: Helpers::warn("Triangle fans are not supported on Metal, using triangles instead"); return MTL::PrimitiveTypeTriangle; - case PrimType::GeometryPrimitive: - return MTL::PrimitiveTypeTriangle; + case PrimType::GeometryPrimitive: return MTL::PrimitiveTypeTriangle; } } diff --git a/include/services/frd.hpp b/include/services/frd.hpp index 914d9251..a5aee738 100644 --- a/include/services/frd.hpp +++ b/include/services/frd.hpp @@ -40,6 +40,7 @@ class FRDService { void hasLoggedIn(u32 messagePointer); void isOnline(u32 messagePointer); void logout(u32 messagePointer); + void saveLocalAccountData(u32 messagePointer); void setClientSDKVersion(u32 messagePointer); void setNotificationMask(u32 messagePointer); void updateGameModeDescription(u32 messagePointer); diff --git a/src/config.cpp b/src/config.cpp index f2cddaba..4d489c95 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -48,6 +48,7 @@ void EmulatorConfig::load() { printAppVersion = toml::find_or(general, "PrintAppVersion", true); circlePadProEnabled = toml::find_or(general, "EnableCirclePadPro", true); + fastmemEnabled = toml::find_or(general, "EnableFastmem", enableFastmemDefault); systemLanguage = languageCodeFromString(toml::find_or(general, "SystemLanguage", "en")); } } @@ -180,6 +181,7 @@ void EmulatorConfig::save() { data["General"]["PrintAppVersion"] = printAppVersion; data["General"]["SystemLanguage"] = languageCodeToString(systemLanguage); data["General"]["EnableCirclePadPro"] = circlePadProEnabled; + data["General"]["EnableFastmem"] = fastmemEnabled; data["Window"]["AppVersionOnWindow"] = windowSettings.showAppVersion; data["Window"]["RememberWindowPosition"] = windowSettings.rememberPosition; diff --git a/src/core/CPU/cpu_dynarmic.cpp b/src/core/CPU/cpu_dynarmic.cpp index 85dc70d9..124647d8 100644 --- a/src/core/CPU/cpu_dynarmic.cpp +++ b/src/core/CPU/cpu_dynarmic.cpp @@ -6,6 +6,7 @@ CPU::CPU(Memory& mem, Kernel& kernel, Emulator& emu) : mem(mem), emu(emu), scheduler(emu.getScheduler()), env(mem, kernel, emu.getScheduler()) { cp15 = std::make_shared(); + mem.setCPUTicks(getTicksRef()); Dynarmic::A32::UserConfig config; config.arch_version = Dynarmic::A32::ArchVersion::v6K; @@ -15,6 +16,12 @@ CPU::CPU(Memory& mem, Kernel& kernel, Emulator& emu) : mem(mem), emu(emu), sched config.global_monitor = &exclusiveMonitor; config.processor_id = 0; + if (mem.isFastmemEnabled()) { + config.fastmem_pointer = u64(mem.getFastmemArenaBase()); + } else { + config.fastmem_pointer = std::nullopt; + } + jit = std::make_unique(config); } diff --git a/src/core/applets/software_keyboard.cpp b/src/core/applets/software_keyboard.cpp index fc58a3ec..379134a6 100644 --- a/src/core/applets/software_keyboard.cpp +++ b/src/core/applets/software_keyboard.cpp @@ -55,7 +55,7 @@ Result::HorizonResult SoftwareKeyboardApplet::start(const MemoryBlock* sharedMem } mem.write16(textAddress, 0); // Write UTF-16 null terminator - // Temporarily hardcode the pressed button to be the firs tone + // Temporarily hardcode the pressed button to be the first one switch (config.numButtonsM1) { case SoftwareKeyboardButtonConfig::SingleButton: config.returnCode = SoftwareKeyboardResult::D0Click; break; case SoftwareKeyboardButtonConfig::DualButton: config.returnCode = SoftwareKeyboardResult::D1Click1; break; diff --git a/src/core/kernel/fcram.cpp b/src/core/kernel/fcram.cpp new file mode 100644 index 00000000..ebb58c34 --- /dev/null +++ b/src/core/kernel/fcram.cpp @@ -0,0 +1,102 @@ +#include "fcram.hpp" + +#include "memory.hpp" + +void KFcram::Region::reset(u32 start, size_t size) { + this->start = start; + pages = size >> 12; + freePages = pages; + + Block initialBlock(pages, 0); + blocks.clear(); + blocks.push_back(initialBlock); +} + +void KFcram::Region::alloc(std::list& out, s32 allocPages, bool linear) { + for (auto it = blocks.begin(); it != blocks.end(); it++) { + if (it->used) continue; + + // On linear allocations, only a single contiguous block may be used + if (it->pages < allocPages && linear) continue; + + // If the current block is bigger than the allocation, split it + if (it->pages > allocPages) { + Block newBlock(it->pages - allocPages, it->pageOffset + allocPages); + it->pages = allocPages; + blocks.insert(it, newBlock); + } + + // Mark the block as allocated and add it to the output list + it->used = true; + allocPages -= it->pages; + freePages -= it->pages; + + u32 paddr = start + (it->pageOffset << 12); + FcramBlock outBlock(paddr, it->pages); + out.push_back(outBlock); + + if (allocPages < 1) { + return; + } + } + + // Official kernel panics here + Helpers::panic("Failed to allocate FCRAM, not enough guest memory"); +} + +u32 KFcram::Region::getUsedCount() { return pages - freePages; } +u32 KFcram::Region::getFreeCount() { return freePages; } + +KFcram::KFcram(Memory& mem) : mem(mem) {} + +void KFcram::reset(size_t ramSize, size_t appSize, size_t sysSize, size_t baseSize) { + fcram = mem.getFCRAM(); + refs = std::unique_ptr(new u32[ramSize >> 12]); + std::memset(refs.get(), 0, (ramSize >> 12) * sizeof(u32)); + + appRegion.reset(0, appSize); + sysRegion.reset(appSize, sysSize); + baseRegion.reset(appSize + sysSize, baseSize); +} + +void KFcram::alloc(FcramBlockList& out, s32 pages, FcramRegion region, bool linear) { + switch (region) { + case FcramRegion::App: appRegion.alloc(out, pages, linear); break; + case FcramRegion::Sys: sysRegion.alloc(out, pages, linear); break; + case FcramRegion::Base: baseRegion.alloc(out, pages, linear); break; + default: Helpers::panic("Invalid FCRAM region chosen for allocation!"); break; + } + + incRef(out); +} + +void KFcram::incRef(FcramBlockList& list) { + for (auto it = list.begin(); it != list.end(); it++) { + for (int i = 0; i < it->pages; i++) { + u32 index = (it->paddr >> 12) + i; + refs.get()[index]++; + } + } +} + +void KFcram::decRef(FcramBlockList& list) { + for (auto it = list.begin(); it != list.end(); it++) { + for (int i = 0; i < it->pages; i++) { + u32 index = (it->paddr >> 12) + i; + refs.get()[index]--; + + if (!refs.get()[index]) { + Helpers::panic("TODO: Freeing FCRAM"); + } + } + } +} + +u32 KFcram::getUsedCount(FcramRegion region) { + switch (region) { + case FcramRegion::App: return appRegion.getUsedCount(); + case FcramRegion::Sys: return sysRegion.getUsedCount(); + case FcramRegion::Base: return baseRegion.getUsedCount(); + default: Helpers::panic("Invalid FCRAM region in getUsedCount!"); + } +} \ No newline at end of file diff --git a/src/core/kernel/idle_thread.cpp b/src/core/kernel/idle_thread.cpp index d6f79360..cfc71d2d 100644 --- a/src/core/kernel/idle_thread.cpp +++ b/src/core/kernel/idle_thread.cpp @@ -17,6 +17,8 @@ idle_thread_main: b idle_thread_main */ +using namespace KernelMemoryTypes; + static constexpr u8 idleThreadCode[] = { 0x00, 0x00, 0xA0, 0xE3, // mov r0, #0 0x00, 0x10, 0xA0, 0xE3, // mov r1, #0 @@ -27,18 +29,16 @@ static constexpr u8 idleThreadCode[] = { // Set up an idle thread to run when no thread is able to run void Kernel::setupIdleThread() { Thread& t = threads[idleThreadIndex]; - constexpr u32 codeAddress = 0xBFC00000; - // Reserve some memory for the idle thread's code. We map this memory to vaddr BFC00000 which is not userland-accessible + // Reserve some memory for the idle thread's code. We map this memory to vaddr 3FC00000 which shouldn't be accessed by applications // We only allocate 4KB (1 page) because our idle code is pretty small - const u32 fcramIndex = mem.allocateSysMemory(Memory::pageSize); - auto vaddr = mem.allocateMemory(codeAddress, fcramIndex, Memory::pageSize, true, true, false, true, false, true); - if (!vaddr.has_value() || vaddr.value() != codeAddress) { + constexpr u32 codeAddress = 0x3FC00000; + if (!mem.allocMemory(codeAddress, 1, FcramRegion::Base, true, true, false, MemoryState::Locked)) { Helpers::panic("Failed to setup idle thread"); } // Copy idle thread code to the allocated FCRAM - std::memcpy(&mem.getFCRAM()[fcramIndex], idleThreadCode, sizeof(idleThreadCode)); + mem.copyToVaddr(codeAddress, idleThreadCode, sizeof(idleThreadCode)); t.entrypoint = codeAddress; t.initialSP = 0; diff --git a/src/core/kernel/kernel.cpp b/src/core/kernel/kernel.cpp index c5dd3db2..1e9f94e3 100644 --- a/src/core/kernel/kernel.cpp +++ b/src/core/kernel/kernel.cpp @@ -6,7 +6,7 @@ #include "kernel_types.hpp" Kernel::Kernel(CPU& cpu, Memory& mem, GPU& gpu, const EmulatorConfig& config, LuaManager& lua) - : cpu(cpu), regs(cpu.regs()), mem(mem), handleCounter(0), serviceManager(regs, mem, gpu, currentProcess, *this, config, lua) { + : cpu(cpu), regs(cpu.regs()), mem(mem), handleCounter(0), serviceManager(regs, mem, gpu, currentProcess, *this, config, lua), fcramManager(mem) { objects.reserve(512); // Make room for a few objects to avoid further memory allocs later mutexHandles.reserve(8); portHandles.reserve(32); @@ -180,9 +180,7 @@ void Kernel::reset() { } // Get pointer to thread-local storage -u32 Kernel::getTLSPointer() { - return VirtualAddrs::TLSBase + currentThreadIndex * VirtualAddrs::TLSSize; -} +u32 Kernel::getTLSPointer() { return VirtualAddrs::TLSBase + currentThreadIndex * VirtualAddrs::TLSSize; } // Result CloseHandle(Handle handle) void Kernel::svcCloseHandle() { @@ -271,7 +269,7 @@ void Kernel::getProcessInfo() { // According to 3DBrew: Amount of private (code, data, heap) memory used by the process + total supervisor-mode // stack size + page-rounded size of the external handle table case 2: - regs[1] = mem.getUsedUserMem(); + regs[1] = fcramManager.getUsedCount(FcramRegion::App) * Memory::pageSize; regs[2] = 0; break; @@ -364,7 +362,7 @@ void Kernel::getSystemInfo() { switch (subtype) { // Total used memory size in the APPLICATION memory region case 1: - regs[1] = mem.getUsedUserMem(); + regs[1] = fcramManager.getUsedCount(FcramRegion::App) * Memory::pageSize; regs[2] = 0; break; diff --git a/src/core/kernel/memory_management.cpp b/src/core/kernel/memory_management.cpp index 58a46c4d..9199a32c 100644 --- a/src/core/kernel/memory_management.cpp +++ b/src/core/kernel/memory_management.cpp @@ -30,10 +30,10 @@ namespace MemoryPermissions { }; } +using namespace KernelMemoryTypes; + // Returns whether "value" is aligned to a page boundary (Ie a boundary of 4096 bytes) -static constexpr bool isAligned(u32 value) { - return (value & 0xFFF) == 0; -} +static constexpr bool isAligned(u32 value) { return (value & 0xFFF) == 0; } // Result ControlMemory(u32* outaddr, u32 addr0, u32 addr1, u32 size, // MemoryOperation operation, MemoryPermission permissions) @@ -44,6 +44,7 @@ void Kernel::controlMemory() { u32 addr0 = regs[1]; u32 addr1 = regs[2]; u32 size = regs[3]; + u32 pages = size >> 12; // Official kernel truncates nonaligned sizes u32 perms = regs[4]; if (perms == MemoryPermissions::DontCare) { @@ -61,7 +62,7 @@ void Kernel::controlMemory() { Helpers::panic("ControlMemory: attempted to allocate executable memory"); } - if (!isAligned(addr0) || !isAligned(addr1) || !isAligned(size)) { + if (!isAligned(addr0) || !isAligned(addr1)) { Helpers::panic("ControlMemory: Unaligned parameters\nAddr0: %08X\nAddr1: %08X\nSize: %08X", addr0, addr1, size); } @@ -72,22 +73,54 @@ void Kernel::controlMemory() { switch (operation & 0xFF) { case Operation::Commit: { - std::optional address = mem.allocateMemory(addr0, 0, size, linear, r, w, x, true); - if (!address.has_value()) { - Helpers::panic("ControlMemory: Failed to allocate memory"); + // TODO: base this from the exheader + auto region = FcramRegion::App; + + u32 outAddr = 0; + if (linear) { + if (!mem.allocMemoryLinear(outAddr, addr0, pages, region, r, w, false)) { + Helpers::panic("ControlMemory: Failed to allocate linear memory"); + } + } else { + if (!mem.allocMemory(addr0, pages, region, r, w, false, MemoryState::Private)) { + Helpers::panic("ControlMemory: Failed to allocate memory"); + } + + outAddr = addr0; } - regs[1] = address.value(); + regs[1] = outAddr; break; } - case Operation::Map: mem.mirrorMapping(addr0, addr1, size); break; + case Operation::Map: + // Official kernel only allows Private regions to be mapped to Free regions. An Alias or Aliased region cannot be mapped again + if (!mem.mapVirtualMemory( + addr0, addr1, pages, r, w, false, MemoryState::Free, MemoryState::Private, MemoryState::Alias, MemoryState::Aliased + )) + Helpers::panic("ControlMemory: Failed to map memory"); + break; + + case Operation::Unmap: + // The same as a Map operation, except in reverse + if (!mem.mapVirtualMemory( + addr0, addr1, pages, false, false, false, MemoryState::Alias, MemoryState::Aliased, MemoryState::Free, MemoryState::Private + )) { + Helpers::panic("ControlMemory: Failed to unmap memory"); + } + break; case Operation::Protect: - Helpers::warn( - "Ignoring mprotect! Hope nothing goes wrong but if the game accesses invalid memory or crashes then we prolly need to implement " - "this\n" - ); + // Official kernel has an internal state bit to indicate that the region's permissions may be changed + // But this should account for all cases + if (!mem.testMemoryState(addr0, pages, MemoryState::Private) && !mem.testMemoryState(addr0, pages, MemoryState::Alias) && + !mem.testMemoryState(addr0, pages, MemoryState::Aliased) && !mem.testMemoryState(addr0, pages, MemoryState::AliasCode)) { + Helpers::warn("Tried to mprotect invalid region!"); + return; + } + + mem.changePermissions(addr0, pages, r, w, false); + regs[1] = addr0; break; default: Helpers::warn("ControlMemory: unknown operation %X\n", operation); break; @@ -104,10 +137,11 @@ void Kernel::queryMemory() { logSVC("QueryMemory(mem info pointer = %08X, page info pointer = %08X, addr = %08X)\n", memInfo, pageInfo, addr); - const auto info = mem.queryMemory(addr); - regs[0] = Result::Success; + KernelMemoryTypes::MemoryInfo info; + const auto result = mem.queryMemory(info, addr); + regs[0] = result; regs[1] = info.baseAddr; - regs[2] = info.size; + regs[2] = info.pages * Memory::pageSize; regs[3] = info.perms; regs[4] = info.state; regs[5] = 0; // page flags diff --git a/src/core/kernel/resource_limits.cpp b/src/core/kernel/resource_limits.cpp index 28fbeea8..65556c01 100644 --- a/src/core/kernel/resource_limits.cpp +++ b/src/core/kernel/resource_limits.cpp @@ -82,7 +82,9 @@ void Kernel::getResourceLimitCurrentValues() { s32 Kernel::getCurrentResourceValue(const KernelObject* limit, u32 resourceName) { const auto data = static_cast(limit->data); switch (resourceName) { - case ResourceType::Commit: return mem.usedUserMemory; + // TODO: needs to use the current amount of memory allocated by the process + case ResourceType::Commit: return fcramManager.getUsedCount(FcramRegion::App) * Memory::pageSize; + case ResourceType::Thread: return threadIndices.size(); default: Helpers::panic("Attempted to get current value of unknown kernel resource: %d\n", resourceName); } diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index ca6bdd19..2790c8f8 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp @@ -6,6 +6,8 @@ #include "memory.hpp" +using namespace KernelMemoryTypes; + namespace { struct LoadInfo { u32 codeSegSizeAligned; @@ -53,12 +55,6 @@ bool Memory::map3DSX(HB3DSX& hb3dsx, const HB3DSX::Header& header) { // suum of aligned values is always aligned, have an extra RW page for libctru const u32 totalSize = hbInfo.codeSegSizeAligned + hbInfo.rodataSegSizeAligned + hbInfo.dataSegSizeAligned + 4_KB; - const auto opt = findPaddr(totalSize); - if (!opt.has_value()) { - Helpers::panic("Failed to find paddr to map 3DSX file's code to"); - return false; - } - // Map the ROM on the kernel side const u32 textOffset = 0; const u32 rodataOffset = textOffset + hbInfo.codeSegSizeAligned; @@ -213,7 +209,8 @@ bool Memory::map3DSX(HB3DSX& hb3dsx, const HB3DSX::Header& header) { { pst->heapSize = u32(48_MB); pst->linearHeapSize = u32(64_MB); - } else */ { + } else */ + { pst.heapSize = u32(24_MB); pst.linearHeapSize = u32(32_MB); } @@ -221,12 +218,17 @@ bool Memory::map3DSX(HB3DSX& hb3dsx, const HB3DSX::Header& header) { std::memcpy(&code[4], &pst, sizeof(pst)); } - const auto paddr = opt.value(); - std::memcpy(&fcram[paddr], &code[0], totalSize); // Copy the 3 segments + BSS to FCRAM + // Text is R-X + allocMemory(textSegAddr, hbInfo.codeSegSizeAligned / Memory::pageSize, FcramRegion::App, true, false, true, MemoryState::Code); + copyToVaddr(textSegAddr, &code[textOffset], hbInfo.codeSegSizeAligned); - allocateMemory(textSegAddr, paddr + textOffset, hbInfo.codeSegSizeAligned, true, true, false, true); // Text is R-X - allocateMemory(rodataSegAddr, paddr + rodataOffset, hbInfo.rodataSegSizeAligned, true, true, false, false); // Rodata is R-- - allocateMemory(dataSegAddr, paddr + dataOffset, hbInfo.dataSegSizeAligned + 0x1000, true, true, true, false); // Data+BSS+Extra is RW- + // Rodata is R-- + allocMemory(rodataSegAddr, hbInfo.rodataSegSizeAligned / Memory::pageSize, FcramRegion::App, true, false, false, MemoryState::Code); + copyToVaddr(rodataSegAddr, &code[rodataOffset], hbInfo.rodataSegSizeAligned); + + // Data + BSS + Extra is RW-. We allocate 1 extra page (4KB) which is not initialized to anything. + allocMemory(dataSegAddr, (hbInfo.dataSegSizeAligned + 4_KB) / Memory::pageSize, FcramRegion::App, true, true, false, MemoryState::Private); + copyToVaddr(dataSegAddr, &code[dataOffset], hbInfo.dataSegSizeAligned); return true; } diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index 8b2a7807..205b16ec 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -4,6 +4,7 @@ #include "memory.hpp" using namespace ELFIO; +using namespace KernelMemoryTypes; std::optional Memory::loadELF(std::ifstream& file) { loadedCXI = std::nullopt; // ELF files don't have a CXI, so set this to null @@ -24,6 +25,7 @@ std::optional Memory::loadELF(std::ifstream& file) { auto segNum = reader.segments.size(); printf("Number of segments: %d\n", segNum); printf(" # Perms Vaddr File Size Mem Size\n"); + for (int i = 0; i < segNum; ++i) { const auto seg = reader.segments[i]; const auto flags = seg->get_flags(); @@ -55,12 +57,8 @@ std::optional Memory::loadELF(std::ifstream& file) { Helpers::warn("Rounding ELF segment size to %08X\n", memorySize); } - // This should also assert that findPaddr doesn't fail - u32 fcramAddr = findPaddr(memorySize).value(); - std::memcpy(&fcram[fcramAddr], data, fileSize); - - // Allocate the segment on the OS side - allocateMemory(vaddr, fcramAddr, memorySize, true, r, w, x); + allocMemory(vaddr, memorySize / Memory::pageSize, FcramRegion::App, r, w, x, MemoryState::Code); + copyToVaddr(vaddr, data, fileSize); } // ELF can't specify a region, make it default to USA diff --git a/src/core/loader/ncsd.cpp b/src/core/loader/ncsd.cpp index 13d68892..500b70ce 100644 --- a/src/core/loader/ncsd.cpp +++ b/src/core/loader/ncsd.cpp @@ -3,8 +3,11 @@ #include #include +#include "kernel/fcram.hpp" #include "memory.hpp" +using namespace KernelMemoryTypes; + bool Memory::mapCXI(NCSD& ncsd, NCCH& cxi) { printf("Text address = %08X, size = %08X\n", cxi.text.address, cxi.text.size); printf("Rodata address = %08X, size = %08X\n", cxi.rodata.address, cxi.rodata.size); @@ -24,12 +27,6 @@ bool Memory::mapCXI(NCSD& ncsd, NCCH& cxi) { // Round up the size of the CXI stack size to a page (4KB) boundary, as the OS can only allocate memory this way u32 stackSize = (cxi.stackSize + pageSize - 1) & -pageSize; - if (stackSize > 512_KB) { - // TODO: Figure out the actual max stack size - Helpers::warn("CXI stack size is %08X which seems way too big. Clamping to 512KB", stackSize); - stackSize = 512_KB; - } - // Allocate stack if (!allocateMainThreadStack(stackSize)) { // Should be unreachable @@ -42,40 +39,41 @@ bool Memory::mapCXI(NCSD& ncsd, NCCH& cxi) { u32 bssSize = (cxi.bssSize + 0xfff) & ~0xfff; // Round BSS size up to a page boundary // Total memory to allocate for loading u32 totalSize = (cxi.text.pageCount + cxi.rodata.pageCount + cxi.data.pageCount) * pageSize + bssSize; - code.resize(code.size() + bssSize, 0); // Pad the .code file with zeroes for the BSS segment - if (code.size() < totalSize) { + if (code.size() + bssSize < totalSize) { Helpers::panic("Total code size as reported by the exheader is larger than the .code file"); return false; } - const auto opt = findPaddr(totalSize); - if (!opt.has_value()) { - Helpers::panic("Failed to find paddr to map CXI file's code to"); - return false; - } - - const auto paddr = opt.value(); - std::memcpy(&fcram[paddr], &code[0], totalSize); // Copy the 3 segments + BSS to FCRAM - // Map the ROM on the kernel side - u32 textOffset = 0; u32 textAddr = cxi.text.address; u32 textSize = cxi.text.pageCount * pageSize; - u32 rodataOffset = textOffset + textSize; u32 rodataAddr = cxi.rodata.address; u32 rodataSize = cxi.rodata.pageCount * pageSize; - u32 dataOffset = rodataOffset + rodataSize; u32 dataAddr = cxi.data.address; u32 dataSize = cxi.data.pageCount * pageSize + bssSize; // We're merging the data and BSS segments, as BSS is just pre-initted .data - allocateMemory(textAddr, paddr + textOffset, textSize, true, true, false, true); // Text is R-X - allocateMemory(rodataAddr, paddr + rodataOffset, rodataSize, true, true, false, false); // Rodata is R-- - allocateMemory(dataAddr, paddr + dataOffset, dataSize, true, true, true, false); // Data+BSS is RW- + // TODO: base this off the exheader + auto region = FcramRegion::App; + u32 bssAddr = dataAddr + (cxi.data.pageCount << 12); - ncsd.entrypoint = textAddr; + allocMemory(textAddr, cxi.text.pageCount, region, true, false, true, MemoryState::Code); + allocMemory(rodataAddr, cxi.rodata.pageCount, region, true, false, false, MemoryState::Code); + allocMemory(dataAddr, cxi.data.pageCount, region, true, true, false, MemoryState::Private); + allocMemory(bssAddr, bssSize >> 12, region, true, true, false, MemoryState::Private); + + // Copy .code file to FCRAM + copyToVaddr(textAddr, code.data(), textSize); + copyToVaddr(rodataAddr, code.data() + textSize, rodataSize); + copyToVaddr(dataAddr, code.data() + textSize + rodataSize, cxi.data.pageCount << 12); + + // Set BSS to zeroes + std::vector bss(bssSize, 0); + copyToVaddr(bssAddr, bss.data(), bssSize); + + ncsd.entrypoint = cxi.text.address; // Back the IOFile for accessing the ROM, as well as the ROM's CXI partition, in the memory class. CXIFile = ncsd.file; @@ -85,7 +83,9 @@ bool Memory::mapCXI(NCSD& ncsd, NCCH& cxi) { std::optional Memory::loadNCSD(Crypto::AESEngine& aesEngine, const std::filesystem::path& path) { NCSD ncsd; - if (!ncsd.file.open(path, "rb")) return std::nullopt; + if (!ncsd.file.open(path, "rb")) { + return std::nullopt; + } u8 magic[4]; // Must be "NCSD" ncsd.file.seek(0x100); diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 57eac8ca..650c8d0e 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -6,6 +6,7 @@ #include #include "config_mem.hpp" +#include "kernel/fcram.hpp" #include "resource_limits.hpp" #include "services/fonts.hpp" #include "services/ptm.hpp" @@ -14,38 +15,43 @@ CMRC_DECLARE(ConsoleFonts); using namespace KernelMemoryTypes; -Memory::Memory(u64& cpuTicks, const EmulatorConfig& config) : cpuTicks(cpuTicks), config(config) { - fcram = new uint8_t[FCRAM_SIZE](); +Memory::Memory(KFcram& fcramManager, const EmulatorConfig& config) : fcramManager(fcramManager), config(config) { + const bool fastmemEnabled = config.fastmemEnabled; + arena = new Common::HostMemory(FASTMEM_BACKING_SIZE, FASTMEM_VIRTUAL_SIZE, fastmemEnabled); readTable.resize(totalPageCount, 0); writeTable.resize(totalPageCount, 0); - memoryInfo.reserve(32); // Pre-allocate some room for memory allocation info to avoid dynamic allocs + paddrTable.resize(totalPageCount, 0); + + fcram = arena->BackingBasePointer() + FASTMEM_FCRAM_OFFSET; + // arenaDSPRam = arena->BackingBasePointer() + FASTMEM_DSP_RAM_OFFSET; + useFastmem = fastmemEnabled && arena->VirtualBasePointer() != nullptr; } void Memory::reset() { - // Unallocate all memory + // Mark the entire process address space as free + constexpr static int MAX_USER_PAGES = 0x40000000 >> 12; memoryInfo.clear(); - usedFCRAMPages.reset(); - usedUserMemory = u32(0_MB); - usedSystemMemory = u32(0_MB); + memoryInfo.push_back(MemoryInfo(0, MAX_USER_PAGES, 0, KernelMemoryTypes::Free)); + + // TODO: remove this, only needed to make the subsequent allocations work for now + fcramManager.reset(FCRAM_SIZE, FCRAM_APPLICATION_SIZE, FCRAM_SYSTEM_SIZE, FCRAM_BASE_SIZE); + + if (useFastmem) { + // Unmap any mappings when resetting + arena->Unmap(0, 4_GB, false); + } for (u32 i = 0; i < totalPageCount; i++) { readTable[i] = 0; writeTable[i] = 0; + paddrTable[i] = 0; } - // Map (32 * 4) KB of FCRAM before the stack for the TLS of each thread - std::optional tlsBaseOpt = findPaddr(32 * 4_KB); - if (!tlsBaseOpt.has_value()) { // Should be unreachable but still good to have - Helpers::panic("Failed to allocate memory for thread-local storage"); - } - - u32 basePaddrForTLS = tlsBaseOpt.value(); - for (u32 i = 0; i < appResourceLimits.maxThreads; i++) { - u32 vaddr = VirtualAddrs::TLSBase + i * VirtualAddrs::TLSSize; - allocateMemory(vaddr, basePaddrForTLS, VirtualAddrs::TLSSize, true); - basePaddrForTLS += VirtualAddrs::TLSSize; - } + // Allocate 512 bytes of TLS for each thread. Since the smallest allocatable unit is 4 KB, that means allocating one page for every 8 threads + // Note that TLS is always allocated in the Base region + s32 tlsPages = (appResourceLimits.maxThreads + 7) >> 3; + allocMemory(VirtualAddrs::TLSBase, tlsPages, FcramRegion::Base, true, true, false, MemoryState::Locked); // Initialize shared memory blocks and reserve memory for them for (auto& e : sharedMemBlocks) { @@ -56,19 +62,23 @@ void Memory::reset() { } e.mapped = false; - e.paddr = allocateSysMemory(e.size); + FcramBlockList memBlock; + fcramManager.alloc(memBlock, e.size >> 12, FcramRegion::Sys, false); + e.paddr = memBlock.begin()->paddr; } // Map DSP RAM as R/W at [0x1FF00000, 0x1FF7FFFF] - constexpr u32 dspRamPages = DSP_RAM_SIZE / pageSize; // Number of DSP RAM pages - constexpr u32 initialPage = VirtualAddrs::DSPMemStart / pageSize; // First page of DSP RAM in the virtual address space + constexpr u32 dspRamPages = DSP_RAM_SIZE / pageSize; // Number of DSP RAM pages - for (u32 i = 0; i < dspRamPages; i++) { - auto pointer = uintptr_t(&dspRam[i * pageSize]); + u32 vaddr = VirtualAddrs::DSPMemStart; + u32 paddr = PhysicalAddrs::DSP_RAM; - readTable[i + initialPage] = pointer; - writeTable[i + initialPage] = pointer; - } + Operation op{.newState = MemoryState::Static, .r = true, .w = true, .changeState = true, .changePerms = true}; + changeMemoryState(vaddr, dspRamPages, op); + mapPhysicalMemory(vaddr, paddr, dspRamPages, true, true, false); + + // Allocate RW mapping for DSP RAM + // addFastmemView(VirtualAddrs::DSPMemStart, FASTMEM_DSP_RAM_OFFSET, DSP_RAM_SIZE, true, false); // Later adjusted based on ROM header when possible region = Regions::USA; @@ -76,14 +86,9 @@ void Memory::reset() { bool Memory::allocateMainThreadStack(u32 size) { // Map stack pages as R/W - std::optional basePaddr = findPaddr(size); - if (!basePaddr.has_value()) { // Should also be unreachable but still good to have - return false; - } - + // TODO: get the region from the exheader const u32 stackBottom = VirtualAddrs::StackTop - size; - std::optional result = allocateMemory(stackBottom, basePaddr.value(), size, true); // Should never be nullopt - return result.has_value(); + return allocMemory(stackBottom, size >> 12, FcramRegion::App, true, true, false, MemoryState::Locked); } u8 Memory::read8(u32 vaddr) { @@ -120,7 +125,7 @@ u8 Memory::read8(u32 vaddr) { case ConfigMem::FirmRevision: return firm.revision; case ConfigMem::FirmVersionMinor: return firm.minor; case ConfigMem::FirmVersionMajor: return firm.major; - case ConfigMem::WifiLevel: return 0; // No wifi :( + case ConfigMem::WifiLevel: return 0; // No wifi :( case ConfigMem::WifiMac: case ConfigMem::WifiMac + 1: @@ -163,8 +168,8 @@ u32 Memory::read32(u32 vaddr) { case ConfigMem::Datetime0 + 4: return u32(timeSince3DSEpoch() >> 32); // top 32 bits // Ticks since time was last updated. For now we return the current tick count - case ConfigMem::Datetime0 + 8: return u32(cpuTicks); - case ConfigMem::Datetime0 + 12: return u32(cpuTicks >> 32); + case ConfigMem::Datetime0 + 8: return u32(*cpuTicks); + case ConfigMem::Datetime0 + 12: return u32(*cpuTicks >> 32); case ConfigMem::Datetime0 + 16: return 0xFFB0FF0; // Unknown, set by PTM case ConfigMem::Datetime0 + 20: case ConfigMem::Datetime0 + 24: @@ -172,11 +177,10 @@ u32 Memory::read32(u32 vaddr) { case ConfigMem::AppMemAlloc: return appResourceLimits.maxCommit; case ConfigMem::SyscoreVer: return 2; - case 0x1FF81000: return 0; // TODO: Figure out what this config mem address does + case 0x1FF81000: + return 0; // TODO: Figure out what this config mem address does // Wifi MAC: First 4 bytes of MAC Address - case ConfigMem::WifiMac: - return (u32(MACAddress[3]) << 24) | (u32(MACAddress[2]) << 16) | (u32(MACAddress[1]) << 8) | - MACAddress[0]; + case ConfigMem::WifiMac: return (u32(MACAddress[3]) << 24) | (u32(MACAddress[2]) << 16) | (u32(MACAddress[1]) << 8) | MACAddress[0]; // 3D slider. Float in range 0.0 = off, 1.0 = max. case ConfigMem::SliderState3D: return Helpers::bit_cast(0.0f); @@ -186,7 +190,7 @@ u32 Memory::read32(u32 vaddr) { default: if (vaddr >= VirtualAddrs::VramStart && vaddr < VirtualAddrs::VramStart + VirtualAddrs::VramSize) { static int shutUpCounter = 0; - if (shutUpCounter < 5) { // Stop spamming about VRAM reads after the first 5 + if (shutUpCounter < 5) { // Stop spamming about VRAM reads after the first 5 shutUpCounter++; Helpers::warn("VRAM read!\n"); } @@ -296,149 +300,254 @@ std::string Memory::readString(u32 address, u32 maxSize) { // thanks to the New 3DS having more FCRAM u32 Memory::getLinearHeapVaddr() { return (kernelVersion < 0x22C) ? VirtualAddrs::LinearHeapStartOld : VirtualAddrs::LinearHeapStartNew; } -std::optional Memory::allocateMemory(u32 vaddr, u32 paddr, u32 size, bool linear, bool r, bool w, bool x, bool adjustAddrs, bool isMap) { - // Kernel-allocated memory & size must always be aligned to a page boundary - // Additionally assert we don't OoM and that we don't try to allocate physical FCRAM past what's available to userland - // If we're mapping there's no fear of OoM, because we're not really allocating memory, just binding vaddrs to specific paddrs - assert(isAligned(vaddr) && isAligned(paddr) && isAligned(size)); - assert(size <= FCRAM_APPLICATION_SIZE || isMap); - assert(usedUserMemory + size <= FCRAM_APPLICATION_SIZE || isMap); - assert(paddr + size <= FCRAM_APPLICATION_SIZE || isMap); +void Memory::changeMemoryState(u32 vaddr, s32 pages, const Operation& op) { + assert(!(vaddr & 0xFFF)); - // Amount of available user FCRAM pages and FCRAM pages to allocate respectively - const u32 availablePageCount = (FCRAM_APPLICATION_SIZE - usedUserMemory) / pageSize; - const u32 neededPageCount = size / pageSize; + if (!op.changePerms && !op.changeState) Helpers::panic("Invalid op passed to changeMemoryState!"); - assert(availablePageCount >= neededPageCount || isMap); + bool blockFound = false; - // If the paddr is 0, that means we need to select our own - // TODO: Fix. This method always tries to allocate blocks linearly. - // However, if the allocation is non-linear, the panic will trigger when it shouldn't. - // Non-linear allocation needs special handling - if (paddr == 0 && adjustAddrs) { - std::optional newPaddr = findPaddr(size); - if (!newPaddr.has_value()) { - Helpers::panic("Failed to find paddr"); + for (auto it = memoryInfo.begin(); it != memoryInfo.end(); it++) { + // Find the block that the memory region is located in + u32 blockStart = it->baseAddr; + u32 blockEnd = it->end(); + + u32 reqStart = vaddr; + u32 reqEnd = vaddr + (pages << 12); + + if (!(reqStart >= blockStart && reqEnd <= blockEnd)) continue; + + // Now that the block has been found, fill it with the necessary info + auto oldState = it->state; + u32 oldPerms = it->perms; + it->baseAddr = reqStart; + it->pages = pages; + if (op.changePerms) it->perms = (op.r ? PERMISSION_R : 0) | (op.w ? PERMISSION_W : 0) | (op.x ? PERMISSION_X : 0); + if (op.changeState) it->state = op.newState; + + // If the requested memory region is smaller than the block found, the block must be split + if (blockStart < reqStart) { + MemoryInfo startBlock(blockStart, (reqStart - blockStart) >> 12, oldPerms, oldState); + memoryInfo.insert(it, startBlock); } - paddr = newPaddr.value(); - assert(paddr + size <= FCRAM_APPLICATION_SIZE || isMap); - } - - // If the vaddr is 0 that means we need to select our own - // Depending on whether our mapping should be linear or not we allocate from one of the 2 typical heap spaces - // We don't plan on implementing freeing any time soon, so we can pick added userUserMemory to the vaddr base to - // Get the full vaddr. - // TODO: Fix this - if (vaddr == 0 && adjustAddrs) { - // Linear memory needs to be allocated in a way where you can easily get the paddr by subtracting the linear heap base - // In order to be able to easily send data to hardware like the GPU - if (linear) { - vaddr = getLinearHeapVaddr() + paddr; - } else { - vaddr = usedUserMemory + VirtualAddrs::NormalHeapStart; - } - } - - if (!isMap) { - usedUserMemory += size; - } - - // Do linear mapping - u32 virtualPage = vaddr >> pageShift; - u32 physPage = paddr >> pageShift; // TODO: Special handle when non-linear mapping is necessary - for (u32 i = 0; i < neededPageCount; i++) { - if (r) { - readTable[virtualPage] = uintptr_t(&fcram[physPage * pageSize]); - } - if (w) { - writeTable[virtualPage] = uintptr_t(&fcram[physPage * pageSize]); + if (reqEnd < blockEnd) { + auto itAfter = std::next(it); + MemoryInfo endBlock(reqEnd, (blockEnd - reqEnd) >> 12, oldPerms, oldState); + memoryInfo.insert(itAfter, endBlock); } - // Mark FCRAM page as allocated and go on - usedFCRAMPages[physPage] = true; - virtualPage++; - physPage++; + blockFound = true; + break; } - // Back up the info for this allocation in our memoryInfo vector - u32 perms = (r ? PERMISSION_R : 0) | (w ? PERMISSION_W : 0) | (x ? PERMISSION_X : 0); - memoryInfo.push_back(std::move(MemoryInfo(vaddr, size, perms, KernelMemoryTypes::Reserved))); + if (!blockFound) Helpers::panic("Unable to find block in changeMemoryState!"); - return vaddr; + // Merge all blocks with the same state and permissions + for (auto it = memoryInfo.begin(); it != memoryInfo.end();) { + auto next = std::next(it); + if (next == memoryInfo.end()) break; + + if (it->state != next->state || it->perms != next->perms) { + it++; + continue; + } + + next->baseAddr = it->baseAddr; + next->pages += it->pages; + it = memoryInfo.erase(it); + } } -// Find a paddr which we can use for allocating "size" bytes -std::optional Memory::findPaddr(u32 size) { - assert(isAligned(size)); - const u32 neededPages = size / pageSize; +void Memory::queryPhysicalBlocks(FcramBlockList& outList, u32 vaddr, s32 pages) { + s32 srcPages = pages; + for (auto& alloc : memoryInfo) { + u32 blockStart = alloc.baseAddr; + u32 blockEnd = alloc.end(); - // The FCRAM page we're testing to see if it's appropriate to use - u32 candidatePage = 0; - // The number of linear available pages we could find starting from this candidate page. - // If this ends up >= than neededPages then the paddr is good (ie we can use the candidate page as a base address) - u32 counter = 0; + if (!(vaddr >= blockStart && vaddr < blockEnd)) continue; - for (u32 i = 0; i < FCRAM_APPLICATION_PAGE_COUNT; i++) { - if (usedFCRAMPages[i]) { // Page is occupied already, go to new candidate - candidatePage = i + 1; - counter = 0; - } else { // The paddr we're testing has 1 more free page - counter++; - // Check if there's enough free memory to use this page - // We use == instead of >= because some software does 0-byte allocations - if (counter >= neededPages) { - return candidatePage * pageSize; + s32 blockPaddr = paddrTable[vaddr >> 12]; + s32 blockPages = alloc.pages - ((vaddr - blockStart) >> 12); + blockPages = std::min(srcPages, blockPages); + FcramBlock physicalBlock(blockPaddr, blockPages); + outList.push_back(physicalBlock); + + vaddr += blockPages << 12; + srcPages -= blockPages; + if (srcPages == 0) break; + } + + if (srcPages != 0) Helpers::panic("Unable to find virtual pages to map!"); +} + +void Memory::mapPhysicalMemory(u32 vaddr, u32 paddr, s32 pages, bool r, bool w, bool x) { + assert(!(vaddr & 0xFFF)); + assert(!(paddr & 0xFFF)); + + // TODO: make this a separate function + u8* hostPtr = nullptr; + if (paddr < FCRAM_SIZE) { + hostPtr = fcram + paddr; // FIXME: FCRAM doesn't actually start from physical address 0, but from 0x20000000 + + if (useFastmem) { + addFastmemView(vaddr, FASTMEM_FCRAM_OFFSET + paddr, usize(pages) * pageSize, w); + } + } else if (paddr >= VirtualAddrs::DSPMemStart && paddr < VirtualAddrs::DSPMemStart + DSP_RAM_SIZE) { + hostPtr = dspRam + (paddr - VirtualAddrs::DSPMemStart); + } + + for (int i = 0; i < pages; i++) { + u32 index = (vaddr >> 12) + i; + paddrTable[index] = paddr + (i << 12); + if (r) + readTable[index] = (uintptr_t)(hostPtr + (i << 12)); + else + readTable[index] = 0; + + if (w) + writeTable[index] = (uintptr_t)(hostPtr + (i << 12)); + else + writeTable[index] = 0; + } +} + +void Memory::unmapPhysicalMemory(u32 vaddr, u32 paddr, s32 pages) { + for (int i = 0; i < pages; i++) { + u32 index = (vaddr >> 12) + i; + paddrTable[index] = 0; + readTable[index] = 0; + writeTable[index] = 0; + } + + if (useFastmem) { + arena->Unmap(vaddr, pages * pageSize, false); + } +} + +bool Memory::allocMemory(u32 vaddr, s32 pages, FcramRegion region, bool r, bool w, bool x, MemoryState state) { + auto res = testMemoryState(vaddr, pages, MemoryState::Free); + if (res.isFailure()) return false; + + FcramBlockList memList; + fcramManager.alloc(memList, pages, region, false); + + for (auto it = memList.begin(); it != memList.end(); it++) { + Operation op{.newState = state, .r = r, .w = w, .x = x, .changeState = true, .changePerms = true}; + changeMemoryState(vaddr, it->pages, op); + mapPhysicalMemory(vaddr, it->paddr, it->pages, r, w, x); + vaddr += it->pages << 12; + } + + return true; +} + +bool Memory::allocMemoryLinear(u32& outVaddr, u32 inVaddr, s32 pages, FcramRegion region, bool r, bool w, bool x) { + if (inVaddr) Helpers::panic("inVaddr specified for linear allocation!"); + + FcramBlockList memList; + fcramManager.alloc(memList, pages, region, true); + + u32 paddr = memList.begin()->paddr; + u32 vaddr = getLinearHeapVaddr() + paddr; + auto res = testMemoryState(vaddr, pages, MemoryState::Free); + if (res.isFailure()) Helpers::panic("Unable to map linear allocation (vaddr:%08X pages:%08X)", vaddr, pages); + + Operation op{.newState = MemoryState::Continuous, .r = r, .w = w, .x = x, .changeState = true, .changePerms = true}; + changeMemoryState(vaddr, pages, op); + mapPhysicalMemory(vaddr, paddr, pages, r, w, x); + + outVaddr = vaddr; + return true; +} + +bool Memory::mapVirtualMemory( + u32 dstVaddr, u32 srcVaddr, s32 pages, bool r, bool w, bool x, MemoryState oldDstState, MemoryState oldSrcState, MemoryState newDstState, + MemoryState newSrcState, bool unmapPages +) { + // Check that the regions have the specified state + // TODO: check src perms + auto res = testMemoryState(srcVaddr, pages, oldSrcState); + if (res.isFailure()) return false; + + res = testMemoryState(dstVaddr, pages, oldDstState); + if (res.isFailure()) return false; + + // Change the virtual memory state for both regions + Operation srcOp{.newState = newSrcState, .changeState = true}; + changeMemoryState(srcVaddr, pages, srcOp); + + Operation dstOp{.newState = newDstState, .r = r, .w = w, .x = x, .changeState = true, .changePerms = true}; + changeMemoryState(dstVaddr, pages, dstOp); + + // Get a list of physical blocks in the source region + FcramBlockList physicalList; + queryPhysicalBlocks(physicalList, srcVaddr, pages); + + // Map or unmap each physical block + for (auto& block : physicalList) { + if (newDstState == MemoryState::Free) { + // TODO: Games with CROs will unmap the CRO yet still continue accessing the address it was mapped to? + if (unmapPages) { + unmapPhysicalMemory(dstVaddr, block.paddr, block.pages); } + } else { + mapPhysicalMemory(dstVaddr, block.paddr, block.pages, r, w, x); } + + dstVaddr += block.pages << 12; } - // Couldn't find any page :( - return std::nullopt; + return true; } -u32 Memory::allocateSysMemory(u32 size) { - // Should never be triggered, only here as a sanity check - if (!isAligned(size)) { - Helpers::panic("Memory::allocateSysMemory: Size is not page aligned (val = %08X)", size); +void Memory::changePermissions(u32 vaddr, s32 pages, bool r, bool w, bool x) { + Operation op{.r = r, .w = w, .x = x, .changePerms = true}; + changeMemoryState(vaddr, pages, op); + + // Now that permissions have been changed, update the corresponding host tables + FcramBlockList physicalList; + queryPhysicalBlocks(physicalList, vaddr, pages); + + for (auto& block : physicalList) { + mapPhysicalMemory(vaddr, block.paddr, block.pages, r, w, x); + vaddr += block.pages; } - - // We use a pretty dumb allocator for OS memory since this is not really accessible to the app and is only used internally - // It works by just allocating memory linearly, starting from index 0 of OS memory and going up - // This should also be unreachable in practice and exists as a sanity check - if (size > remainingSysFCRAM()) { - Helpers::panic("Memory::allocateSysMemory: Overflowed OS FCRAM"); - } - - const u32 pageCount = size / pageSize; // Number of pages that will be used up - const u32 startIndex = sysFCRAMIndex() + usedSystemMemory; // Starting FCRAM index - const u32 startingPage = startIndex / pageSize; - - for (u32 i = 0; i < pageCount; i++) { - if (usedFCRAMPages[startingPage + i]) // Also a theoretically unreachable panic for safety - Helpers::panic("Memory::reserveMemory: Trying to reserve already reserved memory"); - usedFCRAMPages[startingPage + i] = true; - } - - usedSystemMemory += size; - return startIndex; } -// The way I understand how the kernel's QueryMemory is supposed to work is that you give it a vaddr -// And the kernel looks up the memory allocations it's performed, finds which one it belongs in and returns its info? -// TODO: Verify this -MemoryInfo Memory::queryMemory(u32 vaddr) { +Result::HorizonResult Memory::queryMemory(MemoryInfo& out, u32 vaddr) { // Check each allocation for (auto& alloc : memoryInfo) { // Check if the memory address belongs in this allocation and return the info if so if (vaddr >= alloc.baseAddr && vaddr < alloc.end()) { - return alloc; + out = alloc; + return Result::Success; } } - // Otherwise, if this vaddr was never allocated - // TODO: I think this is meant to return how much memory starting here is free as the size? - return MemoryInfo(vaddr, pageSize, 0, KernelMemoryTypes::Free); + // Official kernel just returns an error here + Helpers::warn("Failed to find block in QueryMemory!"); + return Result::FailurePlaceholder; +} + +Result::HorizonResult Memory::testMemoryState(u32 vaddr, s32 pages, MemoryState desiredState) { + for (auto& alloc : memoryInfo) { + // Don't bother checking if we're to the left of the requested region + if (vaddr >= alloc.end()) continue; + if (alloc.state != desiredState) return Result::FailurePlaceholder; // TODO: error for state mismatch + + // If the end of this block comes after the end of the requested range with no errors, it's a success + if (alloc.end() >= vaddr + (pages << 12)) return Result::Success; + } + + // TODO: error for when address is outside of userland + return Result::FailurePlaceholder; +} + +void Memory::copyToVaddr(u32 dstVaddr, const u8* srcHost, s32 size) { + // TODO: check for noncontiguous allocations + u8* dstHost = (u8*)readTable[dstVaddr >> 12] + (dstVaddr & 0xFFF); + memcpy(dstHost, srcHost, size); } u8* Memory::mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerms) { @@ -459,13 +568,11 @@ u8* Memory::mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerm bool w = myPerms & 0b010; bool x = myPerms & 0b100; - const auto result = allocateMemory(vaddr, paddr, size, true, r, w, x, false, true); - e.mapped = true; - if (!result.has_value()) { - Helpers::panic("Memory::mapSharedMemory: Failed to map shared memory block"); - return nullptr; - } + Operation op{.newState = MemoryState::Shared, .r = r, .w = x, .x = x, .changeState = true, .changePerms = true}; + changeMemoryState(vaddr, size >> 12, op); + mapPhysicalMemory(vaddr, paddr, size >> 12, r, w, x); + e.mapped = true; return &fcram[paddr]; } } @@ -475,24 +582,6 @@ u8* Memory::mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerm return nullptr; } -void Memory::mirrorMapping(u32 destAddress, u32 sourceAddress, u32 size) { - // Should theoretically be unreachable, only here for safety purposes - assert(isAligned(destAddress) && isAligned(sourceAddress) && isAligned(size)); - - const u32 pageCount = size / pageSize; // How many pages we need to mirror - for (u32 i = 0; i < pageCount; i++) { - // Redo the shift here to "properly" handle wrapping around the address space instead of reading OoB - const u32 sourcePage = sourceAddress / pageSize; - const u32 destPage = destAddress / pageSize; - - readTable[destPage] = readTable[sourcePage]; - writeTable[destPage] = writeTable[sourcePage]; - - sourceAddress += pageSize; - destAddress += pageSize; - } -} - // Get the number of ms since Jan 1 1900 u64 Memory::timeSince3DSEpoch() { using namespace std::chrono; diff --git a/src/core/renderer_mtl/pica_to_mtl.cpp b/src/core/renderer_mtl/pica_to_mtl.cpp index 973ad1bf..21b520f2 100644 --- a/src/core/renderer_mtl/pica_to_mtl.cpp +++ b/src/core/renderer_mtl/pica_to_mtl.cpp @@ -16,27 +16,27 @@ namespace PICA { decodeTexelAI8ToRG8, true, { - .red = MTL::TextureSwizzleRed, - .green = MTL::TextureSwizzleRed, - .blue = MTL::TextureSwizzleRed, - .alpha = MTL::TextureSwizzleGreen, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleGreen, }}, // IA8 {MTL::PixelFormatRG8Unorm, 2, decodeTexelGR8ToRG8}, // RG8 {MTL::PixelFormatR8Unorm, 1, decodeTexelI8ToR8, true, - {.red = MTL::TextureSwizzleRed, .green = MTL::TextureSwizzleRed, .blue = MTL::TextureSwizzleRed, .alpha = MTL::TextureSwizzleOne}}, // I8 - {MTL::PixelFormatA8Unorm, 1, decodeTexelA8ToA8}, // A8 - {MTL::PixelFormatABGR4Unorm, 2, decodeTexelAI4ToABGR4}, // IA4 + {MTL::TextureSwizzleRed, MTL::TextureSwizzleRed, MTL::TextureSwizzleRed, MTL::TextureSwizzleOne}}, // I8 + {MTL::PixelFormatA8Unorm, 1, decodeTexelA8ToA8}, // A8 + {MTL::PixelFormatABGR4Unorm, 2, decodeTexelAI4ToABGR4}, // IA4 {MTL::PixelFormatR8Unorm, 1, decodeTexelI4ToR8, true, - {.red = MTL::TextureSwizzleRed, .green = MTL::TextureSwizzleRed, .blue = MTL::TextureSwizzleRed, .alpha = MTL::TextureSwizzleOne}}, // I4 - {MTL::PixelFormatA8Unorm, 1, decodeTexelA4ToA8}, // A4 - {MTL::PixelFormatRGBA8Unorm, 4, decodeTexelETC1ToRGBA8}, // ETC1 - {MTL::PixelFormatRGBA8Unorm, 4, decodeTexelETC1A4ToRGBA8}, // ETC1A4 + {MTL::TextureSwizzleRed, MTL::TextureSwizzleRed, MTL::TextureSwizzleRed, MTL::TextureSwizzleOne}}, // I4 + {MTL::PixelFormatA8Unorm, 1, decodeTexelA4ToA8}, // A4 + {MTL::PixelFormatRGBA8Unorm, 4, decodeTexelETC1ToRGBA8}, // ETC1 + {MTL::PixelFormatRGBA8Unorm, 4, decodeTexelETC1A4ToRGBA8}, // ETC1A4 }; void checkForMTLPixelFormatSupport(MTL::Device* device) { @@ -57,10 +57,10 @@ namespace PICA { decodeTexelAI4ToRG8, true, { - .red = MTL::TextureSwizzleRed, - .green = MTL::TextureSwizzleRed, - .blue = MTL::TextureSwizzleRed, - .alpha = MTL::TextureSwizzleGreen, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleRed, + MTL::TextureSwizzleGreen, } }; } diff --git a/src/core/services/frd.cpp b/src/core/services/frd.cpp index 63e951a6..d8bcd56f 100644 --- a/src/core/services/frd.cpp +++ b/src/core/services/frd.cpp @@ -27,6 +27,7 @@ namespace FRDCommands { GetFriendAttributeFlags = 0x00170042, UpdateGameModeDescription = 0x001D0002, + SaveLocalAccountData = 0x04050000, UpdateMii = 0x040C0800, }; } @@ -61,6 +62,7 @@ void FRDService::handleSyncRequest(u32 messagePointer, FRDService::Type type) { if (type == Type::A) { switch (command) { case FRDCommands::UpdateMii: updateMii(messagePointer); break; + case FRDCommands::SaveLocalAccountData: saveLocalAccountData(messagePointer); break; default: Helpers::panic("FRD:A service requested. Command: %08X\n", command); break; } } else { @@ -265,6 +267,13 @@ void FRDService::logout(u32 messagePointer) { mem.write32(messagePointer + 4, Result::Success); } +void FRDService::saveLocalAccountData(u32 messagePointer) { + log("FRD::SaveLocalAccountData (stubbed)\n"); + + mem.write32(messagePointer, IPC::responseHeader(0x405, 1, 0)); + mem.write32(messagePointer + 4, Result::Success); +} + void FRDService::updateMii(u32 messagePointer) { log("FRD::UpdateMii (stubbed)\n"); diff --git a/src/core/services/fs.cpp b/src/core/services/fs.cpp index 18dd0b21..5d6cb44f 100644 --- a/src/core/services/fs.cpp +++ b/src/core/services/fs.cpp @@ -194,7 +194,11 @@ void FSService::handleSyncRequest(u32 messagePointer) { case FSCommands::SetThisSaveDataSecureValue: setThisSaveDataSecureValue(messagePointer); break; case FSCommands::AbnegateAccessRight: abnegateAccessRight(messagePointer); break; case FSCommands::TheGameboyVCFunction: theGameboyVCFunction(messagePointer); break; - default: Helpers::panic("FS service requested. Command: %08X\n", command); + + default: + Helpers::warn("Unimplemented FS service requested. Command: %08X\n", command); + mem.write32(messagePointer + 4, Result::Success); + break; } } diff --git a/src/core/services/ldr_ro.cpp b/src/core/services/ldr_ro.cpp index e1c5bde6..561bdf3e 100644 --- a/src/core/services/ldr_ro.cpp +++ b/src/core/services/ldr_ro.cpp @@ -23,7 +23,8 @@ namespace CROHeader { NameOffset = 0x084, NextCRO = 0x088, PrevCRO = 0x08C, - FixedSize = 0x98, + FileSize = 0x090, + FixedSize = 0x098, OnUnresolved = 0x0AC, CodeOffset = 0x0B0, DataOffset = 0x0B8, @@ -146,8 +147,10 @@ static const std::string CRO_MAGIC("CRO0"); static const std::string CRO_MAGIC_FIXED("FIXD"); static const std::string CRR_MAGIC("CRR0"); +using namespace KernelMemoryTypes; + class CRO { - Memory &mem; + Memory& mem; u32 croPointer; // Origin address of CRO in RAM u32 oldDataSegmentOffset; @@ -155,7 +158,7 @@ class CRO { bool isCRO; // False if CRS public: - CRO(Memory &mem, u32 croPointer, bool isCRO) : mem(mem), croPointer(croPointer), oldDataSegmentOffset(0), isCRO(isCRO) {} + CRO(Memory& mem, u32 croPointer, bool isCRO) : mem(mem), croPointer(croPointer), oldDataSegmentOffset(0), isCRO(isCRO) {} ~CRO() = default; std::string getModuleName() { @@ -164,25 +167,15 @@ class CRO { return mem.readString(moduleName.offset, moduleName.size); } - u32 getNextCRO() { - return mem.read32(croPointer + CROHeader::NextCRO); - } - - u32 getPrevCRO() { - return mem.read32(croPointer + CROHeader::PrevCRO); - } + u32 getNextCRO() { return mem.read32(croPointer + CROHeader::NextCRO); } - u32 getFixedSize() { - return mem.read32(croPointer + CROHeader::FixedSize); - } + u32 getPrevCRO() { return mem.read32(croPointer + CROHeader::PrevCRO); } - void setNextCRO(u32 nextCRO) { - mem.write32(croPointer + CROHeader::NextCRO, nextCRO); - } + u32 getFixedSize() { return mem.read32(croPointer + CROHeader::FixedSize); } - void setPrevCRO(u32 prevCRO) { - mem.write32(croPointer + CROHeader::PrevCRO, prevCRO); - } + void setNextCRO(u32 nextCRO) { mem.write32(croPointer + CROHeader::NextCRO, nextCRO); } + void setPrevCRO(u32 prevCRO) { mem.write32(croPointer + CROHeader::PrevCRO, prevCRO); } + u32 getSize() { return mem.read32(croPointer + CROHeader::FileSize); } void write32(u32 addr, u32 value) { // Note: some games export symbols to the static module, which doesn't contain any segments. @@ -228,21 +221,17 @@ class CRO { return entryOffset + offset; } - u32 getOnUnresolvedAddr() { - return getSegmentAddr(mem.read32(croPointer + CROHeader::OnUnresolved)); - } + u32 getOnUnresolvedAddr() { return getSegmentAddr(mem.read32(croPointer + CROHeader::OnUnresolved)); } u32 getNamedExportSymbolAddr(const std::string& symbolName) { // Note: The CRO contains a trie for fast symbol lookup. For simplicity, // we won't use it and instead look up the symbol in the named export symbol table const u32 exportStringSize = mem.read32(croPointer + CROHeader::ExportStringSize); - const CROHeaderEntry namedExportTable = getHeaderEntry(CROHeader::NamedExportTableOffset); for (u32 namedExport = 0; namedExport < namedExportTable.size; namedExport++) { const u32 nameOffset = mem.read32(namedExportTable.offset + 8 * namedExport + NamedExportTable::NameOffset); - const std::string exportSymbolName = mem.readString(nameOffset, exportStringSize); if (symbolName.compare(exportSymbolName) == 0) { @@ -437,7 +426,7 @@ class CRO { return true; } - bool rebaseSegmentTable(u32 dataVaddr, u32 bssVaddr, u32 *oldDataVaddr) { + bool rebaseSegmentTable(u32 dataVaddr, u32 bssVaddr, u32* oldDataVaddr) { const CROHeaderEntry segmentTable = getHeaderEntry(CROHeader::SegmentTableOffset); for (u32 segment = 0; segment < segmentTable.size; segment++) { @@ -446,13 +435,16 @@ class CRO { const u32 segmentID = mem.read32(segmentTable.offset + 12 * segment + SegmentTable::ID); switch (segmentID) { case SegmentTable::SegmentID::DATA: - *oldDataVaddr = segmentOffset + croPointer; oldDataSegmentOffset = segmentOffset; segmentOffset = dataVaddr; break; + *oldDataVaddr = segmentOffset + croPointer; + oldDataSegmentOffset = segmentOffset; + segmentOffset = dataVaddr; + break; case SegmentTable::SegmentID::BSS: segmentOffset = bssVaddr; break; case SegmentTable::SegmentID::TEXT: case SegmentTable::SegmentID::RODATA: - if (segmentOffset != 0) segmentOffset += croPointer; break; - default: - Helpers::panic("Unknown segment ID = %u", segmentID); + if (segmentOffset != 0) segmentOffset += croPointer; + break; + default: Helpers::panic("Unknown segment ID = %u", segmentID); } mem.write32(segmentTable.offset + 12 * segment + SegmentTable::Offset, segmentOffset); @@ -473,9 +465,9 @@ class CRO { case SegmentTable::SegmentID::BSS: segmentOffset = 0; break; case SegmentTable::SegmentID::TEXT: case SegmentTable::SegmentID::RODATA: - if (segmentOffset != 0) segmentOffset -= croPointer; break; - default: - Helpers::panic("Unknown segment ID = %u", segmentID); + if (segmentOffset != 0) segmentOffset -= croPointer; + break; + default: Helpers::panic("Unknown segment ID = %u", segmentID); } mem.write32(segmentTable.offset + 12 * segment + SegmentTable::Offset, segmentOffset); @@ -639,7 +631,9 @@ class CRO { u32 relocationOffset = mem.read32(anonymousImportTable.offset + 8 * anonymousImport + AnonymousImportTable::RelocationOffset); if (relocationOffset != 0) { - mem.write32(anonymousImportTable.offset + 8 * anonymousImport + AnonymousImportTable::RelocationOffset, relocationOffset + croPointer); + mem.write32( + anonymousImportTable.offset + 8 * anonymousImport + AnonymousImportTable::RelocationOffset, relocationOffset + croPointer + ); } } @@ -653,7 +647,9 @@ class CRO { u32 relocationOffset = mem.read32(anonymousImportTable.offset + 8 * anonymousImport + AnonymousImportTable::RelocationOffset); if (relocationOffset != 0) { - mem.write32(anonymousImportTable.offset + 8 * anonymousImport + AnonymousImportTable::RelocationOffset, relocationOffset - croPointer); + mem.write32( + anonymousImportTable.offset + 8 * anonymousImport + AnonymousImportTable::RelocationOffset, relocationOffset - croPointer + ); } } @@ -673,7 +669,6 @@ class CRO { const u32 addend = mem.read32(relocationPatchTable.offset + 12 * relocationPatch + RelocationPatch::Addend); const u32 segmentAddr = getSegmentAddr(segmentOffset); - const u32 entryID = mem.read32(segmentTable.offset + 12 * (segmentOffset & 0xF) + SegmentTable::ID); u32 relocationTarget = segmentAddr; @@ -1198,9 +1193,7 @@ class CRO { } }; -void LDRService::reset() { - loadedCRS = 0; -} +void LDRService::reset() { loadedCRS = 0; } void LDRService::handleSyncRequest(u32 messagePointer) { const u32 command = mem.read32(messagePointer); @@ -1245,7 +1238,14 @@ void LDRService::initialize(u32 messagePointer) { } // Map CRO to output address - mem.mirrorMapping(mapVaddr, crsPointer, size); + // TODO: how to handle permissions? + bool succeeded = mem.mapVirtualMemory( + mapVaddr, crsPointer, size >> 12, true, true, true, MemoryState::Free, MemoryState::Private, MemoryState::Locked, MemoryState::AliasCode + ); + + if (!succeeded) { + Helpers::panic("Failed to map CRS"); + } CRO crs(mem, mapVaddr, false); @@ -1312,7 +1312,9 @@ void LDRService::loadCRO(u32 messagePointer, bool isNew) { const u32 fixLevel = mem.read32(messagePointer + 40); const Handle process = mem.read32(messagePointer + 52); - log("LDR_RO::LoadCRO (isNew = %d, buffer = %08X, vaddr = %08X, size = %08X, .data vaddr = %08X, .data size = %08X, .bss vaddr = %08X, .bss size = %08X, auto link = %d, fix level = %X, process = %X)\n", isNew, croPointer, mapVaddr, size, dataVaddr, dataSize, bssVaddr, bssSize, autoLink, fixLevel, process); + log("LDR_RO::LoadCRO (isNew = %d, buffer = %08X, vaddr = %08X, size = %08X, .data vaddr = %08X, .data size = %08X, .bss vaddr = %08X, .bss size " + "= %08X, auto link = %d, fix level = %X, process = %X)\n", + isNew, croPointer, mapVaddr, size, dataVaddr, dataSize, bssVaddr, bssSize, autoLink, fixLevel, process); // Sanity checks if (size < CRO_HEADER_SIZE) { @@ -1332,7 +1334,14 @@ void LDRService::loadCRO(u32 messagePointer, bool isNew) { } // Map CRO to output address - mem.mirrorMapping(mapVaddr, croPointer, size); + // TODO: how to handle permissions? + bool succeeded = mem.mapVirtualMemory( + mapVaddr, croPointer, size >> 12, true, true, true, MemoryState::Free, MemoryState::Private, MemoryState::Locked, MemoryState::AliasCode + ); + + if (!succeeded) { + Helpers::panic("Failed to map CRO"); + } CRO cro(mem, mapVaddr, true); @@ -1392,7 +1401,18 @@ void LDRService::unloadCRO(u32 messagePointer) { Helpers::panic("Failed to unrebase CRO"); } + u32 size = cro.getSize(); + bool succeeded = mem.mapVirtualMemory( + mapVaddr, croPointer, size >> 12, false, false, false, MemoryState::Locked, MemoryState::AliasCode, MemoryState::Free, MemoryState::Private, + false + ); + + if (!succeeded) { + Helpers::panic("Failed to unmap CRO"); + } + kernel.clearInstructionCacheRange(mapVaddr, cro.getFixedSize()); + mem.write32(messagePointer, IPC::responseHeader(0x5, 1, 0)); mem.write32(messagePointer + 4, Result::Success); } \ No newline at end of file diff --git a/src/dynamic_library.cpp b/src/dynamic_library.cpp new file mode 100644 index 00000000..833baef7 --- /dev/null +++ b/src/dynamic_library.cpp @@ -0,0 +1,96 @@ +// SPDX-FileCopyrightText: 2019 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "dynamic_library.hpp" + +#include + +#include +#include + +#ifdef _WIN32 +#include +#else +#include +#endif + +namespace Common { + DynamicLibrary::DynamicLibrary() = default; + DynamicLibrary::DynamicLibrary(const char* filename) { void(open(filename)); } + DynamicLibrary::DynamicLibrary(void* handle_) : handle{handle_} {} + DynamicLibrary::DynamicLibrary(DynamicLibrary&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)} {} + + DynamicLibrary& DynamicLibrary::operator=(DynamicLibrary&& rhs) noexcept { + close(); + handle = std::exchange(rhs.handle, nullptr); + return *this; + } + + DynamicLibrary::~DynamicLibrary() { close(); } + + std::string DynamicLibrary::getUnprefixedFilename(const char* filename) { +#if defined(_WIN32) + return std::string(filename) + ".dll"; +#elif defined(__APPLE__) + return std::string(filename) + ".dylib"; +#else + return std::string(filename) + ".so"; +#endif + } + + std::string DynamicLibrary::getVersionedFilename(const char* libname, int major, int minor) { +#if defined(_WIN32) + if (major >= 0 && minor >= 0) + return fmt::format("{}-{}-{}.dll", libname, major, minor); + else if (major >= 0) + return fmt::format("{}-{}.dll", libname, major); + else + return fmt::format("{}.dll", libname); +#elif defined(__APPLE__) + const char* prefix = std::strncmp(libname, "lib", 3) ? "lib" : ""; + if (major >= 0 && minor >= 0) + return fmt::format("{}{}.{}.{}.dylib", prefix, libname, major, minor); + else if (major >= 0) + return fmt::format("{}{}.{}.dylib", prefix, libname, major); + else + return fmt::format("{}{}.dylib", prefix, libname); +#else + const char* prefix = std::strncmp(libname, "lib", 3) ? "lib" : ""; + if (major >= 0 && minor >= 0) + return fmt::format("{}{}.so.{}.{}", prefix, libname, major, minor); + else if (major >= 0) + return fmt::format("{}{}.so.{}", prefix, libname, major); + else + return fmt::format("{}{}.so", prefix, libname); +#endif + } + + bool DynamicLibrary::open(const char* filename) { +#ifdef _WIN32 + handle = reinterpret_cast(LoadLibraryA(filename)); +#else + handle = dlopen(filename, RTLD_NOW); +#endif + return handle != nullptr; + } + + void DynamicLibrary::close() { + if (!isOpen()) return; + +#ifdef _WIN32 + FreeLibrary(reinterpret_cast(handle)); +#else + dlclose(handle); +#endif + handle = nullptr; + } + + void* DynamicLibrary::getSymbolAddress(const char* name) const { +#ifdef _WIN32 + return reinterpret_cast(GetProcAddress(reinterpret_cast(handle), name)); +#else + return reinterpret_cast(dlsym(handle, name)); +#endif + } + +} // namespace Common \ No newline at end of file diff --git a/src/emulator.cpp b/src/emulator.cpp index 1079fc38..2af529de 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -20,8 +20,8 @@ __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1; Emulator::Emulator() : config(getConfigPath()), kernel(cpu, memory, gpu, config, lua), cpu(memory, kernel, *this), gpu(memory, config), - memory(cpu.getTicksRef(), config), cheats(memory, kernel.getServiceManager().getHID()), audioDevice(config.audioDeviceConfig), lua(*this), - running(false) + memory(kernel.getFcramManager(), config), cheats(memory, kernel.getServiceManager().getHID()), audioDevice(config.audioDeviceConfig), + lua(*this), running(false) #ifdef PANDA3DS_ENABLE_HTTP_SERVER , httpServer(this) @@ -159,20 +159,21 @@ void Emulator::pollScheduler() { scheduler.updateNextTimestamp(); switch (eventType) { - case Scheduler::EventType::VBlank: [[likely]] { - // Signal that we've reached the end of a frame - frameDone = true; - lua.signalEvent(LuaEvent::Frame); + case Scheduler::EventType::VBlank: + [[likely]] { + // Signal that we've reached the end of a frame + frameDone = true; + lua.signalEvent(LuaEvent::Frame); - // Send VBlank interrupts - ServiceManager& srv = kernel.getServiceManager(); - srv.sendGPUInterrupt(GPUInterrupt::VBlank0); - srv.sendGPUInterrupt(GPUInterrupt::VBlank1); + // Send VBlank interrupts + ServiceManager& srv = kernel.getServiceManager(); + srv.sendGPUInterrupt(GPUInterrupt::VBlank0); + srv.sendGPUInterrupt(GPUInterrupt::VBlank1); - // Queue next VBlank event - scheduler.addEvent(Scheduler::EventType::VBlank, time + CPU::ticksPerSec / 60); - break; - } + // Queue next VBlank event + scheduler.addEvent(Scheduler::EventType::VBlank, time + CPU::ticksPerSec / 60); + break; + } case Scheduler::EventType::UpdateTimers: kernel.pollTimers(); break; case Scheduler::EventType::RunDSP: { @@ -352,8 +353,7 @@ bool Emulator::loadELF(std::ifstream& file) { std::span Emulator::getSMDH() { switch (romType) { case ROMType::NCSD: - case ROMType::CXI: - return memory.getCXI()->smdh; + case ROMType::CXI: return memory.getCXI()->smdh; default: { return std::span(); } @@ -385,7 +385,7 @@ static void dumpRomFSNode(const RomFS::RomFSNode& node, const char* romFSBase, c for (auto& directory : node.directories) { const auto newPath = path / directory->name; - + // Create the directory for the new folder std::error_code ec; std::filesystem::create_directories(newPath, ec); @@ -464,7 +464,7 @@ void Emulator::reloadSettings() { loadRenderdoc(); } - gpu.getRenderer()->setHashTextures(config.hashTextures); + gpu.getRenderer()->setHashTextures(config.hashTextures); #ifdef PANDA3DS_ENABLE_DISCORD_RPC // Reload RPC setting if we're compiling with RPC support diff --git a/src/libretro_core.cpp b/src/libretro_core.cpp index b44687b2..9ad3b62a 100644 --- a/src/libretro_core.cpp +++ b/src/libretro_core.cpp @@ -153,6 +153,7 @@ static int fetchVariableRange(std::string key, int min, int max) { return std::c static void configInit() { static const retro_variable values[] = { + {"panda3ds_use_fastmem", EmulatorConfig::enableFastmemDefault ? "Enable fastmem; enabled|disabled" : "Enable fastmem; disabled|enabled"}, {"panda3ds_use_shader_jit", EmulatorConfig::shaderJitDefault ? "Enable shader JIT; enabled|disabled" : "Enable shader JIT; disabled|enabled"}, {"panda3ds_accelerate_shaders", EmulatorConfig::accelerateShadersDefault ? "Run 3DS shaders on the GPU; enabled|disabled" : "Run 3DS shaders on the GPU; disabled|enabled"}, @@ -188,9 +189,10 @@ static void configUpdate() { config.rendererType = RendererType::OpenGL; config.vsyncEnabled = fetchVariableBool("panda3ds_use_vsync", true); config.shaderJitEnabled = fetchVariableBool("panda3ds_use_shader_jit", EmulatorConfig::shaderJitDefault); + config.fastmemEnabled = fetchVariableBool("panda3ds_use_fastmem", EmulatorConfig::enableFastmemDefault); + config.systemLanguage = EmulatorConfig::languageCodeFromString(fetchVariable("panda3ds_system_language", "en")); config.chargerPlugged = fetchVariableBool("panda3ds_use_charger", true); config.batteryPercentage = fetchVariableRange("panda3ds_battery_level", 5, 100); - config.systemLanguage = EmulatorConfig::languageCodeFromString(fetchVariable("panda3ds_system_language", "en")); config.dspType = Audio::DSPCore::typeFromString(fetchVariable("panda3ds_dsp_emulation", "null")); config.audioEnabled = fetchVariableBool("panda3ds_use_audio", false); diff --git a/src/panda_qt/config_window.cpp b/src/panda_qt/config_window.cpp index 14b33156..1d0c83d4 100644 --- a/src/panda_qt/config_window.cpp +++ b/src/panda_qt/config_window.cpp @@ -172,6 +172,10 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win connectCheckbox(circlePadProEnabled, config.circlePadProEnabled); genLayout->addRow(circlePadProEnabled); + QCheckBox* fastmemEnabled = new QCheckBox(tr("Enable Fastmem")); + connectCheckbox(fastmemEnabled, config.fastmemEnabled); + genLayout->addRow(fastmemEnabled); + QCheckBox* discordRpcEnabled = new QCheckBox(tr("Enable Discord RPC")); connectCheckbox(discordRpcEnabled, config.discordRpcEnabled); genLayout->addRow(discordRpcEnabled); diff --git a/third_party/boost b/third_party/boost index 4532ae23..ecfc47f5 160000 --- a/third_party/boost +++ b/third_party/boost @@ -1 +1 @@ -Subproject commit 4532ae239c4d0b88a547d28e19348c3b05bfd4d6 +Subproject commit ecfc47f58e73fa353456068a7245dc933ebe4472 diff --git a/third_party/host_memory/LICENSE.txt b/third_party/host_memory/LICENSE.txt new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/third_party/host_memory/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/third_party/host_memory/host_memory.cpp b/third_party/host_memory/host_memory.cpp new file mode 100644 index 00000000..bbd15ebe --- /dev/null +++ b/third_party/host_memory/host_memory.cpp @@ -0,0 +1,753 @@ +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +// Copyright 2008 Dolphin Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#if defined(_M_ARM64) || defined(__aarch64__) +#define ARCHITECTURE_arm64 +#endif + +#ifdef _WIN32 + +#include + +#include +#include +#include + +#include "dynamic_library.hpp" + +#elif defined(__linux__) || defined(__FreeBSD__) // ^^^ Windows ^^^ vvv Linux vvv + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include +#include +#include +#include +#include + +#include + +#ifndef MAP_NORESERVE +#define MAP_NORESERVE 0 +#endif + +// On Android, include ioctl for shared memory ioctls, dlfcn for loading libandroid and linux/ashmem for ashmem defines +#ifdef __ANDROID__ +#include +#include +#include +#endif + +#endif // ^^^ Linux ^^^ + +#include +#include + +#include +#include +#include +#include + +#include "align.hpp" + +#define ASSERT(...) +#define UNIMPLEMENTED_MSG(...) +#define ASSERT_MSG(...) + +namespace Common { + constexpr size_t PageAlignment = 0x1000; + constexpr size_t HugePageSize = 0x200000; + +#if defined(_WIN32) && defined(PANDA3DS_HARDWARE_FASTMEM) + +// Manually imported for MinGW compatibility +#ifndef MEM_RESERVE_PLACEHOLDER +#define MEM_RESERVE_PLACEHOLDER 0x00040000 +#endif +#ifndef MEM_REPLACE_PLACEHOLDER +#define MEM_REPLACE_PLACEHOLDER 0x00004000 +#endif +#ifndef MEM_COALESCE_PLACEHOLDERS +#define MEM_COALESCE_PLACEHOLDERS 0x00000001 +#endif +#ifndef MEM_PRESERVE_PLACEHOLDER +#define MEM_PRESERVE_PLACEHOLDER 0x00000002 +#endif + + using PFN_CreateFileMapping2 = _Ret_maybenull_ HANDLE(WINAPI*)( + _In_ HANDLE File, _In_opt_ SECURITY_ATTRIBUTES* SecurityAttributes, _In_ ULONG DesiredAccess, _In_ ULONG PageProtection, + _In_ ULONG AllocationAttributes, _In_ ULONG64 MaximumSize, _In_opt_ PCWSTR Name, + _Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters, _In_ ULONG ParameterCount + ); + + using PFN_VirtualAlloc2 = _Ret_maybenull_ PVOID(WINAPI*)( + _In_opt_ HANDLE Process, _In_opt_ PVOID BaseAddress, _In_ SIZE_T Size, _In_ ULONG AllocationType, _In_ ULONG PageProtection, + _Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters, _In_ ULONG ParameterCount + ); + + using PFN_MapViewOfFile3 = _Ret_maybenull_ PVOID(WINAPI*)( + _In_ HANDLE FileMapping, _In_opt_ HANDLE Process, _In_opt_ PVOID BaseAddress, _In_ ULONG64 Offset, _In_ SIZE_T ViewSize, + _In_ ULONG AllocationType, _In_ ULONG PageProtection, _Inout_updates_opt_(ParameterCount) MEM_EXTENDED_PARAMETER* ExtendedParameters, + _In_ ULONG ParameterCount + ); + + using PFN_UnmapViewOfFile2 = BOOL(WINAPI*)(_In_ HANDLE Process, _In_ PVOID BaseAddress, _In_ ULONG UnmapFlags); + + template + static void GetFuncAddress(Common::DynamicLibrary& dll, const char* name, T& pfn) { + if (!dll.getSymbol(name, &pfn)) { + Helpers::warn("Failed to load %s", name); + throw std::bad_alloc{}; + } + } + + class HostMemory::Impl { + public: + explicit Impl(size_t backing_size_, size_t virtual_size_) + : backing_size{backing_size_}, virtual_size{virtual_size_}, process{GetCurrentProcess()}, kernelbase_dll("Kernelbase") { + if (!kernelbase_dll.isOpen()) { + Helpers::warn("Failed to load Kernelbase.dll"); + throw std::bad_alloc{}; + } + GetFuncAddress(kernelbase_dll, "CreateFileMapping2", pfn_CreateFileMapping2); + GetFuncAddress(kernelbase_dll, "VirtualAlloc2", pfn_VirtualAlloc2); + GetFuncAddress(kernelbase_dll, "MapViewOfFile3", pfn_MapViewOfFile3); + GetFuncAddress(kernelbase_dll, "UnmapViewOfFile2", pfn_UnmapViewOfFile2); + + // Allocate backing file map + backing_handle = pfn_CreateFileMapping2( + INVALID_HANDLE_VALUE, nullptr, FILE_MAP_WRITE | FILE_MAP_READ, PAGE_READWRITE, SEC_COMMIT, backing_size, nullptr, nullptr, 0 + ); + if (!backing_handle) { + Helpers::warn("Failed to allocate %X MiB of backing memory", backing_size >> 20); + throw std::bad_alloc{}; + } + // Allocate a virtual memory for the backing file map as placeholder + backing_base = + static_cast(pfn_VirtualAlloc2(process, nullptr, backing_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, nullptr, 0)); + if (!backing_base) { + Release(); + Helpers::warn("Failed to reserve %X MiB of virtual memory", backing_size >> 20); + throw std::bad_alloc{}; + } + // Map backing placeholder + void* const ret = + pfn_MapViewOfFile3(backing_handle, process, backing_base, 0, backing_size, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, nullptr, 0); + if (ret != backing_base) { + Release(); + Helpers::warn("Failed to map %X MiB of virtual memory", backing_size >> 20); + throw std::bad_alloc{}; + } + // Allocate virtual address placeholder + virtual_base = + static_cast(pfn_VirtualAlloc2(process, nullptr, virtual_size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, PAGE_NOACCESS, nullptr, 0)); + if (!virtual_base) { + Release(); + Helpers::warn("Failed to reserve %X GiB of virtual memory", virtual_size >> 30); + throw std::bad_alloc{}; + } + } + + ~Impl() { Release(); } + + void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perms) { + std::unique_lock lock{placeholder_mutex}; + if (!IsNiechePlaceholder(virtual_offset, length)) { + Split(virtual_offset, length); + } + ASSERT(placeholders.find({virtual_offset, virtual_offset + length}) == placeholders.end()); + TrackPlaceholder(virtual_offset, host_offset, length); + + MapView(virtual_offset, host_offset, length); + } + + void Unmap(size_t virtual_offset, size_t length) { + std::scoped_lock lock{placeholder_mutex}; + + // Unmap until there are no more placeholders + while (UnmapOnePlaceholder(virtual_offset, length)) { + } + } + + void Protect(size_t virtual_offset, size_t length, bool read, bool write, bool execute) { + DWORD new_flags{}; + if (read && write) { + new_flags = PAGE_READWRITE; + } else if (read && !write) { + new_flags = PAGE_READONLY; + } else if (!read && !write) { + new_flags = PAGE_NOACCESS; + } else { + UNIMPLEMENTED_MSG("Protection flag combination read={} write={}", read, write); + } + const size_t virtual_end = virtual_offset + length; + + std::scoped_lock lock{placeholder_mutex}; + auto [it, end] = placeholders.equal_range({virtual_offset, virtual_end}); + while (it != end) { + const size_t offset = std::max(it->lower(), virtual_offset); + const size_t protect_length = std::min(it->upper(), virtual_end) - offset; + DWORD old_flags{}; + if (!VirtualProtect(virtual_base + offset, protect_length, new_flags, &old_flags)) { + Helpers::warn("Failed to change virtual memory protect rules"); + } + ++it; + } + } + + bool ClearBackingRegion(size_t physical_offset, size_t length) { + // TODO: This does not seem to be possible on Windows. + return false; + } + + void EnableDirectMappedAddress() { + // TODO + Helpers::panic("Unimplemented: EnableDirectMappedAddress on Windows"); + } + + const size_t backing_size; ///< Size of the backing memory in bytes + const size_t virtual_size; ///< Size of the virtual address placeholder in bytes + + u8* backing_base{}; + u8* virtual_base{}; + + private: + /// Release all resources in the object + void Release() { + if (!placeholders.empty()) { + for (const auto& placeholder : placeholders) { + if (!pfn_UnmapViewOfFile2(process, virtual_base + placeholder.lower(), MEM_PRESERVE_PLACEHOLDER)) { + Helpers::warn("Failed to unmap virtual memory placeholder"); + } + } + Coalesce(0, virtual_size); + } + if (virtual_base) { + if (!VirtualFree(virtual_base, 0, MEM_RELEASE)) { + Helpers::warn("Failed to free virtual memory"); + } + } + if (backing_base) { + if (!pfn_UnmapViewOfFile2(process, backing_base, MEM_PRESERVE_PLACEHOLDER)) { + Helpers::warn("Failed to unmap backing memory placeholder"); + } + if (!VirtualFreeEx(process, backing_base, 0, MEM_RELEASE)) { + Helpers::warn("Failed to free backing memory"); + } + } + if (!CloseHandle(backing_handle)) { + Helpers::warn("Failed to free backing memory file handle"); + } + } + + /// Unmap one placeholder in the given range (partial unmaps are supported) + /// Return true when there are no more placeholders to unmap + bool UnmapOnePlaceholder(size_t virtual_offset, size_t length) { + const auto it = placeholders.find({virtual_offset, virtual_offset + length}); + const auto begin = placeholders.begin(); + const auto end = placeholders.end(); + if (it == end) { + return false; + } + const size_t placeholder_begin = it->lower(); + const size_t placeholder_end = it->upper(); + const size_t unmap_begin = std::max(virtual_offset, placeholder_begin); + const size_t unmap_end = std::min(virtual_offset + length, placeholder_end); + ASSERT(unmap_begin >= placeholder_begin && unmap_begin < placeholder_end); + ASSERT(unmap_end <= placeholder_end && unmap_end > placeholder_begin); + + const auto host_pointer_it = placeholder_host_pointers.find(placeholder_begin); + ASSERT(host_pointer_it != placeholder_host_pointers.end()); + const size_t host_offset = host_pointer_it->second; + + const bool split_left = unmap_begin > placeholder_begin; + const bool split_right = unmap_end < placeholder_end; + + if (!pfn_UnmapViewOfFile2(process, virtual_base + placeholder_begin, MEM_PRESERVE_PLACEHOLDER)) { + Helpers::warn("Failed to unmap placeholder"); + } + // If we have to remap memory regions due to partial unmaps, we are in a data race as + // Windows doesn't support remapping memory without unmapping first. Avoid adding any extra + // logic within the panic region described below. + + // Panic region, we are in a data race right now + if (split_left || split_right) { + Split(unmap_begin, unmap_end - unmap_begin); + } + if (split_left) { + MapView(placeholder_begin, host_offset, unmap_begin - placeholder_begin); + } + if (split_right) { + MapView(unmap_end, host_offset + unmap_end - placeholder_begin, placeholder_end - unmap_end); + } + // End panic region + + size_t coalesce_begin = unmap_begin; + if (!split_left) { + // Try to coalesce pages to the left + coalesce_begin = it == begin ? 0 : std::prev(it)->upper(); + if (coalesce_begin != placeholder_begin) { + Coalesce(coalesce_begin, unmap_end - coalesce_begin); + } + } + if (!split_right) { + // Try to coalesce pages to the right + const auto next = std::next(it); + const size_t next_begin = next == end ? virtual_size : next->lower(); + if (placeholder_end != next_begin) { + // We can coalesce to the right + Coalesce(coalesce_begin, next_begin - coalesce_begin); + } + } + // Remove and reinsert placeholder trackers + UntrackPlaceholder(it); + if (split_left) { + TrackPlaceholder(placeholder_begin, host_offset, unmap_begin - placeholder_begin); + } + if (split_right) { + TrackPlaceholder(unmap_end, host_offset + unmap_end - placeholder_begin, placeholder_end - unmap_end); + } + return true; + } + + void MapView(size_t virtual_offset, size_t host_offset, size_t length) { + if (!pfn_MapViewOfFile3( + backing_handle, process, virtual_base + virtual_offset, host_offset, length, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, nullptr, 0 + )) { + Helpers::warn("Failed to map placeholder"); + } + } + + void Split(size_t virtual_offset, size_t length) { + if (!VirtualFreeEx(process, reinterpret_cast(virtual_base + virtual_offset), length, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER)) { + Helpers::warn("Failed to split placeholder"); + } + } + + void Coalesce(size_t virtual_offset, size_t length) { + if (!VirtualFreeEx(process, reinterpret_cast(virtual_base + virtual_offset), length, MEM_RELEASE | MEM_COALESCE_PLACEHOLDERS)) { + Helpers::warn("Failed to coalesce placeholders"); + } + } + + void TrackPlaceholder(size_t virtual_offset, size_t host_offset, size_t length) { + placeholders.insert({virtual_offset, virtual_offset + length}); + placeholder_host_pointers.emplace(virtual_offset, host_offset); + } + + void UntrackPlaceholder(boost::icl::separate_interval_set::iterator it) { + placeholder_host_pointers.erase(it->lower()); + placeholders.erase(it); + } + + /// Return true when a given memory region is a "nieche" and the placeholders don't have to be + /// split. + bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { + const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); + if (it != placeholders.end() && it->lower() == virtual_offset + length) { + return it == placeholders.begin() ? virtual_offset == 0 : std::prev(it)->upper() == virtual_offset; + } + return false; + } + + HANDLE process{}; ///< Current process handle + HANDLE backing_handle{}; ///< File based backing memory + + DynamicLibrary kernelbase_dll; + PFN_CreateFileMapping2 pfn_CreateFileMapping2{}; + PFN_VirtualAlloc2 pfn_VirtualAlloc2{}; + PFN_MapViewOfFile3 pfn_MapViewOfFile3{}; + PFN_UnmapViewOfFile2 pfn_UnmapViewOfFile2{}; + + std::mutex placeholder_mutex; ///< Mutex for placeholders + boost::icl::separate_interval_set placeholders; ///< Mapped placeholders + std::unordered_map placeholder_host_pointers; ///< Placeholder backing offset + }; + +#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(PANDA3DS_HARDWARE_FASTMEM) // ^^^ Windows ^^^ vvv Linux vvv + +#ifdef __ANDROID__ +#define ASHMEM_DEVICE "/dev/ashmem" + // Android shared memory creation code from Dolphin + static int AshmemCreateFileMapping(const char* name, size_t size) { + // ASharedMemory path - works on API >= 26 and falls through on API < 26: + + // We can't call ASharedMemory_create the normal way without increasing the + // minimum version requirement to API 26, so we use dlopen/dlsym instead + static void* libandroid = dlopen("libandroid.so", RTLD_LAZY | RTLD_LOCAL); + static auto sharedMemoryCreate = reinterpret_cast(dlsym(libandroid, "ASharedMemory_create")); + if (sharedMemoryCreate) { + return sharedMemoryCreate(name, size); + } + + // /dev/ashmem path - works on API < 29: + + int fd, ret; + fd = open(ASHMEM_DEVICE, O_RDWR); + if (fd < 0) return fd; + + // We don't really care if we can't set the name, it is optional + ioctl(fd, ASHMEM_SET_NAME, name); + + ret = ioctl(fd, ASHMEM_SET_SIZE, size); + if (ret < 0) { + close(fd); + Helpers::warn("Ashmem allocation failed"); + return ret; + } + return fd; + } +#endif + +#ifdef ARCHITECTURE_arm64 + static void* ChooseVirtualBase(size_t virtual_size) { + constexpr uintptr_t Map39BitSize = (1ULL << 39); + constexpr uintptr_t Map36BitSize = (1ULL << 36); + + // This is not a cryptographic application, we just want something random. + std::mt19937_64 rng; + + // We want to ensure we are allocating at an address aligned to the L2 block size. + // For Qualcomm devices, we must also allocate memory above 36 bits. + const size_t lower = Map36BitSize / HugePageSize; + const size_t upper = (Map39BitSize - virtual_size) / HugePageSize; + const size_t range = upper - lower; + + // Try up to 64 times to allocate memory at random addresses in the range. + for (int i = 0; i < 64; i++) { + // Calculate a possible location. + uintptr_t hint_address = ((rng() % range) + lower) * HugePageSize; + + // Try to map. + // Note: we may be able to take advantage of MAP_FIXED_NOREPLACE here. + void* map_pointer = + mmap(reinterpret_cast(hint_address), virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); + + // If we successfully mapped, we're done. + if (reinterpret_cast(map_pointer) == hint_address) { + return map_pointer; + } + + // Unmap if necessary, and try again. + if (map_pointer != MAP_FAILED) { + munmap(map_pointer, virtual_size); + } + } + + return MAP_FAILED; + } + +#else + + static void* ChooseVirtualBase(size_t virtual_size) { +#if defined(__FreeBSD__) + void* virtual_base = + mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_ALIGNED_SUPER, -1, 0); + + if (virtual_base != MAP_FAILED) { + return virtual_base; + } +#endif + + return mmap(nullptr, virtual_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); + } + +#endif + + class HostMemory::Impl { + public: + explicit Impl(size_t backing_size_, size_t virtual_size_) : backing_size{backing_size_}, virtual_size{virtual_size_} { + bool good = false; + SCOPE_EXIT { + if (!good) { + Release(); + } + }; + + long page_size = sysconf(_SC_PAGESIZE); + if (page_size != 0x1000) { + Helpers::warn("page size {:#x} is incompatible with 4K paging", page_size); + throw std::bad_alloc{}; + } + + // Backing memory initialization +#if defined(__FreeBSD__) && __FreeBSD__ < 13 + // XXX Drop after FreeBSD 12.* reaches EOL on 2024-06-30 + fd = shm_open(SHM_ANON, O_RDWR, 0600); +#elif defined(__ANDROID__) + fd = AshmemCreateFileMapping("HostMemory", 0); +#else + fd = memfd_create("HostMemory", 0); +#endif + + if (fd < 0) { + Helpers::warn("memfd_create failed: {}", strerror(errno)); + throw std::bad_alloc{}; + } + + // Defined to extend the file with zeros + int ret = ftruncate(fd, backing_size); + if (ret != 0) { + Helpers::warn("ftruncate failed with {}, are you out-of-memory?", strerror(errno)); + throw std::bad_alloc{}; + } + + backing_base = static_cast(mmap(nullptr, backing_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)); + + if (backing_base == MAP_FAILED) { + Helpers::warn("mmap failed: {}", strerror(errno)); + throw std::bad_alloc{}; + } + + // Virtual memory initialization + virtual_base = virtual_map_base = static_cast(ChooseVirtualBase(virtual_size)); + if (virtual_base == MAP_FAILED) { + Helpers::warn("mmap failed: {}", strerror(errno)); + throw std::bad_alloc{}; + } +#if defined(__linux__) + madvise(virtual_base, virtual_size, MADV_HUGEPAGE); +#endif + + free_manager.SetAddressSpace(virtual_base, virtual_size); + good = true; + } + + ~Impl() { Release(); } + + void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perms) { + // Intersect the range with our address space. + AdjustMap(&virtual_offset, &length); + + // We are removing a placeholder. + free_manager.AllocateBlock(virtual_base + virtual_offset, length); + + // Deduce mapping protection flags. + int flags = PROT_NONE; + if (True(perms & MemoryPermission::Read)) { + flags |= PROT_READ; + } + if (True(perms & MemoryPermission::Write)) { + flags |= PROT_WRITE; + } +#ifdef ARCHITECTURE_arm64 + if (True(perms & MemoryPermission::Execute)) { + flags |= PROT_EXEC; + } +#endif + + void* ret = mmap(virtual_base + virtual_offset, length, flags, MAP_SHARED | MAP_FIXED, fd, host_offset); + ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno)); + } + + void Unmap(size_t virtual_offset, size_t length) { + // The method name is wrong. We're still talking about the virtual range. + // We don't want to unmap, we want to reserve this memory. + + // Intersect the range with our address space. + AdjustMap(&virtual_offset, &length); + + // Merge with any adjacent placeholder mappings. + auto [merged_pointer, merged_size] = free_manager.FreeBlock(virtual_base + virtual_offset, length); + + void* ret = mmap(merged_pointer, merged_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); + ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno)); + } + + void Protect(size_t virtual_offset, size_t length, bool read, bool write, bool execute) { + // Intersect the range with our address space. + AdjustMap(&virtual_offset, &length); + + int flags = PROT_NONE; + if (read) { + flags |= PROT_READ; + } + if (write) { + flags |= PROT_WRITE; + } +#ifdef HAS_NCE + if (execute) { + flags |= PROT_EXEC; + } +#endif + int ret = mprotect(virtual_base + virtual_offset, length, flags); + ASSERT_MSG(ret == 0, "mprotect failed: {}", strerror(errno)); + } + + bool ClearBackingRegion(size_t physical_offset, size_t length) { +#ifdef __linux__ + // Set MADV_REMOVE on backing map to destroy it instantly. + // This also deletes the area from the backing file. + int ret = madvise(backing_base + physical_offset, length, MADV_REMOVE); + ASSERT_MSG(ret == 0, "madvise failed: {}", strerror(errno)); + + return true; +#else + return false; +#endif + } + + void EnableDirectMappedAddress() { virtual_base = nullptr; } + + const size_t backing_size; ///< Size of the backing memory in bytes + const size_t virtual_size; ///< Size of the virtual address placeholder in bytes + + u8* backing_base{reinterpret_cast(MAP_FAILED)}; + u8* virtual_base{reinterpret_cast(MAP_FAILED)}; + u8* virtual_map_base{reinterpret_cast(MAP_FAILED)}; + + private: + /// Release all resources in the object + void Release() { + if (virtual_map_base != MAP_FAILED) { + int ret = munmap(virtual_map_base, virtual_size); + ASSERT_MSG(ret == 0, "munmap failed: {}", strerror(errno)); + } + + if (backing_base != MAP_FAILED) { + int ret = munmap(backing_base, backing_size); + ASSERT_MSG(ret == 0, "munmap failed: {}", strerror(errno)); + } + + if (fd != -1) { + int ret = close(fd); + ASSERT_MSG(ret == 0, "close failed: {}", strerror(errno)); + } + } + + void AdjustMap(size_t* virtual_offset, size_t* length) { + if (virtual_base != nullptr) { + return; + } + + // If we are direct mapped, we want to make sure we are operating on a region + // that is in range of our virtual mapping. + size_t intended_start = *virtual_offset; + size_t intended_end = intended_start + *length; + size_t address_space_start = reinterpret_cast(virtual_map_base); + size_t address_space_end = address_space_start + virtual_size; + + if (address_space_start > intended_end || intended_start > address_space_end) { + *virtual_offset = 0; + *length = 0; + } else { + *virtual_offset = std::max(intended_start, address_space_start); + *length = std::min(intended_end, address_space_end) - *virtual_offset; + } + } + + int fd{-1}; // memfd file descriptor, -1 is the error value of memfd_create + FreeRegionManager free_manager{}; + }; + +#else // ^^^ Linux ^^^ vvv Generic vvv + + class HostMemory::Impl { + public: + explicit Impl(size_t /*backing_size */, size_t /* virtual_size */) { + // This is just a place holder. + // Please implement fastmem in a proper way on your platform. + throw std::bad_alloc{}; + } + + void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perm) {} + void Unmap(size_t virtual_offset, size_t length) {} + void Protect(size_t virtual_offset, size_t length, bool read, bool write, bool execute) {} + bool ClearBackingRegion(size_t physical_offset, size_t length) { return false; } + void EnableDirectMappedAddress() {} + + u8* backing_base{nullptr}; + u8* virtual_base{nullptr}; + }; + +#endif // ^^^ Generic ^^^ + + HostMemory::HostMemory(size_t backing_size_, size_t virtual_size_, bool enableFastmem) : backing_size(backing_size_), virtual_size(virtual_size_) { + try { + // Fastmem is disabled, just throw bad alloc and use the VirtualBuffer fallback. + if (!enableFastmem) { + throw std::bad_alloc{}; + } + + // Try to allocate a fastmem arena. + // The implementation will fail with std::bad_alloc on errors. + impl = std::make_unique( + Common::alignUp(backing_size, PageAlignment), Common::alignUp(virtual_size, PageAlignment) + HugePageSize + ); + backing_base = impl->backing_base; + virtual_base = impl->virtual_base; + + if (virtual_base) { + // Ensure the virtual base is aligned to the L2 block size. + virtual_base = reinterpret_cast(Common::alignUp(reinterpret_cast(virtual_base), HugePageSize)); + virtual_base_offset = virtual_base - impl->virtual_base; + } + + } catch (const std::bad_alloc&) { + if (enableFastmem) { + Helpers::warn("Fastmem unavailable, falling back to VirtualBuffer for memory allocation"); + } + + fallback_buffer = std::make_unique>(backing_size); + backing_base = fallback_buffer->data(); + virtual_base = nullptr; + } + } + + HostMemory::~HostMemory() = default; + HostMemory::HostMemory(HostMemory&&) noexcept = default; + HostMemory& HostMemory::operator=(HostMemory&&) noexcept = default; + + void HostMemory::Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perms, bool separate_heap) { + ASSERT(virtual_offset % PageAlignment == 0); + ASSERT(host_offset % PageAlignment == 0); + ASSERT(length % PageAlignment == 0); + ASSERT(virtual_offset + length <= virtual_size); + ASSERT(host_offset + length <= backing_size); + if (length == 0 || !virtual_base || !impl) { + return; + } + impl->Map(virtual_offset + virtual_base_offset, host_offset, length, perms); + } + + void HostMemory::Unmap(size_t virtual_offset, size_t length, bool separate_heap) { + ASSERT(virtual_offset % PageAlignment == 0); + ASSERT(length % PageAlignment == 0); + ASSERT(virtual_offset + length <= virtual_size); + if (length == 0 || !virtual_base || !impl) { + return; + } + impl->Unmap(virtual_offset + virtual_base_offset, length); + } + + void HostMemory::Protect(size_t virtual_offset, size_t length, MemoryPermission perm) { + ASSERT(virtual_offset % PageAlignment == 0); + ASSERT(length % PageAlignment == 0); + ASSERT(virtual_offset + length <= virtual_size); + if (length == 0 || !virtual_base || !impl) { + return; + } + const bool read = True(perm & MemoryPermission::Read); + const bool write = True(perm & MemoryPermission::Write); + const bool execute = True(perm & MemoryPermission::Execute); + impl->Protect(virtual_offset + virtual_base_offset, length, read, write, execute); + } + + void HostMemory::ClearBackingRegion(size_t physical_offset, size_t length, u32 fill_value) { + if (!impl || fill_value != 0 || !impl->ClearBackingRegion(physical_offset, length)) { + std::memset(backing_base + physical_offset, fill_value, length); + } + } + + void HostMemory::EnableDirectMappedAddress() { + if (impl) { + impl->EnableDirectMappedAddress(); + virtual_size += reinterpret_cast(virtual_base); + } + } + +} // namespace Common \ No newline at end of file diff --git a/third_party/host_memory/include/host_memory/free_region_manager.h b/third_party/host_memory/include/host_memory/free_region_manager.h new file mode 100644 index 00000000..2e590d60 --- /dev/null +++ b/third_party/host_memory/include/host_memory/free_region_manager.h @@ -0,0 +1,55 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include + +namespace Common { + +class FreeRegionManager { +public: + explicit FreeRegionManager() = default; + ~FreeRegionManager() = default; + + void SetAddressSpace(void* start, size_t size) { + this->FreeBlock(start, size); + } + + std::pair FreeBlock(void* block_ptr, size_t size) { + std::scoped_lock lk(m_mutex); + + // Check to see if we are adjacent to any regions. + auto start_address = reinterpret_cast(block_ptr); + auto end_address = start_address + size; + auto it = m_free_regions.find({start_address - 1, end_address + 1}); + + // If we are, join with them, ensuring we stay in bounds. + if (it != m_free_regions.end()) { + start_address = std::min(start_address, it->lower()); + end_address = std::max(end_address, it->upper()); + } + + // Free the relevant region. + m_free_regions.insert({start_address, end_address}); + + // Return the adjusted pointers. + block_ptr = reinterpret_cast(start_address); + size = end_address - start_address; + return {block_ptr, size}; + } + + void AllocateBlock(void* block_ptr, size_t size) { + std::scoped_lock lk(m_mutex); + + auto address = reinterpret_cast(block_ptr); + m_free_regions.subtract({address, address + size}); + } + +private: + std::mutex m_mutex; + boost::icl::interval_set m_free_regions; +}; + +} // namespace Common diff --git a/third_party/host_memory/include/host_memory/host_memory.h b/third_party/host_memory/include/host_memory/host_memory.h new file mode 100644 index 00000000..79e664fa --- /dev/null +++ b/third_party/host_memory/include/host_memory/host_memory.h @@ -0,0 +1,75 @@ +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +#include "enum_flag_ops.hpp" +#include "helpers.hpp" +#include "host_memory/virtual_buffer.h" + +namespace Common { + + enum class MemoryPermission : u32 { + Read = 1 << 0, + Write = 1 << 1, + ReadWrite = Read | Write, + Execute = 1 << 2, + }; + DECLARE_ENUM_FLAG_OPERATORS(MemoryPermission) + + /** + * A low level linear memory buffer, which supports multiple mappings + * Its purpose is to rebuild a given sparse memory layout, including mirrors. + */ + class HostMemory { + public: + explicit HostMemory(size_t backing_size_, size_t virtual_size_, bool useFastmem); + ~HostMemory(); + + /** + * Copy constructors. They shall return a copy of the buffer without the mappings. + * TODO: Implement them with COW if needed. + */ + HostMemory(const HostMemory& other) = delete; + HostMemory& operator=(const HostMemory& other) = delete; + + /** + * Move constructors. They will move the buffer and the mappings to the new object. + */ + HostMemory(HostMemory&& other) noexcept; + HostMemory& operator=(HostMemory&& other) noexcept; + + void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perms, bool separate_heap); + void Unmap(size_t virtual_offset, size_t length, bool separate_heap); + void Protect(size_t virtual_offset, size_t length, MemoryPermission perms); + + void EnableDirectMappedAddress(); + + void ClearBackingRegion(size_t physical_offset, size_t length, u32 fill_value); + + [[nodiscard]] u8* BackingBasePointer() noexcept { return backing_base; } + [[nodiscard]] const u8* BackingBasePointer() const noexcept { return backing_base; } + + [[nodiscard]] u8* VirtualBasePointer() noexcept { return virtual_base; } + [[nodiscard]] const u8* VirtualBasePointer() const noexcept { return virtual_base; } + + bool IsInVirtualRange(void* address) const noexcept { return address >= virtual_base && address < virtual_base + virtual_size; } + + private: + size_t backing_size{}; + size_t virtual_size{}; + + // Low level handler for the platform dependent memory routines + class Impl; + std::unique_ptr impl; + u8* backing_base{}; + u8* virtual_base{}; + size_t virtual_base_offset{}; + + // Fallback if fastmem is not supported on this platform + std::unique_ptr> fallback_buffer; + }; + +} // namespace Common \ No newline at end of file diff --git a/third_party/host_memory/include/host_memory/scope_exit.h b/third_party/host_memory/include/host_memory/scope_exit.h new file mode 100644 index 00000000..771ad2ef --- /dev/null +++ b/third_party/host_memory/include/host_memory/scope_exit.h @@ -0,0 +1,78 @@ +// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include + +namespace detail { + template + class ScopeGuard { + ScopeGuard(const ScopeGuard&) = delete; + ScopeGuard& operator=(const ScopeGuard&) = delete; + + private: + F f; + bool active; + + public: + constexpr ScopeGuard(F f_) : f(std::move(f_)), active(true) {} + constexpr ~ScopeGuard() { + if (active) { + f(); + } + } + + constexpr void Cancel() { active = false; } + constexpr ScopeGuard(ScopeGuard&& rhs) : f(std::move(rhs.f)), active(rhs.active) { rhs.Cancel(); } + + ScopeGuard& operator=(ScopeGuard&& rhs) = delete; + }; + + template + constexpr ScopeGuard MakeScopeGuard(F f) { + return ScopeGuard(std::move(f)); + } + + enum class ScopeGuardOnExit {}; + + template + constexpr ScopeGuard operator+(ScopeGuardOnExit, F&& f) { + return ScopeGuard(std::forward(f)); + } + +} // namespace detail + +#define CONCATENATE_IMPL(s1, s2) s1##s2 +#define CONCATENATE(s1, s2) CONCATENATE_IMPL(s1, s2) + +#ifdef __COUNTER__ +#define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __COUNTER__) +#else +#define ANONYMOUS_VARIABLE(pref) CONCATENATE(pref, __LINE__) +#endif + +/** + * This macro is similar to SCOPE_EXIT, except the object is caller managed. This is intended to be + * used when the caller might want to cancel the ScopeExit. + */ +#define SCOPE_GUARD detail::ScopeGuardOnExit() + [&]() + +/** + * This macro allows you to conveniently specify a block of code that will run on scope exit. Handy + * for doing ad-hoc clean-up tasks in a function with multiple returns. + * + * Example usage: + * \code + * const int saved_val = g_foo; + * g_foo = 55; + * SCOPE_EXIT{ g_foo = saved_val; }; + * + * if (Bar()) { + * return 0; + * } else { + * return 20; + * } + * \endcode + */ +#define SCOPE_EXIT auto ANONYMOUS_VARIABLE(SCOPE_EXIT_STATE_) = SCOPE_GUARD diff --git a/third_party/host_memory/include/host_memory/virtual_buffer.h b/third_party/host_memory/include/host_memory/virtual_buffer.h new file mode 100644 index 00000000..0b5ac54d --- /dev/null +++ b/third_party/host_memory/include/host_memory/virtual_buffer.h @@ -0,0 +1,68 @@ +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "helpers.hpp" +#include + +namespace Common { + + void* AllocateMemoryPages(std::size_t size) noexcept; + void FreeMemoryPages(void* base, std::size_t size) noexcept; + + template + class VirtualBuffer final { + public: + // TODO: Uncomment this and change Common::PageTable::PageInfo to be trivially constructible + // using std::atomic_ref once libc++ has support for it + // static_assert( + // std::is_trivially_constructible_v, + // "T must be trivially constructible, as non-trivial constructors will not be executed " + // "with the current allocator"); + + constexpr VirtualBuffer() = default; + explicit VirtualBuffer(std::size_t count) : alloc_size{count * sizeof(T)} { + base_ptr = reinterpret_cast(AllocateMemoryPages(alloc_size)); + } + + ~VirtualBuffer() noexcept { FreeMemoryPages(base_ptr, alloc_size); } + + VirtualBuffer(const VirtualBuffer&) = delete; + VirtualBuffer& operator=(const VirtualBuffer&) = delete; + + VirtualBuffer(VirtualBuffer&& other) noexcept + : alloc_size{std::exchange(other.alloc_size, 0)}, base_ptr{std::exchange(other.base_ptr), nullptr} {} + + VirtualBuffer& operator=(VirtualBuffer&& other) noexcept { + alloc_size = std::exchange(other.alloc_size, 0); + base_ptr = std::exchange(other.base_ptr, nullptr); + return *this; + } + + void resize(std::size_t count) { + const auto new_size = count * sizeof(T); + if (new_size == alloc_size) { + return; + } + + FreeMemoryPages(base_ptr, alloc_size); + + alloc_size = new_size; + base_ptr = reinterpret_cast(AllocateMemoryPages(alloc_size)); + } + + [[nodiscard]] constexpr const T& operator[](std::size_t index) const { return base_ptr[index]; } + [[nodiscard]] constexpr T& operator[](std::size_t index) { return base_ptr[index]; } + + [[nodiscard]] constexpr T* data() { return base_ptr; } + [[nodiscard]] constexpr const T* data() const { return base_ptr; } + + [[nodiscard]] constexpr std::size_t size() const { return alloc_size / sizeof(T); } + + private: + std::size_t alloc_size{}; + T* base_ptr{}; + }; + +} // namespace Common \ No newline at end of file diff --git a/third_party/host_memory/virtual_buffer.cpp b/third_party/host_memory/virtual_buffer.cpp new file mode 100644 index 00000000..b6575796 --- /dev/null +++ b/third_party/host_memory/virtual_buffer.cpp @@ -0,0 +1,46 @@ +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#ifdef _WIN32 +#include +#else +#include +#endif + +#include "host_memory/virtual_buffer.h" + +namespace Common { + void* AllocateMemoryPages(std::size_t size) noexcept { +#ifdef _WIN32 + void* base{VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE)}; +#else + void* base{mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0)}; + + if (base == MAP_FAILED) { + base = nullptr; + } +#endif + + if (!base) { + Helpers::panic("Failed to allocate memory pages"); + } + + return base; + } + + void FreeMemoryPages(void* base, [[maybe_unused]] std::size_t size) noexcept { + if (!base) { + return; + } +#ifdef _WIN32 + if (!VirtualFree(base, 0, MEM_RELEASE)) { + Helpers::panic("Failed to free memory pages"); + } +#else + if (munmap(base, size) != 0) { + Helpers::panic("Failed to free memory pages"); + } +#endif + } + +} // namespace Common \ No newline at end of file diff --git a/third_party/metal-cpp b/third_party/metal-cpp index a63bd172..5caea74c 160000 --- a/third_party/metal-cpp +++ b/third_party/metal-cpp @@ -1 +1 @@ -Subproject commit a63bd172ddcba73a3d87ca32032b66ad41ddb9a6 +Subproject commit 5caea74c5f77492add32b7cad109d796e342ab49 From 1f2403c4171e64a2adca96abfb755425f7dbee45 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 7 Aug 2025 21:05:39 +0300 Subject: [PATCH 26/27] Add Luigi's Mansion fw to db (#802) --- include/services/dsp_firmware_db.hpp | 8 +++++++- src/core/services/dsp.cpp | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/services/dsp_firmware_db.hpp b/include/services/dsp_firmware_db.hpp index bac11d73..b6b594d4 100644 --- a/include/services/dsp_firmware_db.hpp +++ b/include/services/dsp_firmware_db.hpp @@ -18,7 +18,7 @@ namespace DSP { : hash(hash), size(size), supportsAAC(supportsAAC), notes(notes) {} }; - static constexpr std::array firmwareDB = { + static constexpr std::array firmwareDB = { FirmwareInfo( {0x47, 0xD6, 0x6C, 0xD2, 0x13, 0x1, 0xFF, 0x62, 0xAD, 0x16, 0x98, 0x2, 0x46, 0x67, 0xF3, 0x9, 0xDA, 0x7, 0x20, 0x9E, 0xFB, 0xB, 0x6A, 0x81, 0x98, 0xFF, 0x9B, 0xE0, 0x51, 0x67, 0xC9, 0xA6}, @@ -72,5 +72,11 @@ namespace DSP { 0x3A, 0x29, 0x1, 0x70, 0xEA, 0x3B, 0x6C, 0x14, 0x57, 0x49, 0xAD, 0x93, 0x58, 0x67, 0x2C, 0x97}, 49716, false, "Spotted in PMD: GTI" ), + + FirmwareInfo( + {0x96, 0xF3, 0x96, 0x28, 0x38, 0xEB, 0xE9, 0x2A, 0x9E, 0x99, 0xD0, 0xB0, 0x78, 0xAD, 0xE3, 0x67, + 0x3B, 0x9B, 0x2F, 0x24, 0x3E, 0xBE, 0xC0, 0x47, 0x4D, 0x3E, 0x49, 0xA9, 0x2B, 0x65, 0x5B, 0x85}, + 49772, false, "Spotted in Luigi's Mansion" + ), }; } // namespace DSP \ No newline at end of file diff --git a/src/core/services/dsp.cpp b/src/core/services/dsp.cpp index 3f976f6a..be750dc6 100644 --- a/src/core/services/dsp.cpp +++ b/src/core/services/dsp.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include From bd81c72608817a46b85295454c7b852a0b6223a1 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 7 Aug 2025 23:12:45 +0300 Subject: [PATCH 27/27] Fix uninitialized warning and remove header pollution (#803) * Fix uninitialized warning and remove header pollution * Nits * IWYU * More IWYU --- include/audio/audio_interpolation.hpp | 6 +- include/dynarmic_cp15.hpp | 86 +++++++------------ include/emulator.hpp | 6 -- include/helpers.hpp | 8 +- include/kernel/kernel.hpp | 5 +- include/kernel/kernel_types.hpp | 3 +- include/panda_qt/elided_label.hpp | 1 + include/renderer.hpp | 5 -- include/renderer_mtl/mtl_command_encoder.hpp | 2 + .../renderer_mtl/mtl_depth_stencil_cache.hpp | 2 +- .../renderer_mtl/mtl_draw_pipeline_cache.hpp | 1 + include/renderer_mtl/mtl_lut_texture.hpp | 27 +++--- .../renderer_mtl/mtl_vertex_buffer_cache.hpp | 1 - include/renderer_mtl/pica_to_mtl.hpp | 1 + include/renderer_vk/renderer_vk.hpp | 1 + include/scheduler.hpp | 1 - src/emulator.cpp | 4 +- 17 files changed, 66 insertions(+), 94 deletions(-) diff --git a/include/audio/audio_interpolation.hpp b/include/audio/audio_interpolation.hpp index 8a87cbcd..2c9f6540 100644 --- a/include/audio/audio_interpolation.hpp +++ b/include/audio/audio_interpolation.hpp @@ -16,9 +16,9 @@ namespace Audio::Interpolation { using StereoFrame16 = Audio::DSPMixer::StereoFrame; struct State { - // Two historical samples. - std::array xn1 = {}; //< x[n-1] - std::array xn2 = {}; //< x[n-2] + // Two history samples. + std::array xn1 = {}; // x[n-1] + std::array xn2 = {}; // x[n-2] // Current fractional position. u64 fposition = 0; }; diff --git a/include/dynarmic_cp15.hpp b/include/dynarmic_cp15.hpp index 1345aad4..ba7fbbf1 100644 --- a/include/dynarmic_cp15.hpp +++ b/include/dynarmic_cp15.hpp @@ -1,71 +1,51 @@ #pragma once -#include "dynarmic/interface/A32/a32.h" #include "dynarmic/interface/A32/config.h" #include "dynarmic/interface/A32/coprocessor.h" #include "helpers.hpp" -#include "memory.hpp" class CP15 final : public Dynarmic::A32::Coprocessor { - using Callback = Dynarmic::A32::Coprocessor::Callback; - using CoprocReg = Dynarmic::A32::CoprocReg; - using CallbackOrAccessOneWord = Dynarmic::A32::Coprocessor::CallbackOrAccessOneWord; - using CallbackOrAccessTwoWords = Dynarmic::A32::Coprocessor::CallbackOrAccessTwoWords; + using Callback = Dynarmic::A32::Coprocessor::Callback; + using CoprocReg = Dynarmic::A32::CoprocReg; + using CallbackOrAccessOneWord = Dynarmic::A32::Coprocessor::CallbackOrAccessOneWord; + using CallbackOrAccessTwoWords = Dynarmic::A32::Coprocessor::CallbackOrAccessTwoWords; - u32 threadStoragePointer; // Pointer to thread-local storage - u32 dummy; // MCR writes here for registers whose values are ignored + u32 threadStoragePointer; // Pointer to thread-local storage + u32 dummy; // MCR writes here for registers whose values are ignored - std::optional CompileInternalOperation(bool two, unsigned opc1, - CoprocReg CRd, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) override { - return std::nullopt; - } + std::optional CompileInternalOperation(bool two, unsigned opc1, CoprocReg CRd, CoprocReg CRn, CoprocReg CRm, unsigned opc2) override { + return std::nullopt; + } - CallbackOrAccessOneWord CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) override { - if (!two && opc1 == 0 && CRn == CoprocReg::C7 && CRm == CoprocReg::C10 && opc2 == 4) { - return &dummy; // Normally inserts a "Data Synchronization Barrier" - } + CallbackOrAccessOneWord CompileSendOneWord(bool two, unsigned opc1, CoprocReg CRn, CoprocReg CRm, unsigned opc2) override { + if (!two && opc1 == 0 && CRn == CoprocReg::C7 && CRm == CoprocReg::C10 && opc2 == 4) { + return &dummy; // Normally inserts a "Data Synchronization Barrier" + } - if (!two && opc1 == 0 && CRn == CoprocReg::C7 && CRm == CoprocReg::C10 && opc2 == 5) { - return &dummy; // Normally inserts a "Data Memory Barrier" - } - Helpers::panic("CP15: CompileSendOneWord\nopc1: %d CRn: %d CRm: %d opc2: %d\n", opc1, (int)CRn, (int)CRm, opc2); - } + if (!two && opc1 == 0 && CRn == CoprocReg::C7 && CRm == CoprocReg::C10 && opc2 == 5) { + return &dummy; // Normally inserts a "Data Memory Barrier" + } + Helpers::panic("CP15: CompileSendOneWord\nopc1: %d CRn: %d CRm: %d opc2: %d\n", opc1, (int)CRn, (int)CRm, opc2); + } - CallbackOrAccessTwoWords CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) override { - return std::monostate{}; - } + CallbackOrAccessOneWord CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, CoprocReg CRm, unsigned opc2) override { + // Stores a pointer to thread-local storage, accessed via mrc p15, 0, rd, c13, c0, 3 + if (!two && CRn == CoprocReg::C13 && opc1 == 0 && CRm == CoprocReg::C0 && opc2 == 3) { + return &threadStoragePointer; + } - CallbackOrAccessOneWord CompileGetOneWord(bool two, unsigned opc1, CoprocReg CRn, - CoprocReg CRm, unsigned opc2) override { - // Stores a pointer to thread-local storage, accessed via mrc p15, 0, rd, c13, c0, 3 - if (!two && CRn == CoprocReg::C13 && opc1 == 0 && CRm == CoprocReg::C0 && opc2 == 3) { - return &threadStoragePointer; - } + Helpers::panic("CP15: CompileGetOneWord\nopc1: %d CRn: %d CRm: %d opc2: %d\n", opc1, (int)CRn, (int)CRm, opc2); + } - Helpers::panic("CP15: CompileGetOneWord\nopc1: %d CRn: %d CRm: %d opc2: %d\n", opc1, (int)CRn, (int)CRm, opc2); - } + CallbackOrAccessTwoWords CompileSendTwoWords(bool two, unsigned opc, CoprocReg CRm) override { return std::monostate{}; } + CallbackOrAccessTwoWords CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) override { return std::monostate{}; } - CallbackOrAccessTwoWords CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) override { - return std::monostate{}; - } + std::optional CompileLoadWords(bool two, bool long_transfer, CoprocReg CRd, std::optional option) override { return std::nullopt; } + std::optional CompileStoreWords(bool two, bool long_transfer, CoprocReg CRd, std::optional option) override { return std::nullopt; } - std::optional CompileLoadWords(bool two, bool long_transfer, CoprocReg CRd, - std::optional option) override { - return std::nullopt; - } + public: + void setTLSBase(u32 value) { threadStoragePointer = value; } - std::optional CompileStoreWords(bool two, bool long_transfer, CoprocReg CRd, - std::optional option) override { - return std::nullopt; - } - -public: - void setTLSBase(u32 value) { - threadStoragePointer = value; - } - - // Currently does nothing but may be needed in the future - void reset() {} + // Currently does nothing but may be needed in the future + void reset() {} }; \ No newline at end of file diff --git a/include/emulator.hpp b/include/emulator.hpp index cd39f1c4..b1191f6e 100644 --- a/include/emulator.hpp +++ b/include/emulator.hpp @@ -24,12 +24,6 @@ #include "http_server.hpp" #endif -#ifdef PANDA3DS_FRONTEND_QT -#include "gl/context.h" -#endif - -struct SDL_Window; - enum class ROMType { None, ELF, diff --git a/include/helpers.hpp b/include/helpers.hpp index a95931d4..e13aed7e 100644 --- a/include/helpers.hpp +++ b/include/helpers.hpp @@ -3,10 +3,8 @@ #include #include #include -#include -#include -#include #include +#include #include "termcolor.hpp" @@ -37,7 +35,7 @@ namespace Helpers { return {}; } const auto buf = std::make_unique(size); - std::snprintf(buf.get(), size, fmt.c_str(), args ...); + std::snprintf(buf.get(), size, fmt.c_str(), args...); return std::string(buf.get(), buf.get() + size - 1); } @@ -50,7 +48,7 @@ namespace Helpers { exit(1); } - + #ifdef PANDA3DS_LIMITED_PANICS template static void panicDev(const char* fmt, Args&&... args) {} diff --git a/include/kernel/kernel.hpp b/include/kernel/kernel.hpp index 7bda8c0a..b8c5f9ba 100644 --- a/include/kernel/kernel.hpp +++ b/include/kernel/kernel.hpp @@ -1,7 +1,5 @@ #pragma once #include -#include -#include #include #include #include @@ -26,8 +24,10 @@ class Kernel { CPU& cpu; Memory& mem; + public: KFcram fcramManager; + private: // The handle number for the next kernel object to be created u32 handleCounter; // A list of our OS threads, the max number of which depends on the resource limit (hardcoded 32 per process on retail it seems). @@ -250,7 +250,6 @@ class Kernel { } ServiceManager& getServiceManager() { return serviceManager; } - KFcram& getFcramManager() { return fcramManager; } Scheduler& getScheduler(); void sendGPUInterrupt(GPUInterrupt type) { serviceManager.sendGPUInterrupt(type); } diff --git a/include/kernel/kernel_types.hpp b/include/kernel/kernel_types.hpp index a55d2742..9f263c96 100644 --- a/include/kernel/kernel_types.hpp +++ b/include/kernel/kernel_types.hpp @@ -1,11 +1,10 @@ #pragma once #include #include +#include -#include "fs/archive_base.hpp" #include "handles.hpp" #include "helpers.hpp" -#include "result/result.hpp" enum class KernelObjectType : u8 { AddressArbiter, diff --git a/include/panda_qt/elided_label.hpp b/include/panda_qt/elided_label.hpp index 9d937f9b..de31a439 100644 --- a/include/panda_qt/elided_label.hpp +++ b/include/panda_qt/elided_label.hpp @@ -6,6 +6,7 @@ class ElidedLabel : public QLabel { Q_OBJECT + public: explicit ElidedLabel(Qt::TextElideMode elideMode = Qt::ElideLeft, QWidget* parent = nullptr); explicit ElidedLabel(QString text, Qt::TextElideMode elideMode = Qt::ElideLeft, QWidget* parent = nullptr); diff --git a/include/renderer.hpp b/include/renderer.hpp index b3f81faf..27d6a437 100644 --- a/include/renderer.hpp +++ b/include/renderer.hpp @@ -9,10 +9,6 @@ #include "PICA/regs.hpp" #include "helpers.hpp" -#ifdef PANDA3DS_FRONTEND_QT -#include "gl/context.h" -#endif - enum class RendererType : s8 { // Todo: Auto = -1, Null = 0, @@ -23,7 +19,6 @@ enum class RendererType : s8 { }; struct EmulatorConfig; -struct SDL_Window; class GPU; class ShaderUnit; diff --git a/include/renderer_mtl/mtl_command_encoder.hpp b/include/renderer_mtl/mtl_command_encoder.hpp index 562e6b79..ce758e19 100644 --- a/include/renderer_mtl/mtl_command_encoder.hpp +++ b/include/renderer_mtl/mtl_command_encoder.hpp @@ -2,6 +2,8 @@ #include +#include "helpers.hpp" + namespace Metal { struct RenderState { MTL::RenderPipelineState* renderPipelineState = nullptr; diff --git a/include/renderer_mtl/mtl_depth_stencil_cache.hpp b/include/renderer_mtl/mtl_depth_stencil_cache.hpp index 8f7256a9..b902346d 100644 --- a/include/renderer_mtl/mtl_depth_stencil_cache.hpp +++ b/include/renderer_mtl/mtl_depth_stencil_cache.hpp @@ -2,6 +2,7 @@ #include +#include "helpers.hpp" #include "pica_to_mtl.hpp" using namespace PICA; @@ -17,7 +18,6 @@ namespace Metal { class DepthStencilCache { public: DepthStencilCache() = default; - ~DepthStencilCache() { reset(); } void set(MTL::Device* dev) { device = dev; } diff --git a/include/renderer_mtl/mtl_draw_pipeline_cache.hpp b/include/renderer_mtl/mtl_draw_pipeline_cache.hpp index 7178785e..17bead9a 100644 --- a/include/renderer_mtl/mtl_draw_pipeline_cache.hpp +++ b/include/renderer_mtl/mtl_draw_pipeline_cache.hpp @@ -2,6 +2,7 @@ #include +#include "helpers.hpp" #include "objc_helper.hpp" #include "pica_to_mtl.hpp" diff --git a/include/renderer_mtl/mtl_lut_texture.hpp b/include/renderer_mtl/mtl_lut_texture.hpp index 531dc73c..e2f67b6b 100644 --- a/include/renderer_mtl/mtl_lut_texture.hpp +++ b/include/renderer_mtl/mtl_lut_texture.hpp @@ -2,19 +2,22 @@ #include +#include "helpers.hpp" + namespace Metal { -class LutTexture { -public: - LutTexture(MTL::Device* device, MTL::TextureType type, MTL::PixelFormat pixelFormat, u32 width, u32 height, const char* name); - ~LutTexture(); - u32 getNextIndex(); + class LutTexture { + public: + LutTexture(MTL::Device* device, MTL::TextureType type, MTL::PixelFormat pixelFormat, u32 width, u32 height, const char* name); + ~LutTexture(); + u32 getNextIndex(); - MTL::Texture* getTexture() { return texture; } - u32 getCurrentIndex() { return currentIndex; } -private: - MTL::Texture* texture; - u32 currentIndex = 0; -}; + MTL::Texture* getTexture() { return texture; } + u32 getCurrentIndex() { return currentIndex; } -} // namespace Metal + private: + MTL::Texture* texture; + u32 currentIndex = 0; + }; + +} // namespace Metal diff --git a/include/renderer_mtl/mtl_vertex_buffer_cache.hpp b/include/renderer_mtl/mtl_vertex_buffer_cache.hpp index b392389c..d50ea336 100644 --- a/include/renderer_mtl/mtl_vertex_buffer_cache.hpp +++ b/include/renderer_mtl/mtl_vertex_buffer_cache.hpp @@ -5,7 +5,6 @@ #include "helpers.hpp" #include "pica_to_mtl.hpp" - using namespace PICA; namespace Metal { diff --git a/include/renderer_mtl/pica_to_mtl.hpp b/include/renderer_mtl/pica_to_mtl.hpp index 5e9f62c4..94474dad 100644 --- a/include/renderer_mtl/pica_to_mtl.hpp +++ b/include/renderer_mtl/pica_to_mtl.hpp @@ -3,6 +3,7 @@ #include #include "PICA/regs.hpp" +#include "helpers.hpp" // TODO: remove dependency on OpenGL #include "opengl.hpp" diff --git a/include/renderer_vk/renderer_vk.hpp b/include/renderer_vk/renderer_vk.hpp index a274e1c7..c90b1d4d 100644 --- a/include/renderer_vk/renderer_vk.hpp +++ b/include/renderer_vk/renderer_vk.hpp @@ -9,6 +9,7 @@ #include "vk_sampler_cache.hpp" class GPU; +struct SDL_Window; class RendererVK final : public Renderer { SDL_Window* targetWindow; diff --git a/include/scheduler.hpp b/include/scheduler.hpp index 8765ae66..b5bdad68 100644 --- a/include/scheduler.hpp +++ b/include/scheduler.hpp @@ -4,7 +4,6 @@ #include #include "helpers.hpp" -#include "logger.hpp" struct Scheduler { enum class EventType { diff --git a/src/emulator.cpp b/src/emulator.cpp index 2af529de..5ea7ce02 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -20,8 +20,8 @@ __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1; Emulator::Emulator() : config(getConfigPath()), kernel(cpu, memory, gpu, config, lua), cpu(memory, kernel, *this), gpu(memory, config), - memory(kernel.getFcramManager(), config), cheats(memory, kernel.getServiceManager().getHID()), audioDevice(config.audioDeviceConfig), - lua(*this), running(false) + memory(kernel.fcramManager, config), cheats(memory, kernel.getServiceManager().getHID()), audioDevice(config.audioDeviceConfig), lua(*this), + running(false) #ifdef PANDA3DS_ENABLE_HTTP_SERVER , httpServer(this)