Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: Make get_address(MAIN) more strict

Browse Source
This commit is contained in:
Elad
2026-01-13 14:58:48 +02:00
parent 57f162c3c4
commit 960e2a9ed8
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/RSXThread.cpp
+19 -2
View File
@@ -150,13 +150,30 @@ namespace rsx
case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER: case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER:
case CELL_GCM_LOCATION_MAIN: case CELL_GCM_LOCATION_MAIN:
{ {
if (const u32 ea = render->iomap_table.get_addr(offset); ea + 1) if (const u32 ea = render->iomap_table.get_addr(offset); ea != umax)
{
if (size_to_check <= 1 || (offset < render->main_mem_size && render->main_mem_size - offset >= size_to_check))
{
bool ok = true;
for (u32 offs_index = 0x100000; offs_index < size_to_check; offs_index += 0x100000)
{
// This check does not check continuity but rather that it's mapped at all
if (render->iomap_table.get_addr(offs_index) == umax)
{
ok = false;
}
}
if (ok)
{ {
if (!size_to_check || vm::check_addr(ea, 0, size_to_check)) if (!size_to_check || vm::check_addr(ea, 0, size_to_check))
{ {
return ea; return ea;
} }
} }
}
}
msg = "RSXIO memory not mapped!"sv; msg = "RSXIO memory not mapped!"sv;
break; break;
@@ -175,7 +192,7 @@ namespace rsx
case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN: case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN:
{ {
if (const u32 ea = offset < 0x1000000 ? render->iomap_table.get_addr(0x0e000000 + offset) : -1; ea + 1) if (const u32 ea = offset < 0x1000000 ? render->iomap_table.get_addr(0x0e000000 + offset) : -1; ea != umax)
{ {
if (!size_to_check || vm::check_addr(ea, 0, size_to_check)) if (!size_to_check || vm::check_addr(ea, 0, size_to_check))
{ {