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

Moved Text Hex Testing/Conversion code to Debugger_Parser

This commit is contained in:
mpohoreski 2006-02-28 16:37:25 +00:00
parent 9812789706
commit d1c9e8a9a6
1 changed files with 10 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
AppleWin/source/Debug.cpp
View File

@ -785,9 +785,6 @@ static bool ParseAssemblyListing ( bool bBytesToMemory, bool bAddSymbols );
Update_t _CmdWindowViewCommon (int iNewWindow);
// Utility
BYTE Chars2ToByte( char *pText );
bool IsHexString( LPCSTR pText );
bool StringCat( TCHAR * pDst, LPCSTR pSrc, const int nDstSize );
bool TestStringCat ( TCHAR * pDst, LPCSTR pSrc, const int nDstSize );
bool TryStringCat ( TCHAR * pDst, LPCSTR pSrc, const int nDstSize );
@ -830,37 +827,6 @@ LPCTSTR FormatAddress( WORD nAddress, int nBytes )
}
//===========================================================================
inline
BYTE Chars2ToByte ( char *pText )
{
BYTE n = ((pText[0] <= '@') ? (pText[0] - '0') : (pText[0] - 'A' + 10)) << 4;
n += ((pText[1] <= '@') ? (pText[1] - '0') : (pText[1] - 'A' + 10)) << 0;
return n;
}
//===========================================================================
inline
bool IsHexString ( LPCSTR pText )
{
// static const TCHAR sHex[] = "0123456789ABCDEF";
while (*pText)
{
if (*pText < TEXT('0'))
return false;
if (*pText > TEXT('f'))
return false;
if ((*pText > TEXT('9')) && (*pText < TEXT('A')) ||
((*pText > TEXT('F') && (*pText < TEXT('a')))))
return false;
pText++;
}
return true;
}
// Breakpoints ____________________________________________________________________________________
@ -3727,7 +3693,8 @@ bool ParseAssemblyListing( bool bBytesToMemory, bool bAddSymbols )
{
char *pEnd = p + 1;
char *pStart;
for (int iByte = 0; iByte < 3; iByte++ )
int iByte;
for (iByte = 0; iByte < 4; iByte++ ) // BUG: Some assemblers also put 4 bytes on a line
{
// xx xx xx
// ^ ^
@ -3742,8 +3709,11 @@ bool ParseAssemblyListing( bool bBytesToMemory, bool bAddSymbols )
break;
}
*pEnd = 0;
BYTE nByte = Chars2ToByte( pStart );
*(mem + ((WORD)nAddress) + iByte ) = nByte;
if (TextIsHexByte( pStart ))
{
BYTE nByte = TextConvert2CharsToByte( pStart );
*(mem + ((WORD)nAddress) + iByte ) = nByte;
}
}
g_nSourceAssembleBytes += iByte;
}
@ -4091,7 +4061,7 @@ bool String2Address( LPCTSTR pText, WORD & nAddress_ )
if (pText[0] == TEXT('$'))
{
if (!IsHexString( pText+1))
if (!TextIsHexString( pText+1))
return false;
_tcscpy( sHexApple, TEXT("0x") );
@ -4103,14 +4073,14 @@ bool String2Address( LPCTSTR pText, WORD & nAddress_ )
{
if ((pText[1] == TEXT('X')) || pText[1] == TEXT('x'))
{
if (!IsHexString( pText+2))
if (!TextIsHexString( pText+2))
return false;
TCHAR *pEnd;
nAddress_ = (WORD) _tcstol( pText, &pEnd, 16 );
return true;
}
if (IsHexString( pText ))
if (TextIsHexString( pText ))
{
TCHAR *pEnd;
nAddress_ = (WORD) _tcstol( pText, &pEnd, 16 );