empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DEBUGGER: Cleanup error message for invalid symbol table for: syminfo

Browse source 
(cherry picked from commit ca5002dfa3807f6b5fea33c14bd6ee5c9c879456)
This commit is contained in:
michaelangel007 2014-11-27 10:01:43 -08:00
parent 0910f05817
commit 763b8172f0
3 changed files with 54 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/Debugger_Changelog.txt
View file

@ -2,6 +2,7 @@
.1 Fixe: Symbolic Targets > 20 chars no longer overflow into register window
2.8.0.2 Cleaned up error message for syminfo on invalid symbol table.
2.8.0.0 Released with AppleWin 1.25
2.7.0.#

2
source/Debugger/Debug.cpp
View file

@ -47,7 +47,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,8,0,1);
const int DEBUGGER_VERSION = MAKE_VERSION(2,8,0,2);
// Public _________________________________________________________________________________________

66
source/Debugger/Debugger_Symbols.cpp
View file

@ -74,7 +74,54 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// Utils _ ________________________________________________________________________________________
void _CmdSymbolsInfoHeader( int iTable, char * pText, int nDisplaySize = 0 );
void _CmdSymbolsInfoHeader( int iTable, char * pText, int nDisplaySize = 0 );
void _PrintCurrentPath();
Update_t _PrintSymbolInvalidTable();
// Private ________________________________________________________________________________________
//===========================================================================
void _PrintCurrentPath()
{
ConsoleDisplayError( g_sProgramDir );
}
Update_t _PrintSymbolInvalidTable()
{
char sText[ CONSOLE_WIDTH * 2 ];
char sTemp[ CONSOLE_WIDTH * 2 ];
// TODO: display the user specified file name
ConsoleBufferPush( "Invalid symbol table." );
sprintf( sText, "Only %s%d%s symbol tables are supported:"
, CHC_NUM_DEC, NUM_SYMBOL_TABLES
, CHC_DEFAULT
);
ConsolePrint( sText );
// Similar to _CmdSymbolsInfoHeader()
sText[0] = 0;
for( int iTable = 0; iTable < NUM_SYMBOL_TABLES; iTable++ )
{
sprintf( sTemp, "%s%s%s%c " // %s"
, CHC_USAGE, g_aSymbolTableNames[ iTable ]
, CHC_ARG_SEP
, (iTable != (NUM_SYMBOL_TABLES-1))
? ','
: '.'
);
strcat( sText, sTemp );
}
// return ConsoleDisplayError( sText );
ConsolePrint( sText );
return ConsoleUpdate();
}
// Public _________________________________________________________________________________________
//===========================================================================
@ -284,11 +331,7 @@ Update_t CmdSymbolsInfo (int nArgs)
int iWhichTable = GetSymbolTableFromCommand();
if ((iWhichTable < 0) || (iWhichTable >= NUM_SYMBOL_TABLES))
{
sprintf( sText, "Only %s%d%s symbol tables supported!"
, CHC_NUM_DEC, NUM_SYMBOL_TABLES
, CHC_DEFAULT
);
return ConsoleDisplayError( sText );
return _PrintSymbolInvalidTable();
}
bDisplaySymbolTables = (1 << iWhichTable);
@ -514,11 +557,6 @@ Update_t _CmdSymbolsListTables (int nArgs, int bSymbolTables )
}
void Print_Current_Path()
{
ConsoleDisplayError( g_sProgramDir );
}
//===========================================================================
int ParseSymbolTable( TCHAR *pPathFileName, SymbolTable_Index_e eSymbolTableWrite, int nSymbolOffset )
{
@ -542,8 +580,9 @@ int ParseSymbolTable( TCHAR *pPathFileName, SymbolTable_Index_e eSymbolTableWrit
if( !hFile && g_bSymbolsDisplayMissingFile )
{
// TODO: print filename! Bug #242 Help file (.chm) description for "Symbols" #242
ConsoleDisplayError( "Symbol File not found:" );
Print_Current_Path();
_PrintCurrentPath();
nSymbolsLoaded = -1; // HACK: ERROR: FILE NOT EXIST
}
@ -650,8 +689,7 @@ Update_t CmdSymbolsLoad (int nArgs)
int iSymbolTable = GetSymbolTableFromCommand();
if ((iSymbolTable < 0) || (iSymbolTable >= NUM_SYMBOL_TABLES))
{
wsprintf( sFileName, "Only %d symbol tables supported!", NUM_SYMBOL_TABLES );
return ConsoleDisplayError( sFileName );
return _PrintSymbolInvalidTable();
}
int nSymbols = 0;