RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-24 03:32:50 +01:00
Code Issues Releases Wiki Activity

Merge pull request #253 from ItzWarty/memoryviewer_fixes

Browse Source 
Improve Memory Viewer: There are bugs in text representation.
This commit is contained in:
Alexandro Sánchez Bach 2014-05-20 00:29:03 +02:00
commit 9209edc15c
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Memory/Memory.cpp
View File

@ -87,7 +87,7 @@ MemoryBlock* MemoryBlock::SetRange(const u64 start, const u32 size)
bool MemoryBlock::IsMyAddress(const u64 addr)
{
return mem && addr >= GetStartAddr() && addr < GetEndAddr();
return mem && addr >= GetStartAddr() && addr <= GetEndAddr();
}
template <typename T>

28
rpcs3/Gui/MemoryViewer.cpp
View File

@ -191,20 +191,26 @@ void MemoryViewerPanel::ShowMemory()
t_mem_addr_str += wxString::Format("%08x ", addr);
}
for(u32 addr = m_addr; addr != m_addr + m_rowcount * m_colcount; addr++)
for (int row = 0; row < m_rowcount; row++)
{
if (Memory.IsGoodAddr(addr))
for (int col = 0; col < m_colcount; col++)
{
const u8 rmem = Memory.Read8(addr);
t_mem_hex_str += wxString::Format("%02x ", rmem);
const wxString c_rmem = wxString::Format("%c", rmem);
t_mem_ascii_str += c_rmem.IsEmpty() ? "." : c_rmem;
}
else
{
t_mem_hex_str += "?? ";
t_mem_ascii_str += "?";
u32 addr = m_addr + row * m_colcount + col;
if (Memory.IsGoodAddr(addr))
{
const u8 rmem = Memory.Read8(addr);
t_mem_hex_str += wxString::Format("%02x ", rmem);
const bool isPrintable = rmem >= 32 && rmem <= 126;
t_mem_ascii_str += isPrintable ? std::string(1, rmem) : ".";
}
else
{
t_mem_hex_str += "?? ";
t_mem_ascii_str += "?";
}
}
t_mem_ascii_str += "\r\n";
}
t_mem_addr->SetValue(t_mem_addr_str);