Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 02:33:13 +03:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Make debug memory view show correct data when chunks are too small for a space's address shift

Browse Source
This commit is contained in:
AJR 2019-07-29 19:26:27 -04:00
parent 6747ee065f
commit 19925e79ab
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/emu/debug/dvmemory.cpp
View File

@ -305,7 +305,7 @@ void debug_view_memory::view_update()
if (m_data_format <= 8) { if (m_data_format <= 8) {
u64 chunkdata; u64 chunkdata;
bool ismapped = read(m_bytes_per_chunk, address + chunknum * m_steps_per_chunk, chunkdata); bool ismapped = read_chunk(address, chunknum, chunkdata);
dest = destrow + m_section[1].m_pos + 1 + chunkindex * spacing; dest = destrow + m_section[1].m_pos + 1 + chunkindex * spacing;
for (int ch = 0; ch < posdata.m_spacing; ch++, dest++) for (int ch = 0; ch < posdata.m_spacing; ch++, dest++)
if (dest >= destmin && dest < destmax) if (dest >= destmin && dest < destmax)
@ -833,6 +833,31 @@ bool debug_view_memory::read(u8 size, offs_t offs, floatx80 &data)
} }
//-------------------------------------------------
// read_chunk - memory view data reader helper
//-------------------------------------------------
bool debug_view_memory::read_chunk(offs_t address, int chunknum, u64 &chunkdata)
{
const debug_view_memory_source &source = downcast<const debug_view_memory_source &>(*m_source);
if (source.m_space) {
address += source.m_space->byte_to_address(chunknum * m_bytes_per_chunk);
if (!source.m_space->byte_to_address(m_bytes_per_chunk)) {
// if chunks are too small to be addressable, read a minimal chunk and split it up
u8 minbytes = 1 << -source.m_space->addr_shift();
bool ismapped = read(minbytes, address, chunkdata);
u8 suboffset = (chunknum * m_bytes_per_chunk) & (minbytes - 1);
chunkdata >>= 8 * (source.m_space->endianness() == ENDIANNESS_LITTLE ? suboffset : minbytes - m_bytes_per_chunk - suboffset);
chunkdata &= ~u64(0) >> (64 - 8 * m_bytes_per_chunk);
return ismapped;
}
}
else
address += chunknum * m_bytes_per_chunk;
return read(m_bytes_per_chunk, address, chunkdata);
}
//------------------------------------------------- //-------------------------------------------------
// write - generic memory view data writer // write - generic memory view data writer
//------------------------------------------------- //-------------------------------------------------

1
src/emu/debug/dvmemory.h
View File

@ -102,6 +102,7 @@ private:
bool read(u8 size, offs_t offs, u64 &data); bool read(u8 size, offs_t offs, u64 &data);
void write(u8 size, offs_t offs, u64 data); void write(u8 size, offs_t offs, u64 data);
bool read(u8 size, offs_t offs, floatx80 &data); bool read(u8 size, offs_t offs, floatx80 &data);
bool read_chunk(offs_t address, int chunknum, u64 &chunkdata);
// internal state // internal state
debug_view_expression m_expression; // expression describing the start address debug_view_expression m_expression; // expression describing the start address