From badf346089079e34fb54f629e31b348ef15975c2 Mon Sep 17 00:00:00 2001 From: mpohoreski Date: Sun, 30 Jan 2011 17:39:19 +0000 Subject: [PATCH] .6 Removed: Removed unused aliases. Reason: When a symbol table is specified with no args, the total # of symbols will be shown. SYMBOLS1, SYMBOLS2, SYM0, SYM1, SYM2, SYM3, SYM4, SYM5, SYM6 .5 Fixed: Increased console output height so that you can view all the SYMBASIC * output. .4 Added: Two alises for Dos 3.3 and Prodos symbol tables SYMDOS SYMPRO .3 Added: Two new symbol tables added Dos 3.3 and Prodos. SYMDOS33 SYMPRODOS --- ApplewinExpress9.00.vcproj | 4 + docs/Debugger_Changelog.txt | 10 + source/Debugger/Debug.cpp | 485 +-------------------------- source/Debugger/Debug.h | 2 + source/Debugger/Debugger_Console.h | 6 +- source/Debugger/Debugger_Symbols.cpp | 51 ++- source/Debugger/Debugger_Types.h | 12 +- 7 files changed, 60 insertions(+), 510 deletions(-) diff --git a/ApplewinExpress9.00.vcproj b/ApplewinExpress9.00.vcproj index 670e3067..8d4b2e45 100644 --- a/ApplewinExpress9.00.vcproj +++ b/ApplewinExpress9.00.vcproj @@ -488,6 +488,10 @@ RelativePath=".\source\Debugger\Debugger_Color.h" > + + diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt index a5fdd842..aebc4953 100644 --- a/docs/Debugger_Changelog.txt +++ b/docs/Debugger_Changelog.txt @@ -1,5 +1,15 @@ /* + .6 Removed: Removed unused aliases. + Reason: When a symbol table is specified with no args, the total # of symbols will be shown. + SYMBOLS1, SYMBOLS2, SYM0, SYM1, SYM2, SYM3, SYM4, SYM5, SYM6 + .5 Fixed: Increased console output height so that you can view all the SYMBASIC * output. + .4 Added: Two alises for Dos 3.3 and Prodos symbol tables + SYMDOS + SYMPRO + .3 Added: Two new symbol tables added Dos 3.3 and Prodos. + SYMDOS33 + SYMPRODOS .2 Fixed: Fixed: Debug build of debugger force display all CPU info window wasn't calling DrawTargets() .1 Added: Soft Switches displayed in CPU info window diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index f5607e2b..e5d37b21 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define ALLOW_INPUT_LOWERCASE 1 // See /docs/Debugger_Changelog.txt for full details - const int DEBUGGER_VERSION = MAKE_VERSION(2,7,0,2); + const int DEBUGGER_VERSION = MAKE_VERSION(2,7,0,6); // Public _________________________________________________________________________________________ @@ -105,354 +105,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Commands _______________________________________________________________________________________ - #define __COMMANDS_VERIFY_TXT__ "\xDE\xAD\xC0\xDE" - #define __PARAMS_VERIFY_TXT__ "\xDE\xAD\xDA\x1A" - - int g_iCommand; // last command (enum) // used for consecuitive commands + int g_iCommand; // last command (enum) // used for consecutive commands vector g_vPotentialCommands; // global, since TAB-completion also needs vector g_vSortedCommands; - // Setting function to NULL, allows g_aCommands arguments to be safely listed here - // Commands should be listed alphabetically per category. - // For the list sorted by category, check Commands_e - // NOTE: Keep in sync Commands_e and g_aCommands[] ! Aliases are listed at the end. - Command_t g_aCommands[] = - { - // Assembler - {TEXT("A") , CmdAssemble , CMD_ASSEMBLE , "Assemble instructions" }, - // CPU (Main) - {TEXT(".") , CmdCursorJumpPC , CMD_CURSOR_JUMP_PC , "Locate the cursor in the disasm window" }, // centered - {TEXT("=") , CmdCursorSetPC , CMD_CURSOR_SET_PC , "Sets the PC to the current instruction" }, - {TEXT("BRK") , CmdBreakInvalid , CMD_BREAK_INVALID , "Enter debugger on BRK or INVALID" }, - {TEXT("BRKOP") , CmdBreakOpcode , CMD_BREAK_OPCODE , "Enter debugger on opcode" }, - {TEXT("G") , CmdGo , CMD_GO , "Run [until PC = address]" }, - {TEXT("IN") , CmdIn , CMD_IN , "Input byte from IO $C0xx" }, - {TEXT("KEY") , CmdKey , CMD_INPUT_KEY , "Feed key into emulator" }, - {TEXT("JSR") , CmdJSR , CMD_JSR , "Call sub-routine" }, - {TEXT("NOP") , CmdNOP , CMD_NOP , "Zap the current instruction with a NOP" }, - {TEXT("OUT") , CmdOut , CMD_OUT , "Output byte to IO $C0xx" }, - // CPU - Meta Info - {TEXT("PROFILE") , CmdProfile , CMD_PROFILE , "List/Save 6502 profiling" }, - {TEXT("R") , CmdRegisterSet , CMD_REGISTER_SET , "Set register" }, - // CPU - Stack - {TEXT("POP") , CmdStackPop , CMD_STACK_POP }, - {TEXT("PPOP") , CmdStackPopPseudo , CMD_STACK_POP_PSEUDO }, - {TEXT("PUSH") , CmdStackPop , CMD_STACK_PUSH }, -// {TEXT("RTS") , CmdStackReturn , CMD_STACK_RETURN }, - {TEXT("P") , CmdStepOver , CMD_STEP_OVER , "Step current instruction" }, - {TEXT("RTS") , CmdStepOut , CMD_STEP_OUT , "Step out of subroutine" }, - // CPU - Meta Info - {TEXT("T") , CmdTrace , CMD_TRACE , "Trace current instruction" }, - {TEXT("TF") , CmdTraceFile , CMD_TRACE_FILE , "Save trace to filename" }, - {TEXT("TL") , CmdTraceLine , CMD_TRACE_LINE , "Trace (with cycle counting)" }, - {TEXT("U") , CmdUnassemble , CMD_UNASSEMBLE , "Disassemble instructions" }, -// {TEXT("WAIT") , CmdWait , CMD_WAIT , "Run until - // Bookmarks - {TEXT("BM") , CmdBookmark , CMD_BOOKMARK , "Alias for BMA (Bookmark Add)" }, - {TEXT("BMA") , CmdBookmarkAdd , CMD_BOOKMARK_ADD , "Add/Update addess to bookmark" }, - {TEXT("BMC") , CmdBookmarkClear , CMD_BOOKMARK_CLEAR , "Clear (remove) bookmark" }, - {TEXT("BML") , CmdBookmarkList , CMD_BOOKMARK_LIST , "List all bookmarks" }, - {TEXT("BMG") , CmdBookmarkGoto , CMD_BOOKMARK_GOTO , "Move cursor to bookmark" }, -// {TEXT("BMLOAD") , CmdBookmarkLoad , CMD_BOOKMARK_LOAD , "Load bookmarks" }, - {TEXT("BMSAVE") , CmdBookmarkSave , CMD_BOOKMARK_SAVE , "Save bookmarks" }, - // Breakpoints - {TEXT("BP") , CmdBreakpoint , CMD_BREAKPOINT , "Alias for BPR (Breakpoint Register Add)" }, - {TEXT("BPA") , CmdBreakpointAddSmart, CMD_BREAKPOINT_ADD_SMART , "Add (smart) breakpoint" }, -// {TEXT("BPP") , CmdBreakpointAddFlag , CMD_BREAKPOINT_ADD_FLAG , "Add breakpoint on flags" }, - {TEXT("BPR") , CmdBreakpointAddReg , CMD_BREAKPOINT_ADD_REG , "Add breakpoint on register value" }, // NOTE! Different from SoftICE !!!! - {TEXT("BPX") , CmdBreakpointAddPC , CMD_BREAKPOINT_ADD_PC , "Add breakpoint at current instruction" }, - {TEXT("BPIO") , CmdBreakpointAddIO , CMD_BREAKPOINT_ADD_IO , "Add breakpoint for IO address $C0xx" }, - {TEXT("BPM") , CmdBreakpointAddMem , CMD_BREAKPOINT_ADD_MEM , "Add breakpoint on memory access" }, // SoftICE - - {TEXT("BPC") , CmdBreakpointClear , CMD_BREAKPOINT_CLEAR , "Clear (remove) breakpoint" }, // SoftICE - {TEXT("BPD") , CmdBreakpointDisable , CMD_BREAKPOINT_DISABLE , "Disable breakpoint- it is still in the list, just not active" }, // SoftICE - {TEXT("BPEDIT") , CmdBreakpointEdit , CMD_BREAKPOINT_EDIT , "Edit breakpoint" }, // SoftICE - {TEXT("BPE") , CmdBreakpointEnable , CMD_BREAKPOINT_ENABLE , "(Re)Enable disabled breakpoint" }, // SoftICE - {TEXT("BPL") , CmdBreakpointList , CMD_BREAKPOINT_LIST , "List all breakpoints" }, // SoftICE -// {TEXT("BPLOAD") , CmdBreakpointLoad , CMD_BREAKPOINT_LOAD , "Loads breakpoints" }, - {TEXT("BPSAVE") , CmdBreakpointSave , CMD_BREAKPOINT_SAVE , "Saves breakpoints" }, - // Config - {TEXT("BENCHMARK") , CmdBenchmark , CMD_BENCHMARK , "Benchmark the emulator" }, - {TEXT("BW") , CmdConfigColorMono , CMD_CONFIG_BW , "Sets/Shows RGB for Black & White scheme" }, - {TEXT("COLOR") , CmdConfigColorMono , CMD_CONFIG_COLOR , "Sets/Shows RGB for color scheme" }, -// {TEXT("OPTION") , CmdConfigMenu , CMD_CONFIG_MENU , "Access config options" }, - {TEXT("DISASM") , CmdConfigDisasm , CMD_CONFIG_DISASM , "Sets/Shows disassembly view options." }, - {TEXT("FONT") , CmdConfigFont , CMD_CONFIG_FONT , "Shows current font or sets new one" }, - {TEXT("HCOLOR") , CmdConfigHColor , CMD_CONFIG_HCOLOR , "Sets/Shows colors mapped to Apple HGR" }, - {TEXT("LOAD") , CmdConfigLoad , CMD_CONFIG_LOAD , "Load debugger configuration" }, - {TEXT("MONO") , CmdConfigColorMono , CMD_CONFIG_MONOCHROME , "Sets/Shows RGB for monochrome scheme" }, - {TEXT("SAVE") , CmdConfigSave , CMD_CONFIG_SAVE , "Save debugger configuration" }, - // Cursor - {TEXT("RET") , CmdCursorJumpRetAddr , CMD_CURSOR_JUMP_RET_ADDR , "Sets the cursor to the sub-routine caller" }, - {TEXT( "^") , NULL , CMD_CURSOR_LINE_UP }, // \x2191 = Up Arrow (Unicode) - {TEXT("Shift ^") , NULL , CMD_CURSOR_LINE_UP_1 }, - {TEXT( "v") , NULL , CMD_CURSOR_LINE_DOWN }, // \x2193 = Dn Arrow (Unicode) - {TEXT("Shift v") , NULL , CMD_CURSOR_LINE_DOWN_1 }, - {TEXT("PAGEUP" ) , CmdCursorPageUp , CMD_CURSOR_PAGE_UP , "Scroll up one screen" }, - {TEXT("PAGEUP256") , CmdCursorPageUp256 , CMD_CURSOR_PAGE_UP_256 , "Scroll up 256 bytes" }, // Shift - {TEXT("PAGEUP4K" ) , CmdCursorPageUp4K , CMD_CURSOR_PAGE_UP_4K , "Scroll up 4096 bytes" }, // Ctrl - {TEXT("PAGEDN" ) , CmdCursorPageDown , CMD_CURSOR_PAGE_DOWN , "Scroll down one scren" }, - {TEXT("PAGEDOWN256") , CmdCursorPageDown256 , CMD_CURSOR_PAGE_DOWN_256 , "Scroll down 256 bytes" }, // Shift - {TEXT("PAGEDOWN4K" ) , CmdCursorPageDown4K , CMD_CURSOR_PAGE_DOWN_4K , "Scroll down 4096 bytes" }, // Ctrl - // Disassembler Data - {TEXT("Z") , CmdDisasmDataDefByte1 , CMD_DISASM_DATA , "Treat byte [range] as data" }, - {TEXT("X") , CmdDisasmDataDefCode , CMD_DISASM_CODE , "Treat byte [range] as code" }, -// TODO: Conflicts with monitor command #L -> 000DL - {TEXT("B") , CmdDisasmDataList , CMD_DISASM_LIST , "List all byte ranges treated as data" }, - // without symbol lookup - {TEXT("DB") , CmdDisasmDataDefByte1 , CMD_DEFINE_DATA_BYTE1, "Define byte(s)" }, - {TEXT("DB2") , CmdDisasmDataDefByte2 , CMD_DEFINE_DATA_BYTE2, "Define byte array, display 2 bytes/line" }, - {TEXT("DB4") , CmdDisasmDataDefByte4 , CMD_DEFINE_DATA_BYTE4, "Define byte array, display 4 bytes/line" }, - {TEXT("DB8") , CmdDisasmDataDefByte8 , CMD_DEFINE_DATA_BYTE8, "Define byte array, display 8 bytes/line" }, - {TEXT("DW") , CmdDisasmDataDefWord1 , CMD_DEFINE_DATA_WORD1, "Define address array" }, - {TEXT("DW2") , CmdDisasmDataDefWord2 , CMD_DEFINE_DATA_WORD2, "Define address array, display 2 words/line" }, - {TEXT("DW4") , CmdDisasmDataDefWord4 , CMD_DEFINE_DATA_WORD4, "Define address array, display 4 words/line" }, - {TEXT("DS") , CmdDisasmDataDefString , CMD_DEFINE_DATA_STR , "Define string" }, -// {TEXT("DF") , CmdDisasmDataDefFloat , CMD_DEFINE_DATA_FLOAT, "Define AppleSoft (packed) Float" }, -// {TEXT("DFX") , CmdDisasmDataDefFloatUnpack , CMD_DEFINE_DATA_FLOAT2,"Define AppleSoft (unpacked) Float" }, - // with symbol lookup -// {TEXT("DA<>") , CmdDisasmDataDefAddress8HL , CMD_DEFINE_ADDR_8_HL , "Define split array of addresses, high byte section followed by low byte section" }, -// {TEXT("DA><") , CmdDisasmDataDefAddress8LH , CMD_DEFINE_ADDR_8_LH , "Define split array of addresses, low byte section followed by high byte section" }, -// {TEXT("DA<") , CmdDisasmDataDefAddress8H , CMD_DEFINE_ADDR_BYTE_H , "Define array of high byte addresses" }, -// {TEXT("DB>") , CmdDisasmDataDefAddress8L , CMD_DEFINE_ADDR_BYTE_L , "Define array of low byte addresses" } - {TEXT("DA") , CmdDisasmDataDefAddress16 , CMD_DEFINE_ADDR_WORD , "Define array of word addresses" }, -// TODO: Rename config cmd: DISASM -// {TEXT("UA") , CmdDisasmDataSmart , CMD_SMART_DISASSEMBLE, "Analyze opcodes to determine if code or data" }, - // Disk - {TEXT("DISK") , CmdDisk , CMD_DISK , "Access Disk Drive Functions" }, - // Flags -// {TEXT("FC") , CmdFlag , CMD_FLAG_CLEAR , "Clear specified Flag" }, // NVRBDIZC see AW_CPU.cpp AF_* -// TODO: Conflicts with monitor command #L -> 000CL - {TEXT("CL") , CmdFlag , CMD_FLAG_CLEAR , "Clear specified Flag" }, // NVRBDIZC see AW_CPU.cpp AF_* - - {TEXT("CLC") , CmdFlagClear , CMD_FLAG_CLR_C , "Clear Flag Carry" }, // 0 // Legacy - {TEXT("CLZ") , CmdFlagClear , CMD_FLAG_CLR_Z , "Clear Flag Zero" }, // 1 - {TEXT("CLI") , CmdFlagClear , CMD_FLAG_CLR_I , "Clear Flag Interrupts Disabled" }, // 2 - {TEXT("CLD") , CmdFlagClear , CMD_FLAG_CLR_D , "Clear Flag Decimal (BCD)" }, // 3 - {TEXT("CLB") , CmdFlagClear , CMD_FLAG_CLR_B , "CLear Flag Break" }, // 4 // Legacy - {TEXT("CLR") , CmdFlagClear , CMD_FLAG_CLR_R , "Clear Flag Reserved" }, // 5 - {TEXT("CLV") , CmdFlagClear , CMD_FLAG_CLR_V , "Clear Flag Overflow" }, // 6 - {TEXT("CLN") , CmdFlagClear , CMD_FLAG_CLR_N , "Clear Flag Negative (Sign)" }, // 7 - -// {TEXT("FS") , CmdFlag , CMD_FLAG_SET , "Set specified Flag" }, - {TEXT("SE") , CmdFlag , CMD_FLAG_SET , "Set specified Flag" }, - - {TEXT("SEC") , CmdFlagSet , CMD_FLAG_SET_C , "Set Flag Carry" }, // 0 - {TEXT("SEZ") , CmdFlagSet , CMD_FLAG_SET_Z , "Set Flag Zero" }, // 1 - {TEXT("SEI") , CmdFlagSet , CMD_FLAG_SET_I , "Set Flag Interrupts Disabled" }, // 2 - {TEXT("SED") , CmdFlagSet , CMD_FLAG_SET_D , "Set Flag Decimal (BCD)" }, // 3 - {TEXT("SEB") , CmdFlagSet , CMD_FLAG_SET_B , "Set Flag Break" }, // 4 // Legacy - {TEXT("SER") , CmdFlagSet , CMD_FLAG_SET_R , "Set Flag Reserved" }, // 5 - {TEXT("SEV") , CmdFlagSet , CMD_FLAG_SET_V , "Set Flag Overflow" }, // 6 - {TEXT("SEN") , CmdFlagSet , CMD_FLAG_SET_N , "Set Flag Negative" }, // 7 - // Help - {TEXT("?") , CmdHelpList , CMD_HELP_LIST , "List all available commands" }, - {TEXT("HELP") , CmdHelpSpecific , CMD_HELP_SPECIFIC , "Help on specific command" }, - {TEXT("VERSION") , CmdVersion , CMD_VERSION , "Displays version of emulator/debugger" }, - {TEXT("MOTD") , CmdMOTD , CMD_MOTD }, - // Memory - {TEXT("MC") , CmdMemoryCompare , CMD_MEMORY_COMPARE }, - - {TEXT("MD1") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 , "Hex dump in the mini memory area 1" }, - {TEXT("MD2") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_2 , "Hex dump in the mini memory area 2" }, - - {TEXT("MA1") , CmdMemoryMiniDumpAscii,CMD_MEM_MINI_DUMP_ASCII_1, "ASCII text in mini memory area 1" }, - {TEXT("MA2") , CmdMemoryMiniDumpAscii,CMD_MEM_MINI_DUMP_ASCII_2, "ASCII text in mini memory area 2" }, - {TEXT("MT1") , CmdMemoryMiniDumpApple,CMD_MEM_MINI_DUMP_APPLE_1, "Apple Text in mini memory area 1" }, - {TEXT("MT2") , CmdMemoryMiniDumpApple,CMD_MEM_MINI_DUMP_APPLE_2, "Apple Text in mini memory area 2" }, -// {TEXT("ML1") , CmdMemoryMiniDumpLow , CMD_MEM_MINI_DUMP_TXT_LO_1, "Text (Ctrl) in mini memory dump area 1" }, -// {TEXT("ML2") , CmdMemoryMiniDumpLow , CMD_MEM_MINI_DUMP_TXT_LO_2, "Text (Ctrl) in mini memory dump area 2" }, -// {TEXT("MH1") , CmdMemoryMiniDumpHigh, CMD_MEM_MINI_DUMP_TXT_HI_1, "Text (High) in mini memory dump area 1" }, -// {TEXT("MH2") , CmdMemoryMiniDumpHigh, CMD_MEM_MINI_DUMP_TXT_HI_2, "Text (High) in mini memory dump area 2" }, - - {TEXT("ME") , CmdMemoryEdit , CMD_MEMORY_EDIT }, // TODO: like Copy ][+ Sector Edit - {TEXT("MEB") , CmdMemoryEnterByte , CMD_MEMORY_ENTER_BYTE , "Enter byte" }, - {TEXT("MEW") , CmdMemoryEnterWord , CMD_MEMORY_ENTER_WORD , "Enter word" }, - {TEXT("BLOAD") , CmdMemoryLoad , CMD_MEMORY_LOAD , "Load a region of memory" }, - {TEXT("M") , CmdMemoryMove , CMD_MEMORY_MOVE , "Memory move" }, - {TEXT("BSAVE") , CmdMemorySave , CMD_MEMORY_SAVE , "Save a region of memory" }, - {TEXT("S") , CmdMemorySearch , CMD_MEMORY_SEARCH , "Search memory for text / hex values" }, - {TEXT("@") ,_SearchMemoryDisplay , CMD_MEMORY_FIND_RESULTS , "Display search memory results" }, -// {TEXT("SA") , CmdMemorySearchAscii, CMD_MEMORY_SEARCH_ASCII , "Search ASCII text" }, -// {TEXT("ST") , CmdMemorySearchApple , CMD_MEMORY_SEARCH_APPLE , "Search Apple text (hi-bit)" }, - {TEXT("SH") , CmdMemorySearchHex , CMD_MEMORY_SEARCH_HEX , "Search memory for hex values" }, - {TEXT("F") , CmdMemoryFill , CMD_MEMORY_FILL , "Memory fill" }, - // Output / Scripts - {TEXT("CALC") , CmdOutputCalc , CMD_OUTPUT_CALC , "Display mini calc result" }, - {TEXT("ECHO") , CmdOutputEcho , CMD_OUTPUT_ECHO , "Echo string to console" }, // or toggle command echoing" - {TEXT("PRINT") , CmdOutputPrint , CMD_OUTPUT_PRINT , "Display string and/or hex values" }, - {TEXT("PRINTF") , CmdOutputPrintf , CMD_OUTPUT_PRINTF , "Display formatted string" }, - {TEXT("RUN") , CmdOutputRun , CMD_OUTPUT_RUN , "Run script file of debugger commands" }, - // Source Level Debugging - {TEXT("SOURCE") , CmdSource , CMD_SOURCE , "Starts/Stops source level debugging" }, - {TEXT("SYNC") , CmdSync , CMD_SYNC , "Syncs the cursor to the source file" }, - // Symbols - {TEXT("SYM") , CmdSymbols , CMD_SYMBOLS_LOOKUP , "Lookup symbol or address, or define symbol" }, - - {TEXT("SYMMAIN") , CmdSymbolsCommand , CMD_SYMBOLS_ROM , "Main/ROM symbol table lookup/menu" }, // CLEAR,LOAD,SAVE - {TEXT("SYMBASIC") , CmdSymbolsCommand , CMD_SYMBOLS_APPLESOFT , "Applesoft symbol table lookup/menu" }, // CLEAR,LOAD,SAVE - {TEXT("SYMASM") , CmdSymbolsCommand , CMD_SYMBOLS_ASSEMBLY , "Assembly symbol table lookup/menu" }, // CLEAR,LOAD,SAVE - {TEXT("SYMUSER") , CmdSymbolsCommand , CMD_SYMBOLS_USER_1 , "First user symbol table lookup/menu" }, // CLEAR,LOAD,SAVE - {TEXT("SYMUSER2") , CmdSymbolsCommand , CMD_SYMBOLS_USER_2 , "Second User symbol table lookup/menu" }, // CLEAR,LOAD,SAVE - {TEXT("SYMSRC") , CmdSymbolsCommand , CMD_SYMBOLS_SRC_1 , "First Source symbol table lookup/menu" }, // CLEAR,LOAD,SAVE - {TEXT("SYMSRC2") , CmdSymbolsCommand , CMD_SYMBOLS_SRC_2 , "Second Source symbol table lookup/menu" }, // CLEAR,LOAD,SAVE -// {TEXT("SYMCLEAR") , CmdSymbolsClear , CMD_SYMBOLS_CLEAR }, // can't use SC = SetCarry - {TEXT("SYMINFO") , CmdSymbolsInfo , CMD_SYMBOLS_INFO , "Display summary of symbols" }, - {TEXT("SYMLIST") , CmdSymbolsList , CMD_SYMBOLS_LIST , "Lookup symbol in main/user/src tables" }, // 'symbolname', can't use param '*' - // Variables -// {TEXT("CLEAR") , CmdVarsClear , CMD_VARIABLES_CLEAR }, -// {TEXT("VAR") , CmdVarsDefine , CMD_VARIABLES_DEFINE }, -// {TEXT("INT8") , CmdVarsDefineInt8 , CMD_VARIABLES_DEFINE_INT8}, -// {TEXT("INT16") , CmdVarsDefineInt16 , CMD_VARIABLES_DEFINE_INT16}, -// {TEXT("VARS") , CmdVarsList , CMD_VARIABLES_LIST }, -// {TEXT("VARSLOAD") , CmdVarsLoad , CMD_VARIABLES_LOAD }, -// {TEXT("VARSSAVE") , CmdVarsSave , CMD_VARIABLES_SAVE }, -// {TEXT("SET") , CmdVarsSet , CMD_VARIABLES_SET }, - // View - {TEXT("TEXT") , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X, "View Text screen (current page)" }, - {TEXT("TEXT1") , CmdViewOutput_Text41 , CMD_VIEW_TEXT41, "View Text screen Page 1" }, - {TEXT("TEXT2") , CmdViewOutput_Text42 , CMD_VIEW_TEXT42, "View Text screen Page 2" }, - {TEXT("TEXT80") , CmdViewOutput_Text8X , CMD_VIEW_TEXT8X, "View 80-col Text screen (current page)" }, - {TEXT("TEXT81") , CmdViewOutput_Text81 , CMD_VIEW_TEXT81, "View 80-col Text screen Page 1" }, - {TEXT("TEXT82") , CmdViewOutput_Text82 , CMD_VIEW_TEXT82, "View 80-col Text screen Page 2" }, - {TEXT("GR") , CmdViewOutput_GRX , CMD_VIEW_GRX , "View Lo-Res screen (current page)" }, - {TEXT("GR1") , CmdViewOutput_GR1 , CMD_VIEW_GR1 , "View Lo-Res screen Page 1" }, - {TEXT("GR2") , CmdViewOutput_GR2 , CMD_VIEW_GR2 , "View Lo-Res screen Page 2" }, - {TEXT("DGR") , CmdViewOutput_DGRX , CMD_VIEW_DGRX , "View Double lo-res (current page)" }, - {TEXT("DGR1") , CmdViewOutput_DGR1 , CMD_VIEW_DGR1 , "View Double lo-res Page 1" }, - {TEXT("DGR2") , CmdViewOutput_DGR2 , CMD_VIEW_DGR2 , "View Double lo-res Page 2" }, - {TEXT("HGR") , CmdViewOutput_HGRX , CMD_VIEW_HGRX , "View Hi-res (current page)" }, - {TEXT("HGR1") , CmdViewOutput_HGR1 , CMD_VIEW_HGR1 , "View Hi-res Page 1" }, - {TEXT("HGR2") , CmdViewOutput_HGR2 , CMD_VIEW_HGR2 , "View Hi-res Page 2" }, - {TEXT("DHGR") , CmdViewOutput_DHGRX , CMD_VIEW_DHGRX , "View Double Hi-res (current page)" }, - {TEXT("DHGR1") , CmdViewOutput_DHGR1 , CMD_VIEW_DHGR1 , "View Double Hi-res Page 1" }, - {TEXT("DHGR2") , CmdViewOutput_DHGR2 , CMD_VIEW_DHGR2 , "View Double Hi-res Page 2" }, - // Watch - {TEXT("W") , CmdWatch , CMD_WATCH , "Alias for WA (Watch Add)" }, - {TEXT("WA") , CmdWatchAdd , CMD_WATCH_ADD , "Add/Update address or symbol to watch" }, - {TEXT("WC") , CmdWatchClear , CMD_WATCH_CLEAR , "Clear (remove) watch" }, - {TEXT("WD") , CmdWatchDisable , CMD_WATCH_DISABLE , "Disable specific watch - it is still in the list, just not active" }, - {TEXT("WE") , CmdWatchEnable , CMD_WATCH_ENABLE , "(Re)Enable disabled watch" }, - {TEXT("WL") , CmdWatchList , CMD_WATCH_LIST , "List all watches" }, -// {TEXT("WLOAD") , CmdWatchLoad , CMD_WATCH_LOAD , "Load Watches" }, // Cant use as param to W - {TEXT("WSAVE") , CmdWatchSave , CMD_WATCH_SAVE , "Save Watches" }, // due to symbol look-up - // Window - {TEXT("WIN") , CmdWindow , CMD_WINDOW , "Show specified debugger window" }, -// CODE 0, CODE 1, CODE 2 ... ??? - {TEXT("CODE") , CmdWindowViewCode , CMD_WINDOW_CODE , "Switch to full code window" }, // Can't use WC = WatchClear - {TEXT("CODE1") , CmdWindowShowCode1 , CMD_WINDOW_CODE_1 , "Show code on top split window" }, - {TEXT("CODE2") , CmdWindowShowCode2 , CMD_WINDOW_CODE_2 , "Show code on bottom split window" }, - {TEXT("CONSOLE") , CmdWindowViewConsole , CMD_WINDOW_CONSOLE , "Switch to full console window" }, - {TEXT("DATA") , CmdWindowViewData , CMD_WINDOW_DATA , "Switch to full data window" }, - {TEXT("DATA1") , CmdWindowShowData1 , CMD_WINDOW_DATA_1 , "Show data on top split window" }, - {TEXT("DATA2") , CmdWindowShowData2 , CMD_WINDOW_DATA_2 , "Show data on bottom split window" }, - {TEXT("SOURCE1") , CmdWindowShowSource1 , CMD_WINDOW_SOURCE_1, "Show source on top split screen" }, - {TEXT("SOURCE2") , CmdWindowShowSource2 , CMD_WINDOW_SOURCE_2, "Show source on bottom split screen" }, - - {TEXT("\\") , CmdWindowViewOutput , CMD_WINDOW_OUTPUT , "Display Apple output until key pressed" }, -// {TEXT("INFO") , CmdToggleInfoPanel , CMD_WINDOW_TOGGLE }, -// {TEXT("WINSOURCE") , CmdWindowShowSource , CMD_WINDOW_SOURCE }, -// {TEXT("ZEROPAGE") , CmdWindowShowZeropage, CMD_WINDOW_ZEROPAGE }, - // Zero Page - {TEXT("ZP") , CmdZeroPage , CMD_ZEROPAGE_POINTER , "Alias for ZPA (Zero Page Add)" }, - {TEXT("ZP0") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_0 , "Set/Update/Remove ZP watch 0 " }, - {TEXT("ZP1") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_1 , "Set/Update/Remove ZP watch 1" }, - {TEXT("ZP2") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_2 , "Set/Update/Remove ZP watch 2" }, - {TEXT("ZP3") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_3 , "Set/Update/Remove ZP watch 3" }, - {TEXT("ZP4") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_4 , "Set/Update/Remove ZP watch 4" }, - {TEXT("ZP5") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_5 , "Set/Update/Remove ZP watch 5 " }, - {TEXT("ZP6") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_6 , "Set/Update/Remove ZP watch 6" }, - {TEXT("ZP7") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_7 , "Set/Update/Remove ZP watch 7" }, - {TEXT("ZPA") , CmdZeroPageAdd , CMD_ZEROPAGE_POINTER_ADD , "Add/Update address to zero page pointer"}, - {TEXT("ZPC") , CmdZeroPageClear , CMD_ZEROPAGE_POINTER_CLEAR , "Clear (remove) zero page pointer" }, - {TEXT("ZPD") , CmdZeroPageDisable , CMD_ZEROPAGE_POINTER_DISABLE,"Disable zero page pointer - it is still in the list, just not active" }, - {TEXT("ZPE") , CmdZeroPageEnable , CMD_ZEROPAGE_POINTER_ENABLE, "(Re)Enable disabled zero page pointer" }, - {TEXT("ZPL") , CmdZeroPageList , CMD_ZEROPAGE_POINTER_LIST , "List all zero page pointers" }, -// {TEXT("ZPLOAD") , CmdZeroPageLoad , CMD_ZEROPAGE_POINTER_LOAD , "Load zero page pointers" }, // Cant use as param to ZP - {TEXT("ZPSAVE") , CmdZeroPageSave , CMD_ZEROPAGE_POINTER_SAVE , "Save zero page pointers" }, // due to symbol look-up - -// {TEXT("TIMEDEMO"),CmdTimeDemo, CMD_TIMEDEMO }, // CmdBenchmarkStart(), CmdBenchmarkStop() -// {TEXT("WC"),CmdShowCodeWindow}, // Can't use since WatchClear -// {TEXT("WD"),CmdShowDataWindow}, // - - // Internal Consistency Check - {TEXT(__COMMANDS_VERIFY_TXT__), NULL, NUM_COMMANDS }, - - // Aliasies - Can be in any order - {TEXT("->") , NULL , CMD_CURSOR_JUMP_PC }, - {TEXT("Ctrl ->" ) , NULL , CMD_CURSOR_SET_PC }, - {TEXT("Shift ->") , NULL , CMD_CURSOR_JUMP_PC }, // at top - {TEXT("INPUT") , CmdIn , CMD_IN }, - // Data - // Flags - Clear - {TEXT("RC") , CmdFlagClear , CMD_FLAG_CLR_C , "Clear Flag Carry" }, // 0 // Legacy - {TEXT("RZ") , CmdFlagClear , CMD_FLAG_CLR_Z , "Clear Flag Zero" }, // 1 - {TEXT("RI") , CmdFlagClear , CMD_FLAG_CLR_I , "Clear Flag Interrupts Disabled" }, // 2 - {TEXT("RD") , CmdFlagClear , CMD_FLAG_CLR_D , "Clear Flag Decimal (BCD)" }, // 3 - {TEXT("RB") , CmdFlagClear , CMD_FLAG_CLR_B , "CLear Flag Break" }, // 4 // Legacy - {TEXT("RR") , CmdFlagClear , CMD_FLAG_CLR_R , "Clear Flag Reserved" }, // 5 - {TEXT("RV") , CmdFlagClear , CMD_FLAG_CLR_V , "Clear Flag Overflow" }, // 6 - {TEXT("RN") , CmdFlagClear , CMD_FLAG_CLR_N , "Clear Flag Negative (Sign)" }, // 7 - // Flags - Set - {TEXT("SC") , CmdFlagSet , CMD_FLAG_SET_C , "Set Flag Carry" }, // 0 - {TEXT("SZ") , CmdFlagSet , CMD_FLAG_SET_Z , "Set Flag Zero" }, // 1 - {TEXT("SI") , CmdFlagSet , CMD_FLAG_SET_I , "Set Flag Interrupts Disabled" }, // 2 - {TEXT("SD") , CmdFlagSet , CMD_FLAG_SET_D , "Set Flag Decimal (BCD)" }, // 3 - {TEXT("SB") , CmdFlagSet , CMD_FLAG_SET_B , "CLear Flag Break" }, // 4 // Legacy - {TEXT("SR") , CmdFlagSet , CMD_FLAG_SET_R , "Clear Flag Reserved" }, // 5 - {TEXT("SV") , CmdFlagSet , CMD_FLAG_SET_V , "Clear Flag Overflow" }, // 6 - {TEXT("SN") , CmdFlagSet , CMD_FLAG_SET_N , "Clear Flag Negative" }, // 7 - // Memory - {TEXT("D") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 , "Hex dump in the mini memory area 1" }, // FIXME: Must also work in DATA screen - {TEXT("M1") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // alias - {TEXT("M2") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_2 }, // alias - - {TEXT("ME8") , CmdMemoryEnterByte , CMD_MEMORY_ENTER_BYTE }, // changed from EB -- bugfix: EB:## ## - {TEXT("ME16") , CmdMemoryEnterWord , CMD_MEMORY_ENTER_WORD }, - {TEXT("MM") , CmdMemoryMove , CMD_MEMORY_MOVE }, - {TEXT("MS") , CmdMemorySearch , CMD_MEMORY_SEARCH }, // CmdMemorySearch - {TEXT("P0") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_0 }, - {TEXT("P1") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_1 }, - {TEXT("P2") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_2 }, - {TEXT("P3") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_3 }, - {TEXT("P4") , CmdZeroPagePointer , CMD_ZEROPAGE_POINTER_4 }, - {TEXT("REGISTER") , CmdRegisterSet , CMD_REGISTER_SET }, -// {TEXT("RET") , CmdStackReturn , CMD_STACK_RETURN }, - {TEXT("TRACE") , CmdTrace , CMD_TRACE }, - {TEXT("SYMBOLS") , CmdSymbols , CMD_SYMBOLS_LOOKUP , "Return " }, -// {TEXT("SYMBOLS1") , CmdSymbolsInfo , CMD_SYMBOLS_1 }, -// {TEXT("SYMBOLS2") , CmdSymbolsInfo , CMD_SYMBOLS_2 }, - - {TEXT("SYM0" ) , CmdSymbolsInfo , CMD_SYMBOLS_ROM }, - {TEXT("SYM1" ) , CmdSymbolsInfo , CMD_SYMBOLS_APPLESOFT }, - {TEXT("SYM2" ) , CmdSymbolsInfo , CMD_SYMBOLS_ASSEMBLY }, - {TEXT("SYM3" ) , CmdSymbolsInfo , CMD_SYMBOLS_USER_1 }, - {TEXT("SYM4" ) , CmdSymbolsInfo , CMD_SYMBOLS_USER_2 }, - {TEXT("SYM5" ) , CmdSymbolsInfo , CMD_SYMBOLS_SRC_1 }, - {TEXT("SYM6" ) , CmdSymbolsInfo , CMD_SYMBOLS_SRC_2 }, - - {TEXT("TEXT40") , CmdViewOutput_Text4X , CMD_VIEW_TEXT4X }, - {TEXT("TEXT41") , CmdViewOutput_Text41 , CMD_VIEW_TEXT41 }, - {TEXT("TEXT42") , CmdViewOutput_Text42 , CMD_VIEW_TEXT42 }, - - {TEXT("WATCH") , CmdWatchAdd , CMD_WATCH_ADD }, - {TEXT("WINDOW") , CmdWindow , CMD_WINDOW }, -// {TEXT("W?") , CmdWatchAdd , CMD_WATCH_ADD }, - {TEXT("ZAP") , CmdNOP , CMD_NOP }, - - // DEPRECATED -- Probably should be removed in a future version - {TEXT("BENCH") , CmdBenchmarkStart , CMD_BENCHMARK }, - {TEXT("EXITBENCH") , CmdBenchmarkStop , CMD_BENCHMARK }, - {TEXT("MDB") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // MemoryDumpByte // Did anyone actually use this?? - {TEXT("MEMORY") , CmdMemoryMiniDumpHex , CMD_MEM_MINI_DUMP_HEX_1 }, // MemoryDumpByte // Did anyone actually use this?? -}; - // static const char g_aFlagNames[_6502_NUM_FLAGS+1] = TEXT("CZIDBRVN");// Reversed since arrays are from left-to-right - const int NUM_COMMANDS_WITH_ALIASES = sizeof(g_aCommands) / sizeof (Command_t); // Determined at compile-time ;-) - - // Cursor (Console Input) _____________________________________________________ @@ -549,120 +208,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA MemorySearchResults_t g_vMemorySearchResults; -// Parameters _____________________________________________________________________________________ - - // NOTE: Order MUST match Parameters_e[] !!! - Command_t g_aParameters[] = - { -// Breakpoint - {TEXT("<=") , NULL, PARAM_BP_LESS_EQUAL }, - {TEXT("<" ) , NULL, PARAM_BP_LESS_THAN }, - {TEXT("=" ) , NULL, PARAM_BP_EQUAL }, - {TEXT("!=") , NULL, PARAM_BP_NOT_EQUAL }, - {TEXT("!" ) , NULL, PARAM_BP_NOT_EQUAL_1 }, - {TEXT(">" ) , NULL, PARAM_BP_GREATER_THAN }, - {TEXT(">=") , NULL, PARAM_BP_GREATER_EQUAL }, - {TEXT("R") , NULL, PARAM_BP_READ }, - {TEXT("?") , NULL, PARAM_BP_READ }, - {TEXT("W") , NULL, PARAM_BP_WRITE }, - {TEXT("@") , NULL, PARAM_BP_WRITE }, - {TEXT("*") , NULL, PARAM_BP_READ_WRITE }, -// Regs (for PUSH / POP) - {TEXT("A") , NULL, PARAM_REG_A }, - {TEXT("X") , NULL, PARAM_REG_X }, - {TEXT("Y") , NULL, PARAM_REG_Y }, - {TEXT("PC") , NULL, PARAM_REG_PC }, - {TEXT("S") , NULL, PARAM_REG_SP }, -// Flags - {TEXT("P") , NULL, PARAM_FLAGS }, - {TEXT("C") , NULL, PARAM_FLAG_C }, // ---- ---1 Carry - {TEXT("Z") , NULL, PARAM_FLAG_Z }, // ---- --1- Zero - {TEXT("I") , NULL, PARAM_FLAG_I }, // ---- -1-- Interrupt - {TEXT("D") , NULL, PARAM_FLAG_D }, // ---- 1--- Decimal - {TEXT("B") , NULL, PARAM_FLAG_B }, // ---1 ---- Break - {TEXT("R") , NULL, PARAM_FLAG_R }, // --1- ---- Reserved - {TEXT("V") , NULL, PARAM_FLAG_V }, // -1-- ---- Overflow - {TEXT("N") , NULL, PARAM_FLAG_N }, // 1--- ---- Sign -// Disasm - {TEXT("BRANCH") , NULL, PARAM_CONFIG_BRANCH }, - {TEXT("COLON") , NULL, PARAM_CONFIG_COLON }, - {TEXT("OPCODE") , NULL, PARAM_CONFIG_OPCODE }, - {TEXT("POINTER") , NULL, PARAM_CONFIG_POINTER }, - {TEXT("SPACES") , NULL, PARAM_CONFIG_SPACES }, - {TEXT("TARGET") , NULL, PARAM_CONFIG_TARGET }, -// Disk - {TEXT("EJECT") , NULL, PARAM_DISK_EJECT }, - {TEXT("PROTECT") , NULL, PARAM_DISK_PROTECT }, - {TEXT("READ") , NULL, PARAM_DISK_READ }, -// Font (Config) - {TEXT("MODE") , NULL, PARAM_FONT_MODE }, // also INFO, CONSOLE, DISASM (from Window) -// General - {TEXT("FIND") , NULL, PARAM_FIND }, - {TEXT("BRANCH") , NULL, PARAM_BRANCH }, - {"CATEGORY" , NULL, PARAM_CATEGORY }, - {TEXT("CLEAR") , NULL, PARAM_CLEAR }, - {TEXT("LOAD") , NULL, PARAM_LOAD }, - {TEXT("LIST") , NULL, PARAM_LIST }, - {TEXT("OFF") , NULL, PARAM_OFF }, - {TEXT("ON") , NULL, PARAM_ON }, - {TEXT("RESET") , NULL, PARAM_RESET }, - {TEXT("SAVE") , NULL, PARAM_SAVE }, - {TEXT("START") , NULL, PARAM_START }, // benchmark - {TEXT("STOP") , NULL, PARAM_STOP }, // benchmark -// Help Categories - {"*" , NULL, PARAM_WILDSTAR }, - {"BOOKMARKS" , NULL, PARAM_CAT_BOOKMARKS }, - {"BREAKPOINTS" , NULL, PARAM_CAT_BREAKPOINTS }, - {"CONFIG" , NULL, PARAM_CAT_CONFIG }, - {"CPU" , NULL, PARAM_CAT_CPU }, -// {TEXT("EXPRESSION") , - {"FLAGS" , NULL, PARAM_CAT_FLAGS }, - {"HELP" , NULL, PARAM_CAT_HELP }, - {"KEYBOARD" , NULL, PARAM_CAT_KEYBOARD }, - {"MEMORY" , NULL, PARAM_CAT_MEMORY }, // alias // SOURCE [SYMBOLS] [MEMORY] filename - {"OUTPUT" , NULL, PARAM_CAT_OUTPUT }, - {"OPERATORS" , NULL, PARAM_CAT_OPERATORS }, - {"RANGE" , NULL, PARAM_CAT_RANGE }, -// {TEXT("REGISTERS") , NULL, PARAM_CAT_REGISTERS }, - {"SYMBOLS" , NULL, PARAM_CAT_SYMBOLS }, - {"VIEW" , NULL, PARAM_CAT_VIEW }, - {"WATCHES" , NULL, PARAM_CAT_WATCHES }, - {"WINDOW" , NULL, PARAM_CAT_WINDOW }, - {"ZEROPAGE" , NULL, PARAM_CAT_ZEROPAGE }, -// Memory - {TEXT("?") , NULL, PARAM_MEM_SEARCH_WILD }, -// {TEXT("*") , NULL, PARAM_MEM_SEARCH_BYTE }, -// Source level debugging - {TEXT("MEM") , NULL, PARAM_SRC_MEMORY }, - {TEXT("MEMORY") , NULL, PARAM_SRC_MEMORY }, - {TEXT("SYM") , NULL, PARAM_SRC_SYMBOLS }, - {TEXT("SYMBOLS") , NULL, PARAM_SRC_SYMBOLS }, - {TEXT("MERLIN") , NULL, PARAM_SRC_MERLIN }, - {TEXT("ORCA") , NULL, PARAM_SRC_ORCA }, -// View -// {TEXT("VIEW") , NULL, PARAM_SRC_??? }, -// Window Win Cmd WinEffects CmdEffects - {TEXT("CODE") , NULL, PARAM_CODE }, // x x code win only switch to code window -// {TEXT("CODE1") , NULL, PARAM_CODE_1 }, // - x code/data win - {TEXT("CODE2") , NULL, PARAM_CODE_2 }, // - x code/data win - {TEXT("CONSOLE") , NULL, PARAM_CONSOLE }, // x - switch to console window - {TEXT("DATA") , NULL, PARAM_DATA }, // x x data win only switch to data window -// {TEXT("DATA1") , NULL, PARAM_DATA_1 }, // - x code/data win - {TEXT("DATA2") , NULL, PARAM_DATA_2 }, // - x code/data win - {TEXT("DISASM") , NULL, PARAM_DISASM }, // - {TEXT("INFO") , NULL, PARAM_INFO }, // - x code/data Toggles showing/hiding Regs/Stack/BP/Watches/ZP - {TEXT("SOURCE") , NULL, PARAM_SOURCE }, // x x switch to source window - {TEXT("SRC") , NULL, PARAM_SOURCE }, // alias -// {TEXT("SOURCE_1") , NULL, PARAM_SOURCE_1 }, // - x code/data - {TEXT("SOURCE2 ") , NULL, PARAM_SOURCE_2 }, // - x - {TEXT("SYMBOLS") , NULL, PARAM_SYMBOLS }, // x x code/data win switch to symbols window - {TEXT("SYM") , NULL, PARAM_SYMBOLS }, // alias x SOURCE [SYM] [MEM] filename -// {TEXT("SYMBOL1") , NULL, PARAM_SYMBOL_1 }, // - x code/data win - {TEXT("SYMBOL2") , NULL, PARAM_SYMBOL_2 }, // - x code/data win -// Internal Consistency Check - { TEXT( __PARAMS_VERIFY_TXT__), NULL, NUM_PARAMS }, - }; - // Profile const int NUM_PROFILE_LINES = NUM_OPCODES + NUM_OPMODES + 16; @@ -681,6 +226,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA char * ProfileLinePush (); void ProfileLineReset (); +// Soft-switches __________________________________________________________________________________ + // Source Level Debugging _________________________________________________________________________ bool g_bSourceLevelDebugging = false; @@ -8045,29 +7592,7 @@ void DebugInitialize () // ConsoleInputReset(); already called in DebugInitialize() TCHAR sText[ CONSOLE_WIDTH ]; - for (int iCmd = 0; iCmd < NUM_COMMANDS; iCmd++ ) - { - if ( g_aCommands[ iCmd ].iCommand != iCmd) - { - wsprintf( sText, "*** ERROR *** Enumarted Commands mis-matched!" ); - MessageBox( g_hFrameWindow, sText, TEXT("ERROR"), MB_OK ); - PostQuitMessage( 1 ); - } - } - - if (_tcscmp( g_aCommands[ NUM_COMMANDS ].m_sName, TEXT(__COMMANDS_VERIFY_TXT__))) - { - wsprintf( sText, "*** ERROR *** Commands mis-matched!" ); - MessageBox( g_hFrameWindow, sText, TEXT("ERROR"), MB_OK ); - PostQuitMessage( 1 ); - } - - if (_tcscmp( g_aParameters[ NUM_PARAMS ].m_sName, TEXT(__PARAMS_VERIFY_TXT__))) - { - wsprintf( sText, "*** ERROR *** Parameters mis-matched!" ); - MessageBox( g_hFrameWindow, sText, TEXT("ERROR"), MB_OK ); - PostQuitMessage( 2 ); - } + VerifyDebuggerCommandTable(); // Check all summary help to see if it fits within the console for (int iCmd = 0; iCmd < NUM_COMMANDS; iCmd++ ) diff --git a/source/Debugger/Debug.h b/source/Debugger/Debug.h index 037dafa7..f2218269 100644 --- a/source/Debugger/Debug.h +++ b/source/Debugger/Debug.h @@ -42,6 +42,8 @@ using namespace std; extern bool g_bDebugDelayBreakCheck; // Commands + void VerifyDebuggerCommandTable(); + extern const int NUM_COMMANDS_WITH_ALIASES; // = sizeof(g_aCommands) / sizeof (Command_t); // Determined at compile-time ;-) extern int g_iCommand; // last command diff --git a/source/Debugger/Debugger_Console.h b/source/Debugger/Debugger_Console.h index d4be3695..9d6fa9f2 100644 --- a/source/Debugger/Debugger_Console.h +++ b/source/Debugger/Debugger_Console.h @@ -3,12 +3,16 @@ enum { - CONSOLE_HEIGHT = 512, // Lines, was 128, but need ~ 256+16 for PROFILE LIST + // Basic Symbol table has > 600 symbols + // Lines, was 128, but need ~ 256+16 for PROFILE LIST + // Output + CONSOLE_HEIGHT = 768, CONSOLE_WIDTH = 80, // need min 256+ lines for "profile list" CONSOLE_BUFFER_HEIGHT = CONSOLE_HEIGHT, + // Input HISTORY_HEIGHT = 128, HISTORY_WIDTH = 128, diff --git a/source/Debugger/Debugger_Symbols.cpp b/source/Debugger/Debugger_Symbols.cpp index 6111f32c..0d7d2c91 100644 --- a/source/Debugger/Debugger_Symbols.cpp +++ b/source/Debugger/Debugger_Symbols.cpp @@ -33,43 +33,41 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // 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 + // See: CmdSymbolsListTable(), g_bDisplaySymbolTables + int g_bDisplaySymbolTables = ((1 << NUM_SYMBOL_TABLES) - 1) & (~(int)SYMBOL_TABLE_PRODOS);// default to all symbol tables displayed/active // Symbols ________________________________________________________________________________________ char* g_sFileNameSymbols[ NUM_SYMBOL_TABLES ] = { - "APPLE2E.SYM", - "A2_BASIC.SYM", - "A2_ASM.SYM", - "A2_USER1.SYM", - "A2_USER2.SYM", - "A2_SRC1.SYM", - "A2_SRC2.SYM" + "APPLE2E.SYM" + ,"A2_BASIC.SYM" + ,"A2_ASM.SYM" + ,"A2_USER1.SYM" // "A2_USER.SYM", + ,"A2_USER2.SYM" + ,"A2_SRC1.SYM" // "A2_SRC.SYM", + ,"A2_SRC2.SYM" + ,"A2_DOS33.SYM" + ,"A2_PRODOS.SYM" }; char g_sFileNameSymbolsUser [ MAX_PATH ] = ""; char * g_aSymbolTableNames[ NUM_SYMBOL_TABLES ] = { - "Main", - "Basic", - "Assembly", - "User1", - "User2", - "Src1", - "Src2" + "Main" + ,"Basic" + ,"Asm" // "Assembly", + ,"User1" // User + ,"User2" + ,"Src1" + ,"Src2" + ,"DOS33" + ,"ProDOS" }; bool g_bSymbolsDisplayMissingFile = true; SymbolTable_t g_aSymbols[ NUM_SYMBOL_TABLES ]; int g_nSymbolsLoaded = 0; // on Last Load - bool g_aConfigSymbolsDisplayed[ NUM_SYMBOL_TABLES ] = - { - true, - true, - true - }; - // Utils _ ________________________________________________________________________________________ @@ -258,18 +256,18 @@ void _CmdSymbolsInfoHeader( int iTable, char * pText, int nDisplaySize /* = 0 */ // // 2.6.2.19 Color for name of symbol table: _CmdPrintSymbol() "SYM HOME" _CmdSymbolsInfoHeader "SYM" // CHC_STRING and CHC_NUM_DEC are both cyan, using CHC_USAGE instead of CHC_STRING - sprintf( pText, " %s%s%s: %s%d%s" + sprintf( pText, "%s%s%s:%s%d " // %s" , CHC_USAGE, g_aSymbolTableNames[ iTable ] , CHC_ARG_SEP , bActive ? CHC_NUM_DEC : CHC_WARNING, nSymbols - , CHC_DEFAULT +// , CHC_DEFAULT ); } //=========================================================================== Update_t CmdSymbolsInfo (int nArgs) { - char sText[ CONSOLE_WIDTH * 4 ] = ""; + char sText[ CONSOLE_WIDTH * 4 ] = " "; char sTemp[ CONSOLE_WIDTH * 2 ] = ""; int bDisplaySymbolTables = 0; @@ -295,12 +293,13 @@ Update_t CmdSymbolsInfo (int nArgs) } //sprintf( sText, " Symbols Main: %s%d%s User: %s%d%s Source: %s%d%s" + // "Main:# Basic:# Asm:# User1:# User2:# Src1:# Src2:# Dos:# Prodos:# int bTable = 1; int iTable = 0; for( ; bTable <= bDisplaySymbolTables; iTable++, bTable <<= 1 ) { if( bDisplaySymbolTables & bTable ) { - _CmdSymbolsInfoHeader( iTable, sTemp ); + _CmdSymbolsInfoHeader( iTable, sTemp ); // 15 chars per table strcat( sText, sTemp ); } } diff --git a/source/Debugger/Debugger_Types.h b/source/Debugger/Debugger_Types.h index 127644f4..6b1434ac 100644 --- a/source/Debugger/Debugger_Types.h +++ b/source/Debugger/Debugger_Types.h @@ -459,6 +459,8 @@ , CMD_SYMBOLS_USER_2 , CMD_SYMBOLS_SRC_1 , CMD_SYMBOLS_SRC_2 + , CMD_SYMBOLS_DOS33 + , CMD_SYMBOLS_PRODOS // , CMD_SYMBOLS_FIND // , CMD_SYMBOLS_CLEAR , CMD_SYMBOLS_INFO @@ -1418,7 +1420,7 @@ const DisasmData_t* pDisasmData; // Symbols ________________________________________________________________________________________ // **************************************** - // WARNING: This is the index (enumeration) to select which table + // Note: This is the index (enumeration) to select which table // See: g_aSymbols[] // **************************************** enum SymbolTable_Index_e // Symbols_e -> SymbolTable_Index_e @@ -1430,12 +1432,14 @@ const DisasmData_t* pDisasmData; SYMBOLS_USER_2, SYMBOLS_SRC_1, SYMBOLS_SRC_2, + SYMBOLS_DOS33, + SYMBOLS_PRODOS, NUM_SYMBOL_TABLES }; // **************************************** - // WARNING: This is the bit-flags to select which table. - // See: CmdSymbolsListTable() + // Note: This is the bit-flags to select which table. + // See: CmdSymbolsListTable(), g_bDisplaySymbolTables // **************************************** enum SymbolTable_Masks_e // SymbolTable_e -> { @@ -1446,6 +1450,8 @@ const DisasmData_t* pDisasmData; SYMBOL_TABLE_USER_2 = (1 << 4), SYMBOL_TABLE_SRC_1 = (1 << 5), SYMBOL_TABLE_SRC_2 = (1 << 6), + SYMBOL_TABLE_DOS33 = (1 << 7), + SYMBOL_TABLE_PRODOS = (1 << 8), }; typedef map SymbolTable_t;