diff options
| author | 2023-10-23 10:33:01 -0600 | |
|---|---|---|
| committer | 2023-10-23 10:33:01 -0600 | |
| commit | c73362002435be5169ab1f43366ca6da0b6d51ed (patch) | |
| tree | ce6cb452ba92f52dc2ccdfab4b009e0c59486a6f | |
| parent | Merge pull request #11841 from german77/halp (diff) | |
| download | yuzu-c73362002435be5169ab1f43366ca6da0b6d51ed.tar.gz yuzu-c73362002435be5169ab1f43366ca6da0b6d51ed.tar.xz yuzu-c73362002435be5169ab1f43366ca6da0b6d51ed.zip | |
service: ipc: Add third read buffer index
| -rw-r--r-- | src/core/hle/service/hle_ipc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/hle/service/hle_ipc.cpp b/src/core/hle/service/hle_ipc.cpp index 6f3ae3cc4..ff374ae39 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/core/hle/service/hle_ipc.cpp | |||
| @@ -27,10 +27,12 @@ namespace { | |||
| 27 | static thread_local std::array read_buffer_data_a{ | 27 | static thread_local std::array read_buffer_data_a{ |
| 28 | Common::ScratchBuffer<u8>(), | 28 | Common::ScratchBuffer<u8>(), |
| 29 | Common::ScratchBuffer<u8>(), | 29 | Common::ScratchBuffer<u8>(), |
| 30 | Common::ScratchBuffer<u8>(), | ||
| 30 | }; | 31 | }; |
| 31 | static thread_local std::array read_buffer_data_x{ | 32 | static thread_local std::array read_buffer_data_x{ |
| 32 | Common::ScratchBuffer<u8>(), | 33 | Common::ScratchBuffer<u8>(), |
| 33 | Common::ScratchBuffer<u8>(), | 34 | Common::ScratchBuffer<u8>(), |
| 35 | Common::ScratchBuffer<u8>(), | ||
| 34 | }; | 36 | }; |
| 35 | } // Anonymous namespace | 37 | } // Anonymous namespace |
| 36 | 38 | ||
| @@ -343,6 +345,7 @@ std::span<const u8> HLERequestContext::ReadBufferA(std::size_t buffer_index) con | |||
| 343 | static thread_local std::array read_buffer_a{ | 345 | static thread_local std::array read_buffer_a{ |
| 344 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 346 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 345 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 347 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 348 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | ||
| 346 | }; | 349 | }; |
| 347 | 350 | ||
| 348 | ASSERT_OR_EXECUTE_MSG( | 351 | ASSERT_OR_EXECUTE_MSG( |
| @@ -358,6 +361,7 @@ std::span<const u8> HLERequestContext::ReadBufferX(std::size_t buffer_index) con | |||
| 358 | static thread_local std::array read_buffer_x{ | 361 | static thread_local std::array read_buffer_x{ |
| 359 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 362 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 360 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 363 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 364 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | ||
| 361 | }; | 365 | }; |
| 362 | 366 | ||
| 363 | ASSERT_OR_EXECUTE_MSG( | 367 | ASSERT_OR_EXECUTE_MSG( |
| @@ -373,10 +377,12 @@ std::span<const u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) cons | |||
| 373 | static thread_local std::array read_buffer_a{ | 377 | static thread_local std::array read_buffer_a{ |
| 374 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 378 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 375 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 379 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 380 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | ||
| 376 | }; | 381 | }; |
| 377 | static thread_local std::array read_buffer_x{ | 382 | static thread_local std::array read_buffer_x{ |
| 378 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 383 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 379 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | 384 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), |
| 385 | Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::SafeRead>(memory, 0, 0), | ||
| 380 | }; | 386 | }; |
| 381 | 387 | ||
| 382 | const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && | 388 | const bool is_buffer_a{BufferDescriptorA().size() > buffer_index && |