Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-09 15:45:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #159 from wheremyfoodat/virtual_console

Browse source 
Change shared memory remap panic to warning
This commit is contained in:
wheremyfoodat 2023-08-06 16:13:46 +03:00 • committed by GitHub
commit 2eef8b4407
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/memory.cpp
View file

@ -394,7 +394,8 @@ MemoryInfo Memory::queryMemory(u32 vaddr) {
u8* Memory::mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerms) {
for (auto& e : sharedMemBlocks) {
if (e.handle == handle) {
if (e.mapped) Helpers::panic("Allocated shared memory block twice. Is this allowed?");
// Virtual Console titles trigger this. TODO: Investigate how it should work
if (e.mapped) Helpers::warn("Allocated shared memory block twice. Is this allowed?");
const u32 paddr = e.paddr;
const u32 size = e.size;