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

Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

Browse Source
This commit is contained in:
Nekotekina
2014-01-26 00:42:53 +04:00
parent fc3f5348b8 09387879a0
commit 88208f5e01
2 changed files with 200 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/GS/RSXThread.cpp
+197 -195
View File
File diff suppressed because it is too large Load Diff
rpcs3/Gui/RSXDebugger.cpp
+3 -3
View File
@@ -307,7 +307,7 @@ void RSXDebugger::GoToGet(wxCommandEvent& event)
{ {
if (!RSXReady()) return; if (!RSXReady()) return;
CellGcmControl* ctrl = (CellGcmControl*)&Memory[Emu.GetGSManager().GetRender().m_ctrlAddress]; CellGcmControl* ctrl = (CellGcmControl*)&Memory[Emu.GetGSManager().GetRender().m_ctrlAddress];
m_addr = Emu.GetGSManager().GetRender().m_ioAddress + re(ctrl->get); m_addr = Memory.RSXIOMem.getRealAddr(Memory.RSXIOMem.GetStartAddr() + re(ctrl->get));
t_addr->SetValue(wxString::Format("%08x", m_addr)); t_addr->SetValue(wxString::Format("%08x", m_addr));
UpdateInformation(); UpdateInformation();
event.Skip(); event.Skip();
@@ -317,7 +317,7 @@ void RSXDebugger::GoToPut(wxCommandEvent& event)
{ {
if (!RSXReady()) return; if (!RSXReady()) return;
CellGcmControl* ctrl = (CellGcmControl*)&Memory[Emu.GetGSManager().GetRender().m_ctrlAddress]; CellGcmControl* ctrl = (CellGcmControl*)&Memory[Emu.GetGSManager().GetRender().m_ctrlAddress];
m_addr = Emu.GetGSManager().GetRender().m_ioAddress + re(ctrl->put); m_addr = Memory.RSXIOMem.getRealAddr(Memory.RSXIOMem.GetStartAddr() + re(ctrl->put));
t_addr->SetValue(wxString::Format("%08x", m_addr)); t_addr->SetValue(wxString::Format("%08x", m_addr));
UpdateInformation(); UpdateInformation();
event.Skip(); event.Skip();
@@ -340,7 +340,7 @@ void RSXDebugger::GetMemory()
for(u32 i=0; i<m_item_count; i++) for(u32 i=0; i<m_item_count; i++)
m_list_commands->SetItem(i, 2, wxEmptyString); m_list_commands->SetItem(i, 2, wxEmptyString);
u32 ioAddr = RSXReady() ? Emu.GetGSManager().GetRender().m_ioAddress : 0; u32 ioAddr = RSXReady() ? Memory.RSXIOMem.GetStartAddr() : 0;
// Write information // Write information
for(u32 i=0, addr = m_addr; i<m_item_count; i++, addr += 4) for(u32 i=0, addr = m_addr; i<m_item_count; i++, addr += 4)