Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-05-28 17:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Move Util_* files into Debugger subfolder & update all vcproj files

Browse Source
This commit is contained in:
tomcw 2014-08-13 22:25:22 +01:00
parent 6ce0f6c77f
commit d21bb2cc3b
12 changed files with 22 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AppleWinExpress2012.vcxproj
View File

@ -91,7 +91,7 @@
<ClInclude Include="source\Tfe\Tfearch.h" /> <ClInclude Include="source\Tfe\Tfearch.h" />
<ClInclude Include="source\Tfe\Tfesupp.h" /> <ClInclude Include="source\Tfe\Tfesupp.h" />
<ClInclude Include="source\Tfe\Uilib.h" /> <ClInclude Include="source\Tfe\Uilib.h" />
<ClInclude Include="source\Util_MemoryTextFile.h" /> <ClInclude Include="source\Debugger\Util_MemoryTextFile.h" />
<ClInclude Include="source\Video.h" /> <ClInclude Include="source\Video.h" />
<ClInclude Include="source\z80emu.h" /> <ClInclude Include="source\z80emu.h" />
<ClInclude Include="source\Z80VICE\daa.h" /> <ClInclude Include="source\Z80VICE\daa.h" />
@ -184,7 +184,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="source\Util_MemoryTextFile.cpp" /> <ClCompile Include="source\Debugger\Util_MemoryTextFile.cpp" />
<ClCompile Include="source\Video.cpp" /> <ClCompile Include="source\Video.cpp" />
<ClCompile Include="source\z80emu.cpp" /> <ClCompile Include="source\z80emu.cpp" />
<ClCompile Include="source\Z80VICE\daa.cpp"> <ClCompile Include="source\Z80VICE\daa.cpp">

4
AppleWinExpress2012.vcxproj.filters
View File

@ -162,7 +162,7 @@
<ClInclude Include="source\Debugger\Debugger_Types.h"> <ClInclude Include="source\Debugger\Debugger_Types.h">
<Filter>Source Files\Debugger</Filter> <Filter>Source Files\Debugger</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="source\Util_MemoryTextFile.h"> <ClInclude Include="source\Debugger\Util_MemoryTextFile.h">
<Filter>Source Files\Debugger</Filter> <Filter>Source Files\Debugger</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="source\Disk.h"> <ClInclude Include="source\Disk.h">
@ -376,7 +376,7 @@
<ClCompile Include="source\Debugger\Debugger_Symbols.cpp"> <ClCompile Include="source\Debugger\Debugger_Symbols.cpp">
<Filter>Source Files\Debugger</Filter> <Filter>Source Files\Debugger</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="source\Util_MemoryTextFile.cpp"> <ClCompile Include="source\Debugger\Util_MemoryTextFile.cpp">
<Filter>Source Files\Debugger</Filter> <Filter>Source Files\Debugger</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="source\Disk.cpp"> <ClCompile Include="source\Disk.cpp">

4
ApplewinExpress10.00.vcxproj
View File

@ -271,7 +271,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release NoDX|Win32'">Create</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="source\Util_MemoryTextFile.cpp" /> <ClCompile Include="source\Debugger\Util_MemoryTextFile.cpp" />
<ClCompile Include="source\Tfe\Tfe.cpp"> <ClCompile Include="source\Tfe\Tfe.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader> </PrecompiledHeader>
@ -391,7 +391,7 @@
<ClInclude Include="source\Debugger\Debugger_Range.h" /> <ClInclude Include="source\Debugger\Debugger_Range.h" />
<ClInclude Include="source\Debugger\Debugger_Symbols.h" /> <ClInclude Include="source\Debugger\Debugger_Symbols.h" />
<ClInclude Include="source\Debugger\Debugger_Types.h" /> <ClInclude Include="source\Debugger\Debugger_Types.h" />
<ClInclude Include="source\Util_MemoryTextFile.h" /> <ClInclude Include="source\Debugger\Util_MemoryTextFile.h" />
<ClInclude Include="source\Tfe\Bittypes.h" /> <ClInclude Include="source\Tfe\Bittypes.h" />
<ClInclude Include="source\Tfe\Bpf.h" /> <ClInclude Include="source\Tfe\Bpf.h" />
<ClInclude Include="source\Tfe\Ip6_misc.h" /> <ClInclude Include="source\Tfe\Ip6_misc.h" />

4
ApplewinExpress10.00.vcxproj.filters
View File

@ -80,7 +80,7 @@
<ClCompile Include="source\Debugger\Debugger_Symbols.cpp"> <ClCompile Include="source\Debugger\Debugger_Symbols.cpp">
<Filter>Source\Debugger</Filter> <Filter>Source\Debugger</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="source\Util_MemoryTextFile.cpp"> <ClCompile Include="source\Debugger\Util_MemoryTextFile.cpp">
<Filter>Source\Debugger</Filter> <Filter>Source\Debugger</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="source\Tfe\Tfe.cpp"> <ClCompile Include="source\Tfe\Tfe.cpp">
@ -250,7 +250,7 @@
<ClInclude Include="source\Debugger\Debugger_Types.h"> <ClInclude Include="source\Debugger\Debugger_Types.h">
<Filter>Source\Debugger</Filter> <Filter>Source\Debugger</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="source\Util_MemoryTextFile.h"> <ClInclude Include="source\Debugger\Util_MemoryTextFile.h">
<Filter>Source\Debugger</Filter> <Filter>Source\Debugger</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="source\Tfe\Bittypes.h"> <ClInclude Include="source\Tfe\Bittypes.h">

4
ApplewinExpress2005.vcproj
View File

@ -401,11 +401,11 @@
> >
</File> </File>
<File <File
RelativePath=".\source\Util_MemoryTextFile.cpp" RelativePath=".\source\Debugger\Util_MemoryTextFile.cpp"
> >
</File> </File>
<File <File
RelativePath=".\source\Util_MemoryTextFile.h" RelativePath=".\source\Debugger\Util_MemoryTextFile.h"
> >
</File> </File>
<File <File

6
ApplewinExpress9.00.vcproj
View File

@ -347,15 +347,15 @@
> >
</File> </File>
<File <File
RelativePath=".\source\Util_MemoryTextFile.cpp" RelativePath=".\source\Debugger\Util_MemoryTextFile.cpp"
> >
</File> </File>
<File <File
RelativePath=".\source\Util_MemoryTextFile.h" RelativePath=".\source\Debugger\Util_MemoryTextFile.h"
> >
</File> </File>
<File <File
RelativePath=".\source\Util_Text.h" RelativePath=".\source\Debugger\Util_Text.h"
> >
</File> </File>
</Filter> </Filter>

2
source/Debugger/Debug.h
View File

@ -16,7 +16,7 @@ using namespace std;
#include "Debugger_Help.h" #include "Debugger_Help.h"
#include "Debugger_Display.h" #include "Debugger_Display.h"
#include "Debugger_Symbols.h" #include "Debugger_Symbols.h"
#include "..\Util_MemoryTextFile.h" #include "Util_MemoryTextFile.h"
// Globals __________________________________________________________________ // Globals __________________________________________________________________

152
source/Debugger/Debugger_Parser.cpp
View File

@ -958,155 +958,3 @@ int RemoveWhiteSpaceReverse ( TCHAR *pSrc )
} }
return nLen; return nLen;
} }
//===========================================================================
/*
inline
const TCHAR* SkipEOL ( const TCHAR *pSrc )
{
while (pSrc && ((*pSrc == CHAR_LF) || (*pSrc == CHAR_CR)))
{
pSrc++;
}
return pSrc;
}
*/
//===========================================================================
/*
inline
const TCHAR* SkipUntilChar ( const TCHAR *pSrc, const TCHAR nDelim )
{
while (pSrc && (*pSrc))
{
if (*pSrc == nDelim)
break;
pSrc++;
}
return pSrc;
}
*/
//===========================================================================
/*
inline
const TCHAR* SkipUntilEOL ( const TCHAR *pSrc )
{
while (pSrc && (*pSrc))
{
if ((*pSrc == CHAR_LF) || (*pSrc == CHAR_CR))
{
break;
}
pSrc++;
}
return pSrc;
}
*/
//===========================================================================
/*
inline
const TCHAR* SkipUntilTab ( const TCHAR *pSrc )
{
while (pSrc && (*pSrc))
{
if (*pSrc == CHAR_TAB)
{
break;
}
pSrc++;
}
return pSrc;
}
*/
//===========================================================================
/*
const TCHAR* SkipUntilToken ( const TCHAR *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e *pToken_ )
{
if ( pToken_)
*pToken_ = NO_TOKEN;
while (pSrc && (*pSrc))
{
// Common case is TOKEN_ALPHANUMERIC, so continue until we don't have one
if (ParserFindToken( pSrc, aTokens, pToken_ ))
return pSrc;
pSrc++;
}
return pSrc;
}
*/
//===========================================================================
/*
inline
const TCHAR* SkipUntilWhiteSpace ( const TCHAR *pSrc )
{
while (pSrc && (*pSrc))
{
if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB))
{
break;
}
pSrc++;
}
return pSrc;
}
*/
// @param pStart Start of line.
//===========================================================================
/*
inline
const TCHAR *SkipUntilWhiteSpaceReverse ( const TCHAR *pSrc, const TCHAR *pStart )
{
while (pSrc && (pSrc > pStart))
{
if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB))
{
break;
}
pSrc--;
}
return pSrc;
}
*/
//===========================================================================
/*
inline
const TCHAR* SkipWhiteSpace ( const TCHAR *pSrc )
{
while (pSrc && ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB)))
{
pSrc++;
}
return pSrc;
}
*/
// @param pStart Start of line.
//===========================================================================
/*
inline
const TCHAR *SkipWhiteSpaceReverse ( const TCHAR *pSrc, const TCHAR *pStart )
{
while (pSrc && ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB)) && (pSrc > pStart))
{
pSrc--;
}
return pSrc;
}
*/
// EOF

4
source/Debugger/Debugger_Parser.h
View File

@ -1,14 +1,14 @@
#ifndef DEBUGGER_PARSER_H #ifndef DEBUGGER_PARSER_H
#define DEBUGGER_PARSER_H #define DEBUGGER_PARSER_H
#include "..\Util_Text.h" #include "Util_Text.h"
const char * ParserFindToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e * pToken_ ); const char * ParserFindToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e * pToken_ );
const TCHAR * FindTokenOrAlphaNumeric ( const TCHAR *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e * pToken_ ); const TCHAR * FindTokenOrAlphaNumeric ( const TCHAR *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e * pToken_ );
int RemoveWhiteSpaceReverse( char *pSrc ); int RemoveWhiteSpaceReverse( char *pSrc );
void TextConvertTabsToSpaces( TCHAR *pDeTabified_, LPCTSTR pText, const int nDstSize, int nTabStop = 0 ); void TextConvertTabsToSpaces( TCHAR *pDeTabified_, LPCTSTR pText, const int nDstSize, int nTabStop = 0 );
inline const char* SkipUntilToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e *pToken_ ) inline const char* SkipUntilToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e *pToken_ )
{ {
if ( pToken_) if ( pToken_)
*pToken_ = NO_TOKEN; *pToken_ = NO_TOKEN;

0
source/Util_MemoryTextFile.cpp → source/Debugger/Util_MemoryTextFile.cpp
View File

1
source/Util_MemoryTextFile.h → source/Debugger/Util_MemoryTextFile.h
View File

@ -1,6 +1,5 @@
#pragma once #pragma once
// Memory Text File _________________________________________________________ // Memory Text File _________________________________________________________
class MemoryTextFile_t class MemoryTextFile_t

22
source/Util_Text.h → source/Debugger/Util_Text.h
View File

@ -1,3 +1,4 @@
#pragma once
#define CHAR_LF '\x0D' #define CHAR_LF '\x0D'
#define CHAR_CR '\x0A' #define CHAR_CR '\x0A'
@ -8,17 +9,6 @@
#define CHAR_ESCAPE '\x1B' #define CHAR_ESCAPE '\x1B'
// Text Util // Text Util
/*
inline const char* SkipEOL ( const char *pSrc )
{
while (pSrc && ((*pSrc == CHAR_LF) || (*pSrc == CHAR_CR)))
if (pSrc)
{
pSrc++;
}
return pSrc;
}
*/
inline const char* EatEOL ( const char *pSrc ) inline const char* EatEOL ( const char *pSrc )
{ {
@ -26,7 +16,7 @@ inline const char* EatEOL ( const char *pSrc )
{ {
if (*pSrc == CHAR_LF) if (*pSrc == CHAR_LF)
pSrc++; pSrc++;
if (*pSrc == CHAR_CR) if (*pSrc == CHAR_CR)
pSrc++; pSrc++;
} }
@ -108,7 +98,7 @@ inline const char* SkipUntilWhiteSpaceReverse ( const char *pSrc, const char *pS
{ {
if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB)) if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB))
{ {
break; break;
} }
pSrc--; pSrc--;
} }
@ -131,13 +121,13 @@ inline bool TextIsHexChar( char nChar )
{ {
if ((nChar >= '0') && (nChar <= '9')) if ((nChar >= '0') && (nChar <= '9'))
return true; return true;
if ((nChar >= 'A') && (nChar <= 'F')) if ((nChar >= 'A') && (nChar <= 'F'))
return true; return true;
if ((nChar >= 'a') && (nChar <= 'f')) if ((nChar >= 'a') && (nChar <= 'f'))
return true; return true;
return false; return false;
} }