* harbour/include/hbstack.h
* harbour/source/vm/estack.c
- removed hb_stackTopItem()
+ added hb_stackItemBasePtr(), hb_stackAllocItem()
* changed the item initialization/clearing in push/pop operation
Now only complex item are cleared and it's not guaranteed that
the top item will be set to NIL. In fact it was not guarantied
even before my modifications. You coule be sure only that the
allocated item will not be complex one and you can safely pass
pointer to it to any other functions. It allow to clean a little
bit some code and remove redundant and repeated setting HB_IT_NIL
for allocated items.
Now using hb_stackPush() can be necessary only in some very seldom
cases. hb_stackAllocItem() allocates new item and returns pointer
to this item. After some code cleaning hb_stackPush() is not used
by core Harbour code at all so if you have it in your sources then
please check if you should not update them.
* harbour/source/rdd/usrrdd/usrrdd.c
* use hb_vmPushNil() instead of hb_stackPush()
* harbour/source/vm/arrays.c
* changed hb_arrayNew() to be safe for automatic GC activation
* some minor speed improvement
* harbour/source/vm/codebloc.c
* changed hb_codeblockNew() and hb_codeblockMacroNew() to be safe
for automatic GC activation
* harbour/source/vm/debug.c
* use only stack function/macros instead of direct accessing hb_stack
I hope that I haven't break anything.
* harbour/source/vm/hvm.c
! use hb_stackAllocItem() instead of hb_stackTopItem() to make our
HVM reentrant safe. This modifications also fixed some possible
bugs which could be exploited by other modules which have to execute
.prg code - f.e. in RDD when relation codeblock has to be executed
to position record in fieldget/fieldput operations.
* harbour/source/vm/itemapi.c
* harbour/source/vm/memvars.c
* use hb_stackAllocItem()
The above modifications finish stack usage and making our HVM reentrant
safe. There is only one thing which have to be fixed yet. It's HVM
support for xbase++ syntax in things like:
func(&<paramList>), aVal[&<indexList>], {&<itemList>}
To fix it we will have to change PCODE generated by compiler and
replace some PCODEs used for current code by the new one. I will
wait with this modifications for Ryszard.
With the above exception now we are ready to implement destructors,
add automatic GC and begin to work on MT though before that I'd like
to clean the RT error support.
Please carefully check if all is correct. It was modification in core
code and even small typo can break whole application.
271 lines
7.7 KiB
C
271 lines
7.7 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Debugging functions for LOCAL, STATIC variables and the stack
|
|
*
|
|
* Copyright 1999 Eddie Runia <eddie@runia.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbvmopt.h"
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbstack.h"
|
|
|
|
/* $Doc$
|
|
* $FuncName$ AddToArray( <pItem>, <pReturn>, <uiPos> )
|
|
* $Description$ Add <pItem> to array <pReturn> at pos <uiPos>
|
|
* $End$ */
|
|
static void AddToArray( PHB_ITEM pItem, PHB_ITEM pReturn, ULONG ulPos )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("AddToArray(%p, %p, %lu)", pItem, pReturn, ulPos));
|
|
|
|
if( pItem->type == HB_IT_SYMBOL )
|
|
{ /* Symbol is pushed as text */
|
|
PHB_ITEM pArrayItem = hb_arrayGetItemPtr( pReturn, ulPos );
|
|
|
|
if( pArrayItem )
|
|
{
|
|
ULONG ulLen = strlen( pItem->item.asSymbol.value->szName ) + 2;
|
|
char * szBuff = ( char * ) hb_xgrab( ulLen );
|
|
|
|
sprintf( szBuff, "[%s]", pItem->item.asSymbol.value->szName );
|
|
hb_itemPutCPtr( pArrayItem, szBuff, ulLen );
|
|
}
|
|
}
|
|
else /* Normal types */
|
|
hb_itemArrayPut( pReturn, ulPos, pItem );
|
|
}
|
|
|
|
/* $Doc$
|
|
* $FuncName$ <nVars> hb_dbg_vmStkGCount()
|
|
* $Description$ Returns the length of the global stack
|
|
* $End$ */
|
|
HB_FUNC( HB_DBG_VMSTKGCOUNT )
|
|
{
|
|
hb_retnl( hb_stackTopOffset() );
|
|
}
|
|
|
|
/* $Doc$
|
|
* $FuncName$ <aStack> hb_dbg_vmStkGList()
|
|
* $Description$ Returns the global stack
|
|
* $End$ */
|
|
HB_FUNC( HB_DBG_VMSTKGLIST )
|
|
{
|
|
PHB_ITEM pReturn;
|
|
ULONG ulLen = hb_stackTopOffset();
|
|
ULONG ulPos;
|
|
|
|
pReturn = hb_itemArrayNew( ulLen ); /* Create a transfer array */
|
|
|
|
for( ulPos = 0; ulPos < ulLen; ++ulPos )
|
|
{
|
|
AddToArray( hb_stackItem( ulPos ), pReturn, ulPos + 1 );
|
|
}
|
|
hb_itemRelease( hb_itemReturn( pReturn ) );
|
|
}
|
|
|
|
/* $Doc$
|
|
* $FuncName$ <nVars> __vmStkLCount( <nProcLevel> )
|
|
* $Description$ Returns params plus locals amount of the nProcLevel function
|
|
* $End$ */
|
|
static LONG hb_stackLen( int iLevel )
|
|
{
|
|
LONG lBaseOffset, lPrevOffset, lLen;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_stackLen()"));
|
|
|
|
lBaseOffset = hb_stackBaseOffset();
|
|
while( --iLevel > 0 && lBaseOffset > 1 )
|
|
lBaseOffset = hb_stackItem( lBaseOffset - 1 )->item.asSymbol.stackbase + 1;
|
|
|
|
if( lBaseOffset > 1 )
|
|
{
|
|
lPrevOffset = hb_stackItem( lBaseOffset - 1 )->item.asSymbol.stackbase;
|
|
lLen = lBaseOffset - lPrevOffset - 3;
|
|
}
|
|
else
|
|
lLen = 0;
|
|
|
|
return lLen;
|
|
}
|
|
|
|
/* $Doc$
|
|
* $FuncName$ <nVars> hb_dbg_vmStkLCount( <nProcLevel> )
|
|
* $Description$ Returns params plus locals amount of the nProcLevel function
|
|
* $End$ */
|
|
HB_FUNC( HB_DBG_VMSTKLCOUNT )
|
|
{
|
|
hb_retnl( hb_stackLen( hb_parni( 1 ) + 1 ) );
|
|
}
|
|
|
|
/* $Doc$
|
|
* $FuncName$ <aStack> hb_dbg_vmStkLList()
|
|
* $Description$ Returns the stack of the calling function
|
|
* "[<symbol>]" Means symbol.
|
|
*
|
|
* [1] Symbol of current function
|
|
* [2] Self | NIL
|
|
* [3 .. x] Parameters
|
|
* [x+1 .. y] Locals
|
|
* [y+1 ..] Pushed data
|
|
* $End$ */
|
|
HB_FUNC( HB_DBG_VMSTKLLIST )
|
|
{
|
|
PHB_ITEM pReturn;
|
|
ULONG ulLen, ul;
|
|
LONG lBaseOffset, lPrevOffset;
|
|
|
|
lBaseOffset = hb_stackBaseOffset();
|
|
lPrevOffset = hb_stackItem( lBaseOffset - 1 )->item.asSymbol.stackbase;
|
|
|
|
ulLen = lBaseOffset - lPrevOffset - 3;
|
|
pReturn = hb_itemArrayNew( ulLen ); /* Create a transfer array */
|
|
for( ul = 0; ul < ulLen; ++ul )
|
|
AddToArray( hb_stackItem( lPrevOffset + ul ), pReturn, ul + 1 );
|
|
|
|
hb_itemRelease( hb_itemReturn( pReturn ) );
|
|
}
|
|
|
|
/* $Doc$
|
|
* $FuncName$ <aParam> hb_dbg_vmParLGet()
|
|
* $Description$ Returns the passed parameters of the calling function
|
|
* $End$ */
|
|
/* TODO : put bLocals / bParams */
|
|
/* somewhere for declared parameters */
|
|
/* and locals */
|
|
HB_FUNC( HB_DBG_VMPARLLIST )
|
|
{
|
|
hb_itemRelease( hb_itemReturn( hb_arrayFromParams( hb_parni( 1 ) + 1 ) ) );
|
|
}
|
|
|
|
HB_FUNC( HB_DBG_VMVARLGET )
|
|
{
|
|
int iLevel = hb_parni( 1 ) + 1;
|
|
int iLocal = hb_parni( 2 );
|
|
LONG lBaseOffset;
|
|
|
|
lBaseOffset = hb_stackBaseOffset();
|
|
while( iLevel-- > 0 && lBaseOffset > 1 )
|
|
lBaseOffset = hb_stackItem( lBaseOffset - 1 )->item.asSymbol.stackbase + 1;
|
|
|
|
if( iLevel < 0 )
|
|
{
|
|
if( iLocal > SHRT_MAX )
|
|
{
|
|
iLocal -= USHRT_MAX;
|
|
iLocal--;
|
|
}
|
|
if( iLocal >= 0 )
|
|
hb_itemReturn( hb_itemUnRef( hb_stackItem( lBaseOffset + iLocal ) ) );
|
|
else
|
|
hb_itemReturn( hb_codeblockGetVar( hb_stackItem( lBaseOffset ), ( LONG ) iLocal ) );
|
|
}
|
|
}
|
|
|
|
HB_FUNC( HB_DBG_VMVARLSET )
|
|
{
|
|
int iLevel = hb_parni( 1 ) + 1;
|
|
int iLocal = hb_parni( 2 );
|
|
LONG lBaseOffset;
|
|
PHB_ITEM pLocal;
|
|
|
|
lBaseOffset = hb_stackBaseOffset();
|
|
while( iLevel-- > 0 && lBaseOffset > 1 )
|
|
lBaseOffset = hb_stackItem( lBaseOffset - 1 )->item.asSymbol.stackbase + 1;
|
|
|
|
if( iLevel < 0 )
|
|
{
|
|
if( iLocal > SHRT_MAX )
|
|
{
|
|
iLocal -= USHRT_MAX;
|
|
iLocal--;
|
|
}
|
|
|
|
if( iLocal >= 0 )
|
|
pLocal = hb_stackItem( lBaseOffset + iLocal );
|
|
else
|
|
pLocal = hb_codeblockGetVar( hb_stackItem( lBaseOffset ), ( LONG ) iLocal );
|
|
|
|
hb_itemCopy( hb_itemUnRef( pLocal ), hb_stackItemFromBase( 3 ) );
|
|
}
|
|
}
|
|
|
|
HB_FUNC( __VMSTKLCOUNT )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMSTKLCOUNT)();
|
|
}
|
|
|
|
HB_FUNC( __VMPARLLIST )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMPARLLIST)();
|
|
}
|
|
|
|
HB_FUNC( __VMSTKLLIST )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMSTKLLIST)();
|
|
}
|
|
|
|
HB_FUNC( __VMVARLGET )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMVARLGET)();
|
|
}
|
|
|
|
HB_FUNC( __VMVARLSET )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMVARLSET)();
|
|
}
|
|
|
|
HB_FUNC( __VMSTKGLIST )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMSTKGLIST)();
|
|
}
|
|
|
|
HB_FUNC( __VMSTKGCOUNT )
|
|
{
|
|
HB_FUNCNAME(HB_DBG_VMSTKGCOUNT)();
|
|
}
|