From 7a368c4bbb0f26da8adaa605b088b3f8f6d5af35 Mon Sep 17 00:00:00 2001 From: stephena Date: Wed, 10 Nov 2010 14:50:38 +0000 Subject: [PATCH] All directives other than ROW now have an associated address in the disassembly. This allows the debugger 'jump' command to be more accurate. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2180 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- src/debugger/CartDebug.cxx | 4 ++-- src/debugger/DiStella.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx index 69aef562d..9481621a0 100644 --- a/src/debugger/CartDebug.cxx +++ b/src/debugger/CartDebug.cxx @@ -291,8 +291,8 @@ bool CartDebug::fillDisassemblyList(BankInfo& info, bool resolvedata, uInt16 sea { const DisassemblyTag& tag = myDisassembly.list[i]; - // Only addresses marked as 'CODE' can possibly be in the program counter - if(tag.type == CODE) + // Addresses marked as 'ROW' normally won't have an address + if(tag.address) { // Create a mapping from addresses to line numbers myAddrToLineList.insert(make_pair(tag.address, i)); diff --git a/src/debugger/DiStella.cxx b/src/debugger/DiStella.cxx index b474ed215..5babddba4 100644 --- a/src/debugger/DiStella.cxx +++ b/src/debugger/DiStella.cxx @@ -85,8 +85,8 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list, info.end = myAppData.end; info.offset = myOffset; - memset(labels, 0, 0x1000); - memset(directives, 0, 0x1000); + memset(myLabels, 0, 0x1000); + memset(myDirectives, 0, 0x1000); myAddressQueue.push(start); // Process any directives first, as they override automatic code determination