diff --git a/rpcs3/Emu/GS/RSXThread.h b/rpcs3/Emu/GS/RSXThread.h index 7f43d589a0..649f9d4ec1 100644 --- a/rpcs3/Emu/GS/RSXThread.h +++ b/rpcs3/Emu/GS/RSXThread.h @@ -265,7 +265,6 @@ public: u32 m_report_main_addr; u32 m_local_mem_addr, m_main_mem_addr; - Array m_main_mem_info; public: uint m_draw_mode; @@ -637,7 +636,7 @@ protected: switch(location) { case CELL_GCM_LOCATION_LOCAL: return m_local_mem_addr + offset; - case CELL_GCM_LOCATION_MAIN: return m_main_mem_addr + offset; + case CELL_GCM_LOCATION_MAIN: return Memory.RSXIOMem.getRealAddr(Memory.RSXIOMem.GetStartAddr() + offset); } ConLog.Error("GetAddress(offset=0x%x, location=0x%x)", location); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index c9db1fe8ab..e3942e2fa0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -107,7 +107,6 @@ int cellGcmInit(u32 context_addr, u32 cmdSize, u32 ioSize, u32 ioAddress) render.m_tiles_addr = Memory.Alloc(sizeof(CellGcmTileInfo) * 15, sizeof(CellGcmTileInfo)); render.m_gcm_buffers_count = 0; render.m_gcm_current_buffer = 0; - render.m_main_mem_info.Clear(); render.m_main_mem_addr = 0; render.Init(ctx_begin, ctx_size, gcm_info.control_addr, local_addr); @@ -725,7 +724,6 @@ int32_t cellGcmMapMainMemory(u64 ea, u32 size, mem32_t offset) } Emu.GetGSManager().GetRender().m_main_mem_addr = Emu.GetGSManager().GetRender().m_ioAddress; - Emu.GetGSManager().GetRender().m_main_mem_info.AddCpy(MemInfo(ea, size)); return CELL_OK; }