From 847726b1dcd6408bac0796d505cb39a4148168ff Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 19 Feb 2015 04:24:25 +1100 Subject: Disable decrease bytes per line menu items when only one chunk per line is displayed --- src/osd/modules/debugger/osx/deviceinfoviewer.m | 2 +- src/osd/modules/debugger/osx/memoryview.m | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.m b/src/osd/modules/debugger/osx/deviceinfoviewer.m index 3fc757721cf..23bd19f5a03 100644 --- a/src/osd/modules/debugger/osx/deviceinfoviewer.m +++ b/src/osd/modules/debugger/osx/deviceinfoviewer.m @@ -233,4 +233,4 @@ return self; } -@end \ No newline at end of file +@end diff --git a/src/osd/modules/debugger/osx/memoryview.m b/src/osd/modules/debugger/osx/memoryview.m index fa52689454d..0cb1a7f55d9 100644 --- a/src/osd/modules/debugger/osx/memoryview.m +++ b/src/osd/modules/debugger/osx/memoryview.m @@ -37,20 +37,31 @@ if (action == @selector(showChunkSize:)) { [item setState:((tag == memview->bytes_per_chunk()) ? NSOnState : NSOffState)]; + return YES; } else if (action == @selector(showPhysicalAddresses:)) { [item setState:((tag == memview->physical()) ? NSOnState : NSOffState)]; + return YES; } else if (action == @selector(showReverseView:)) { [item setState:((tag == memview->reverse()) ? NSOnState : NSOffState)]; + return YES; } else if (action == @selector(showReverseViewToggle:)) { [item setState:(memview->reverse() ? NSOnState : NSOffState)]; + return YES; + } + else if (action == @selector(changeBytesPerLine:)) + { + return (memview->chunks_per_row() + [item tag]) > 0; + } + else + { + return [super validateMenuItem:item]; } - return [super validateMenuItem:item]; } -- cgit v1.2.3 From 58960a48c1c2c94d22d7dea8dc3fd8289d1e1bc3 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 19 Feb 2015 04:42:49 +1100 Subject: Fix debugger crash when setting bytes per chunk to more than current bytes per line --- src/emu/debug/dvmemory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c index c284446bdae..5dfbfa0ef8c 100644 --- a/src/emu/debug/dvmemory.c +++ b/src/emu/debug/dvmemory.c @@ -749,6 +749,8 @@ void debug_view_memory::set_bytes_per_chunk(UINT8 chunkbytes) m_bytes_per_chunk = chunkbytes; m_chunks_per_row = m_bytes_per_row / chunkbytes; + if (m_chunks_per_row < 1) + m_chunks_per_row = 1; m_recompute = m_update_pending = true; pos.m_shift += 8 * ((pos.m_address % m_bytes_per_chunk) ^ ((source.m_endianness == ENDIANNESS_LITTLE) ? 0 : (m_bytes_per_chunk - 1))); -- cgit v1.2.3