From 8c2ef9c7c67828ca2e49b114f18bfae6d151bb3e Mon Sep 17 00:00:00 2001 From: mpohoreski Date: Sat, 18 Dec 2010 15:12:49 +0000 Subject: [PATCH] Cleanup --- AppleWin/source/Debugger/Debugger_Symbols.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/AppleWin/source/Debugger/Debugger_Symbols.cpp b/AppleWin/source/Debugger/Debugger_Symbols.cpp index 30d5b940..85bb8468 100644 --- a/AppleWin/source/Debugger/Debugger_Symbols.cpp +++ b/AppleWin/source/Debugger/Debugger_Symbols.cpp @@ -29,9 +29,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -// Allow the user to disable/enable symbol tables -#define ALLOW_SYMBOL_TABLE_DISABLED 1 - + // 2.6.2.13 Added: Can now enable/disable selected symbol table(s) ! + // Allow the user to disable/enable symbol tables + // xxx1xxx symbol table is active (are displayed in disassembly window, etc.) + // xxx1xxx symbol table is disabled (not displayed in disassembly window, etc.) + int g_bDisplaySymbolTables = (1 << NUM_SYMBOL_TABLES) - 1;; // default to all symbol tables // Symbols ________________________________________________________________________________________ @@ -68,9 +70,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA true }; - // %1 symbol table is active (are displayed in disassembly window, etc.) - // %0 symbol table is disabled (not displayed in disassembly window, etc.) - int g_bDisplaySymbolTables = (1 << NUM_SYMBOL_TABLES) - 1;; // default to all symbol tables // Utils _ ________________________________________________________________________________________ @@ -103,10 +102,8 @@ LPCTSTR FindSymbolFromAddress (WORD nAddress, int * iTable_ ) if (! g_aSymbols[iTable].size()) continue; -#if ALLOW_SYMBOL_TABLE_DISABLED if (! (g_bDisplaySymbolTables & (1 << iTable))) continue; -#endif map::iterator iSymbols = g_aSymbols[iTable].find(nAddress); if(g_aSymbols[iTable].find(nAddress) != g_aSymbols[iTable].end()) @@ -130,10 +127,8 @@ bool FindAddressFromSymbol ( LPCTSTR pSymbol, WORD * pAddress_, int * iTable_ ) if (! g_aSymbols[iTable].size()) continue; -#if ALLOW_SYMBOL_TABLE_DISABLED if (! (g_bDisplaySymbolTables & (1 << iTable))) continue; -#endif // map::iterator iSymbol = g_aSymbols[iTable].begin(); SymbolTable_t :: iterator iSymbol = g_aSymbols[iTable].begin();