fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2013-07-03 12:14 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* include/hbapidbg.h
  * src/debug/dbgentry.c
  * src/debug/debugger.prg
    + added new C function hb_dbgGetModuleName() - it returns module name
      used to register module in HVM. In current version it only strips
      path part though in the future it may use some more advanced code
      which allow to debug modules with the same name but different paths
      in single application and such extension will be local to core debug
      code if upper level debugger uses hb_dbgGetModuleName()
    + added new PRG function __DBGGETMODULENAME() - it's wrapper to
      hb_dbgGetModuleName()
    + added new PRG function __DBGMODULEMATCH()
    ! use __DBGMODULEMATCH() instead of hb_FileMatch() and strip_path()
    ! eliminated strip_path() from PRG code and use hb_dbgGetModuleName()
      in C code in places where it's necessary
    ! replaced few strcmp() used to compare module names with
      FILENAME_EQUAL()
    ; above modification may fix few potential problem with breakpoints
      in debugger on some platforms if user uses different paths for
      debugger and compilers.
    ! eliminated hack with memvar/field name copy in watch points,
      it also fixes memory leak when fields are used in watch points.
    % replaced few DO CASE with SWITCH
This commit is contained in:
Przemysław Czerpak
2013-07-03 12:14:50 +02:00
parent 96e7b0159c
commit ab3f6109c1
4 changed files with 224 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/debug/dbgentry.c
View File

@@ -103,8 +103,8 @@ typedef struct
typedef struct
{
char * szName;
char cType;
const char * szName;
char cType;
union
{
int num;
@@ -178,6 +178,7 @@ typedef struct
HB_BOOL bInitGlobals;
HB_BOOL bInitStatics;
HB_BOOL bInitLines;
PHB_DYNS pDbgEntry;
} HB_DEBUGINFO;
static HB_DBGCOMMONINFO s_common = { 0, NULL, NULL };
@@ -206,14 +207,19 @@ static void hb_dbgVarSet( HB_VARINFO * scope, PHB_ITEM xNewValue );
static void hb_dbgActivate( HB_DEBUGINFO * info )
{
PHB_DYNS pDynSym = hb_dynsymFind( "__DBGENTRY" );
if( pDynSym && hb_dynsymIsFunction( pDynSym ) )
if( ! info->pDbgEntry )
{
info->pDbgEntry = hb_dynsymFind( "__DBGENTRY" );
if( info->pDbgEntry && ! hb_dynsymIsFunction( info->pDbgEntry ) )
info->pDbgEntry = NULL;
}
if( info->pDbgEntry )
{
int i;
PHB_ITEM aCallStack = hb_itemArrayNew( info->nCallStackLen );
PHB_ITEM aModules;
PHB_ITEM aBreak;
int i;
for( i = 0; i < info->nCallStackLen; i++ )
{
@@ -241,7 +247,7 @@ static void hb_dbgActivate( HB_DEBUGINFO * info )
aModules = hb_dbgActivateModuleArray();
aBreak = hb_dbgActivateBreakArray( info );
hb_vmPushDynSym( pDynSym );
hb_vmPushDynSym( info->pDbgEntry );
hb_vmPushNil();
hb_vmPushLong( HB_DBG_ACTIVATE );
hb_vmPushPointer( info );
@@ -569,6 +575,7 @@ void hb_dbgAddBreak( void * handle, const char * szModule, int nLine, const char
HB_DEBUGINFO * info = ( HB_DEBUGINFO * ) handle;
HB_BREAKPOINT * pBreak;
szModule = hb_dbgStripModuleName( szModule );
pBreak = ARRAY_ADD( HB_BREAKPOINT, info->aBreak, info->nBreakPoints );
pBreak->szModule = hb_strdup( szModule );
pBreak->nLine = nLine;
@@ -613,7 +620,7 @@ static void hb_dbgAddModule( const char * szName )
szModuleName = hb_strndup( szName, iLen );
HB_DBGCOMMON_LOCK();
if( ! s_common.nModules || strcmp( s_common.aModules[ s_common.nModules - 1 ].szModule, szModuleName ) )
if( ! s_common.nModules || !FILENAME_EQUAL( s_common.aModules[ s_common.nModules - 1 ].szModule, szModuleName ) )
{
HB_MODULEINFO * pModule;
@@ -636,8 +643,11 @@ static void hb_dbgAddStack( HB_DEBUGINFO * info, const char * szName, int nProcL
{
char szBuff[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 ];
HB_CALLSTACKINFO * top;
const char * szFunction = strrchr( szName, ':' );
const char * szFunction;
szName = hb_dbgStripModuleName( szName );
szFunction = strrchr( szName, ':' );
if( szFunction )
szFunction++;
@@ -662,8 +672,6 @@ static void hb_dbgAddStack( HB_DEBUGINFO * info, const char * szName, int nProcL
}
}
szName = hb_dbgStripModuleName( szName );
if( szFunction )
top->szModule = hb_strndup( szName, szFunction - szName - 1 );
else
@@ -735,7 +743,7 @@ static void hb_dbgAddStopLines( PHB_ITEM pItem )
{
PHB_ITEM pLines = hb_arrayGetItemPtr( s_common.pStopLines, j );
if( ! strcmp( hb_arrayGetCPtr( pLines, 1 ), szModule ) )
if( FILENAME_EQUAL( hb_arrayGetCPtr( pLines, 1 ), szModule ) )
{
/* Merge stopline info */
HB_ISIZ nOrigMin = hb_arrayGetNS( pLines, 2 );
@@ -797,8 +805,7 @@ static void hb_dbgAddVar( int * nVars, HB_VARINFO ** aVars, const char * szName,
HB_VARINFO * var;
var = ARRAY_ADD( HB_VARINFO, *aVars, *nVars );
/* TODO/TOFIX: value should be duplicated here and then released */
var->szName = ( char * ) szName;
var->szName = szName;
var->cType = cType;
var->nIndex = nIndex;
if( cType == 'S' )
@@ -972,11 +979,6 @@ static PHB_ITEM hb_dbgEval( HB_DEBUGINFO * info, HB_WATCHPOINT * watch )
hb_itemRelease( aVars );
hb_itemRelease( aNewVars );
for( i = 0; i < watch->nVars; i++ )
{
if( watch->aScopes[ i ].cType == 'M' )
hb_xfree( watch->aScopes[ i ].szName );
}
if( watch->nVars )
hb_xfree( watch->aScopes );
}
@@ -1061,18 +1063,14 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT * watch )
c = watch->szExpr[ j ];
}
nLen = j - i;
szWord = hb_strndup( watch->szExpr + i, nLen );
i = j;
if( c )
{
while( watch->szExpr[ i ] && watch->szExpr[ i ] == ' ' )
while( watch->szExpr[ i ] == ' ' )
i++;
if( watch->szExpr[ i ] == '(' )
{
hb_xfree( szWord );
continue;
}
if( watch->szExpr[ i ] == '-' && watch->szExpr[ i + 1 ] == '>' )
{
@@ -1081,11 +1079,10 @@ static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT * watch )
while( ( c = watch->szExpr[ i ] ) != '\0' && IS_IDENT_CHAR( c ) )
i++;
hb_xfree( szWord );
continue;
}
}
hb_strupr( szWord );
szWord = hb_strupr( hb_strndup( watch->szExpr + nStart, nLen ) );
i = hb_dbgEvalSubstituteVar( watch, szWord, nStart, nLen );
bAfterId = HB_TRUE;
continue;
@@ -1213,7 +1210,7 @@ static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO * info, HB_WATCHPOINT * watch )
for( i = 0; i < s_common.nModules; i++ )
{
if( ! strcmp( s_common.aModules[ i ].szModule, top->szModule ) )
if( FILENAME_EQUAL( s_common.aModules[ i ].szModule, top->szModule ) )
{
module = &s_common.aModules[ i ];
break;
@@ -1306,7 +1303,7 @@ static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO * info, HB_WATCHPOINT * watch )
}
scopes[ i ].cType = 'M';
scopes[ i ].szName = hb_strdup( name );
scopes[ i ].szName = hb_dynsymGetSymbol( name )->szName;
pItem = hb_dbgVarGet( &scopes[ i ] );
@@ -1383,6 +1380,8 @@ static HB_BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO * info, const char * szModule, i
{
int i;
/* szModule has stripped path here */
for( i = 0; i < info->nBreakPoints; i++ )
{
HB_BREAKPOINT * point = &info->aBreak[ i ];
@@ -1404,6 +1403,8 @@ HB_BOOL hb_dbgIsValidStopLine( void * handle, const char * szModule, int nLine )
/* HB_DEBUGINFO * info = ( HB_DEBUGINFO * ) handle; */
HB_SYMBOL_UNUSED( handle );
szModule = hb_dbgStripModuleName( szModule );
HB_DBGCOMMON_LOCK();
nModules = hb_itemSize( s_common.pStopLines );
for( i = 1; i <= nModules; i++ )
@@ -1426,6 +1427,18 @@ HB_BOOL hb_dbgIsValidStopLine( void * handle, const char * szModule, int nLine )
}
const char * hb_dbgGetModuleName( void * handle, const char * szName )
{
/* HB_DEBUGINFO * info = ( HB_DEBUGINFO * ) handle; */
HB_SYMBOL_UNUSED( handle );
if( szName )
szName = hb_dbgStripModuleName( szName );
return szName;
}
static void hb_dbgQuit( HB_DEBUGINFO * info )
{
while( info->nWatchPoints )
@@ -1524,6 +1537,8 @@ void hb_dbgSetToCursor( void * handle, const char * szModule, int nLine )
{
HB_DEBUGINFO * info = ( HB_DEBUGINFO * ) handle;
szModule = hb_dbgStripModuleName( szModule );
info->bToCursor = HB_TRUE;
info->szToCursorModule = hb_strdup( szModule );
info->nToCursorLine = nLine;
@@ -1771,6 +1786,29 @@ HB_FUNC( __DBGSETWATCH )
hb_dbgSetWatch( ptr, hb_parni( 2 ), hb_parc( 3 ), hb_parl( 4 ) );
}
HB_FUNC( __DBGGETMODULENAME )
{
void * ptr = hb_parptr( 1 );
if( ptr )
hb_retc( hb_dbgGetModuleName( ptr, hb_parc( 2 ) ) );
}
HB_FUNC( __DBGMODULEMATCH )
{
void * ptr = hb_parptr( 1 );
if( ptr )
{
const char * szModule1 = hb_parc( 2 ),
* szModule2 = hb_parc( 3 );
hb_retl( szModule1 && szModule2 &&
FILENAME_EQUAL( hb_dbgStripModuleName( szModule1 ),
hb_dbgStripModuleName( szModule2 ) ) );
}
}
HB_FUNC( __DBGSENDMSG )
{
hb_dbg_objSendMessage( hb_parnl( 1 ), hb_param( 2, HB_IT_ANY ),