Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added: MemorySearchHex, SH

This commit is contained in:
mpohoreski 2006-02-26 10:28:18 +00:00
parent 968725df29
commit 52fe792f33
3 changed files with 241 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

275
AppleWin/source/Debug.cpp
View File

@ -43,8 +43,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// TODO: COLOR LOAD ["filename"]
// TCHAR DEBUG_VERSION = "0.0.0.0"; // App Version
const int DEBUGGER_VERSION = MAKE_VERSION(2,5,0,0);
const int DEBUGGER_VERSION = MAKE_VERSION(2,5,0,1);
// .1 SH Address,Len Byte [Byte ..]
// 2.5 split Debugger files
// .21 Changed: Branch indicator now a little bigger +3 in DebugInitialize() (easier to read), indented ^,V to make the < stand out
@ -808,6 +809,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{TEXT("WATCHES") , NULL, PARAM_CAT_WATCHES },
{TEXT("WINDOW") , NULL, PARAM_CAT_WINDOW },
{TEXT("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 },
@ -3482,8 +3486,8 @@ Update_t CmdMemoryMove (int nArgs)
//===========================================================================
Update_t CmdMemorySearch (int nArgs)
{
if (nArgs < 3)
Help_Arg_1( CMD_MEMORY_SEARCH );
if (nArgs < 2)
return Help_Arg_1( CMD_MEMORY_SEARCH );
if (g_aArgs[2].sArg[0] == TEXT('\"'))
CmdMemorySearchText( nArgs );
@ -3509,20 +3513,219 @@ Update_t CmdMemorySearchLowBit (int nArgs)
//===========================================================================
bool _GetStartEnd( WORD & nAddressStart_, WORD & nAddressEnd_ )
{
nAddressStart_ = g_aArgs[1].nVal1 ? g_aArgs[1].nVal1 : GetAddressFromSymbol( g_aArgs[1].sArg );
nAddressEnd_ = g_aArgs[2].nVal1 ? g_aArgs[2].nVal1 : GetAddressFromSymbol( g_aArgs[2].sArg );
nAddressStart_ = g_aArgs[1].nVal1;
nAddressEnd_ = nAddressStart_ + g_aArgs[1].nVal2;
return true;
}
//===========================================================================
Update_t CmdMemorySearchHex (int nArgs)
{
WORD nAddrStart;
WORD nAddrEnd;
_GetStartEnd( nAddrStart, nAddrEnd );
// TODO: if (!_tcscmp(g_aArgs[nArgs].sArg,TEXT("*"))) { }
// TODO: if (!_tcscmp(g_aArgs[nArgs].sArg,TEXT("?"))) { }
if (nArgs < 2)
return HelpLastCommand();
WORD nAddressStart;
WORD nAddressEnd;
_GetStartEnd( nAddressStart, nAddressEnd );
// S start,len #
int nMinLen = nArgs - 2;
bool bHaveWildCards = false;
int iArg;
vector<MemorySearch_t> vMemorySearch;
MemorySearch_e tLastType = MEM_SEARCH_BYTE_N_WILD;
vector<int> vMatches;
// Get search "string"
Arg_t *pArg = & g_aArgs[ 2 ];
WORD nTarget;
for (iArg = 2; iArg <= nArgs; iArg++, pArg++ )
{
MemorySearch_t ms;
nTarget = pArg->nVal1;
ms.m_nValue = nTarget & 0xFF;
ms.m_iType = MEM_SEARCH_BYTE_EXACT;
if (nTarget > 0xFF) // searching for 16-bit address
{
vMemorySearch.push_back( ms );
ms.m_nValue = (nTarget >> 8);
tLastType = ms.m_iType;
}
else
{
TCHAR *pByte = pArg->sArg;
if (pArg->nArgLen > 2)
goto _Help;
if (pArg->nArgLen == 1)
{
if (pByte[0] == g_aParameters[ PARAM_MEM_SEARCH_WILD ].m_sName[0])
{
ms.m_iType = MEM_SEARCH_BYTE_1_WILD;
}
}
else
{
if (pByte[0] == g_aParameters[ PARAM_MEM_SEARCH_WILD ].m_sName[0])
{
ms.m_iType = MEM_SEARCH_NIB_LOW_EXACT;
ms.m_nValue = pArg->nVal1 & 0x0F;
}
if (pByte[1] == g_aParameters[ PARAM_MEM_SEARCH_WILD ].m_sName[0])
{
if (ms.m_iType == MEM_SEARCH_NIB_LOW_EXACT)
{
ms.m_iType = MEM_SEARCH_BYTE_N_WILD;
}
else
{
ms.m_iType = MEM_SEARCH_NIB_HIGH_EXACT;
ms.m_nValue = (pArg->nVal1 << 4) & 0xF0;
}
}
}
}
// skip over multiple byte_wild, since they are redundent
// xx ?? ?? xx
// ^
// redundant
if ((tLastType == MEM_SEARCH_BYTE_N_WILD) && (ms.m_iType == MEM_SEARCH_BYTE_N_WILD))
continue;
vMemorySearch.push_back( ms );
tLastType = ms.m_iType;
}
TCHAR sMatches[ CONSOLE_WIDTH ] = TEXT("");
int nMatches = 0; // string length, for word-wrap
int nFound = 0;
WORD nAddress;
for( nAddress = nAddressStart; nAddress < nAddressEnd; nAddress++ )
{
bool bMatchAll = true;
WORD nAddress2 = nAddress;
int nMemBlocks = vMemorySearch.size();
for (int iBlock = 0; iBlock < nMemBlocks; iBlock++, nAddress2++ )
{
MemorySearch_t ms = vMemorySearch.at( iBlock );
ms.m_bFound = false;
if ((ms.m_iType == MEM_SEARCH_BYTE_EXACT ) ||
(ms.m_iType == MEM_SEARCH_NIB_HIGH_EXACT) ||
(ms.m_iType == MEM_SEARCH_NIB_LOW_EXACT ))
{
BYTE nTarget = *(mem + nAddress2);
if (ms.m_iType == MEM_SEARCH_NIB_LOW_EXACT)
nTarget &= 0x0F;
if (ms.m_iType == MEM_SEARCH_NIB_HIGH_EXACT)
nTarget &= 0xF0;
if (ms.m_nValue == nTarget)
{ // ms.m_nAddress = nAddress2;
ms.m_bFound = true;
continue;
}
else
{
bMatchAll = false;
break;
}
}
else
if (ms.m_iType == MEM_SEARCH_BYTE_1_WILD)
{
// match by definition
}
else
{
// start 2ndary search
// if next block matches, then this block matches (since we are wild)
if ((iBlock + 1) == nMemBlocks) // there is no next block, hence we match
continue;
MemorySearch_t ms2 = vMemorySearch.at( iBlock + 1 );
WORD nAddress3 = nAddress2;
for (nAddress3 = nAddress2; nAddress3 < nAddressEnd; nAddress3++ )
{
if ((ms.m_iType == MEM_SEARCH_BYTE_EXACT ) ||
(ms.m_iType == MEM_SEARCH_NIB_HIGH_EXACT) ||
(ms.m_iType == MEM_SEARCH_NIB_LOW_EXACT ))
{
BYTE nTarget = *(mem + nAddress3);
if (ms.m_iType == MEM_SEARCH_NIB_LOW_EXACT)
nTarget &= 0x0F;
if (ms.m_iType == MEM_SEARCH_NIB_HIGH_EXACT)
nTarget &= 0xF0;
if (ms.m_nValue == nTarget)
{
nAddress2 = nAddress3;
continue;
}
else
{
bMatchAll = false;
break;
}
}
}
}
}
if (bMatchAll)
{
nFound++;
TCHAR sText[ CONSOLE_WIDTH ];
wsprintf( sText, "%2d:$%04X ", nFound, nAddress );
int nLen = _tcslen( sText );
// Fit on same line?
if ((nMatches + nLen) > (g_nConsoleDisplayWidth)) // CONSOLE_WIDTH
{
ConsoleDisplayPush( sMatches );
_tcscpy( sMatches, sText );
nMatches = nLen;
}
else
{
_tcscat( sMatches, sText );
nMatches += nLen;
}
}
}
ConsoleDisplayPush( sMatches );
wsprintf( sMatches, "Total: %d (#$%04X)", nFound, nFound );
ConsoleDisplayPush( sMatches );
vMemorySearch.erase( vMemorySearch.begin(), vMemorySearch.end() );
return UPDATE_CONSOLE_DISPLAY;
_Help:
vMemorySearch.erase( vMemorySearch.begin(), vMemorySearch.end() );
return HelpLastCommand();
}
//===========================================================================
@ -4723,58 +4926,6 @@ Update_t CmdTraceLine (int nArgs)
}
// Variables ______________________________________________________________________________________
//===========================================================================
Update_t CmdVarsClear (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsDefine (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsDefineInt8 (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsDefineInt16 (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsList (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsLoad (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsSave (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
//===========================================================================
Update_t CmdVarsSet (int nArgs)
{
return UPDATE_CONSOLE_DISPLAY;
}
// Watches ________________________________________________________________________________________
//===========================================================================

3
AppleWin/source/Debugger_Parser.cpp
View File

@ -65,11 +65,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
{ TOKEN_PERCENT , TYPE_OPERATOR, TEXT('%') }, // mod
{ TOKEN_PIPE , TYPE_OPERATOR, TEXT('|') }, // bit-or
{ TOKEN_PLUS , TYPE_OPERATOR, TEXT('+') }, // add
// { TOKEN_QUESTION , TYPE_OPERATOR, TEXT('?') }, // Not a token 1) wildcard needs to stay together with other chars
{ TOKEN_QUOTED , TYPE_QUOTED , TEXT('"') },
{ TOKEN_RIGHT_PAREN , TYPE_OPERATOR, TEXT(')') },
{ TOKEN_SEMI , TYPE_STRING , TEXT(';') },
{ TOKEN_SPACE , TYPE_STRING , TEXT(' ') } // space is also a delimiter between tokens/args
// { TOKEN_STAR , TYPE_OPERATOR, TEXT('*') },
// { TOKEN_STAR , TYPE_OPERATOR, TEXT('*') }, // Not a token 1) wildcard needs to stay together with other chars
// { TOKEN_TAB , TYPE_STRING , TEXT('\t') }
// { TOKEN_TILDE , TYPE_OPERATOR, TEXT('~') }, // C/C++: Not. Used for console.
};

46
AppleWin/source/Debugger_Types.h
View File

@ -531,15 +531,6 @@
// , CMD_SYMBOLS_LOAD_1
// , CMD_SYMBOLS_LOAD_2
// , CMD_SYMBOLS_SAVE
// Variables
// , CMD_VARIABLES_CLEAR
// , CMD_VARIABLES_DEFINE
// , CMD_VARIABLES_DEFINE_INT8
// , CMD_VARIABLES_DEFINE_INT16
// , CMD_VARIABLES_LIST
// , CMD_VARIABLES_LOAD
// , CMD_VARIABLES_SAVE
// , CMD_VARIABLES_SET
// Watch
, CMD_WATCH_ADD
, CMD_WATCH_CLEAR
@ -711,16 +702,6 @@
Update_t CmdSymbolsUser (int nArgs);
Update_t CmdSymbolsSave (int nArgs);
Update_t CmdSymbolsSource (int nArgs);
// Vars
// Update_t CmdVarsAdd (int nArgs);
Update_t CmdVarsClear (int nArgs);
Update_t CmdVarsDefine (int nArgs);
Update_t CmdVarsDefineInt8 (int nArgs);
Update_t CmdVarsDefineInt16 (int nArgs);
Update_t CmdVarsList (int nArgs);
Update_t CmdVarsLoad (int nArgs);
Update_t CmdVarsSave (int nArgs);
Update_t CmdVarsSet (int nArgs);
// Watch
Update_t CmdWatchAdd (int nArgs);
Update_t CmdWatchClear (int nArgs);
@ -993,6 +974,25 @@
NUM_MEM_MINI_DUMPS = 2
};
enum MemorySearch_e
{
MEM_SEARCH_BYTE_EXACT , // xx
MEM_SEARCH_NIB_LOW_EXACT , // ?x
MEM_SEARCH_NIB_HIGH_EXACT, // x?
MEM_SEARCH_BYTE_1_WILD , // ?
MEM_SEARCH_BYTE_N_WILD , // ??
MEM_SEARCH_TYPE_MASK = (1 << 16) - 1,
MEM_SEARCH_FOUND = (1 << 16)
};
struct MemorySearch_t
{
BYTE m_nValue;
MemorySearch_e m_iType;
bool m_bFound;
};
// Parameters _____________________________________________________________________________________
/* i.e.
@ -1156,7 +1156,13 @@
, _PARAM_HELPCATEGORIES_END
, PARAM_HELPCATEGORIES_NUM = _PARAM_HELPCATEGORIES_END - _PARAM_HELPCATEGORIES_BEGIN
, _PARAM_SOURCE_BEGIN = _PARAM_HELPCATEGORIES_END // Daisy Chain
, _PARAM_MEM_SEARCH_BEGIN = _PARAM_HELPCATEGORIES_END // Daisy Chain
, PARAM_MEM_SEARCH_WILD = _PARAM_MEM_SEARCH_BEGIN
// , PARAM_MEM_SEARCH_BYTE
, _PARAM_MEM_SEARCH_END
, PARAM_MEM_SEARCH_NUM = _PARAM_MEM_SEARCH_END - _PARAM_MEM_SEARCH_BEGIN
, _PARAM_SOURCE_BEGIN = _PARAM_MEM_SEARCH_END // Daisy Chain
, PARAM_SRC_MEMORY = _PARAM_SOURCE_BEGIN
,_PARAM_SRC_MEMORY // alias MEM = MEMORY
, PARAM_SRC_SYMBOLS