diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp index ee14edba6e..ebfe49c40c 100644 --- a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp @@ -399,7 +399,7 @@ s32 _cellGcmInitBody(vm::pptr context, u32 cmdSize, u32 ioSi // Create contexts u32 rsx_ctxaddr = 0; - for (u32 addr = 0x40000000; addr < 0xC0000000; addr += 0x10000000) + for (u32 addr = 0x30000000; addr < 0xC0000000; addr += 0x10000000) { if (vm::map(addr, 0x10000000, 0x400)) { diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp index 86f54df6ba..2936e867eb 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp @@ -45,7 +45,7 @@ error_code sys_mmapper_allocate_address(u64 size, u64 flags, u64 alignment, vm:: case 0x40000000: case 0x80000000: { - for (u64 addr = ::align(0x40000000, alignment); addr < 0xC0000000; addr += alignment) + for (u64 addr = ::align(0x30000000, alignment); addr < 0xC0000000; addr += alignment) { if (const auto area = vm::map(static_cast(addr), static_cast(size), flags)) { @@ -272,7 +272,7 @@ error_code sys_mmapper_map_shared_memory(u32 addr, u32 mem_id, u64 flags) const auto area = vm::get(vm::any, addr); - if (!area || addr < 0x40000000 || addr >= 0xC0000000) + if (!area || addr < 0x30000000 || addr >= 0xC0000000) { return CELL_EINVAL; } @@ -320,7 +320,7 @@ error_code sys_mmapper_search_and_map(u32 start_addr, u32 mem_id, u64 flags, vm: const auto area = vm::get(vm::any, start_addr); - if (!area || start_addr < 0x40000000 || start_addr >= 0xC0000000) + if (!area || start_addr < 0x30000000 || start_addr >= 0xC0000000) { return {CELL_EINVAL, start_addr}; } @@ -353,7 +353,7 @@ error_code sys_mmapper_unmap_shared_memory(u32 addr, vm::ptr mem_id) const auto area = vm::get(vm::any, addr); - if (!area || addr < 0x40000000 || addr >= 0xC0000000) + if (!area || addr < 0x30000000 || addr >= 0xC0000000) { return {CELL_EINVAL, addr}; } diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index c45e8d8cbc..13185cd951 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -446,7 +446,7 @@ s32 sys_rsx_device_map(vm::ptr dev_addr, vm::ptr a2, u32 dev_id) return CELL_EINVAL; // sys_rsx_device_map called twice } - for (u32 addr = 0x40000000; addr < 0xC0000000; addr += 0x10000000) + for (u32 addr = 0x30000000; addr < 0xC0000000; addr += 0x10000000) { if (vm::map(addr, 0x10000000, 0x400)) { diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/Emu/Cell/lv2/sys_vm.cpp index ca882350c3..41fcd3420a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_vm.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_vm.cpp @@ -21,7 +21,7 @@ error_code sys_vm_memory_map(u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy } // Look for unmapped space (roughly) - for (u32 found = 0x40000000; found <= 0xC0000000 - vsize; found += 0x1000000) + for (u32 found = 0x30000000; found <= 0xC0000000 - vsize; found += 0x1000000) { // Try to map if (const auto area = vm::map(found, vsize, flag)) diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index f45f0fc914..ac36c8485b 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -808,7 +808,6 @@ namespace vm std::make_shared(0xC0000000, 0x10000000), // video std::make_shared(0xD0000000, 0x10000000), // stack std::make_shared(0xE0000000, 0x20000000), // SPU reserved - std::make_shared(0x30000000, 0x10000000), // main extend }; } } diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 430d8e3636..cf15fbb1c6 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -1304,7 +1304,7 @@ void Emulator::Resume() std::string dump; - for (u32 i = 0x10000; i < 0x40000000;) + for (u32 i = 0x10000; i < 0x30000000;) { if (vm::check_addr(i)) {