* 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.
299 lines
9.7 KiB
C
299 lines
9.7 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Codeblock runtime support
|
|
*
|
|
* Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
/* The Harbour implementation of codeblocks */
|
|
|
|
#include "hbvmopt.h"
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbvm.h"
|
|
#include "hbstack.h"
|
|
|
|
/* Release all allocated memory when called from the garbage collector
|
|
*/
|
|
static HB_GARBAGE_FUNC( hb_codeblockDeleteGarbage )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock = ( HB_CODEBLOCK_PTR ) Cargo;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockDeleteGarbage(%p)", Cargo));
|
|
|
|
/* free space allocated for pcodes - if it was a macro-compiled codeblock
|
|
*/
|
|
if( pCBlock->pCode && pCBlock->dynBuffer )
|
|
{
|
|
hb_xfree( pCBlock->pCode );
|
|
pCBlock->pCode = NULL;
|
|
}
|
|
|
|
/* free space allocated for local variables
|
|
*/
|
|
if( pCBlock->pLocals )
|
|
{
|
|
PHB_ITEM pLocals = pCBlock->pLocals;
|
|
USHORT uiLocals = pCBlock->uiLocals;
|
|
|
|
/* clear pCBlock->pLocals to avoid infinit loop in cross
|
|
* referenced items
|
|
*/
|
|
pCBlock->pLocals = NULL;
|
|
pCBlock->uiLocals = 0;
|
|
|
|
if( hb_xRefDec( pLocals ) )
|
|
{
|
|
while( uiLocals )
|
|
hb_memvarValueDecRef( pLocals[ uiLocals-- ].item.asMemvar.value );
|
|
hb_xfree( pLocals );
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Creates the codeblock structure
|
|
*
|
|
* pBuffer -> the buffer with pcodes (without HB_P_PUSHBLOCK)
|
|
* wLocals -> number of local variables referenced in a codeblock
|
|
* pLocalPosTable -> a table with positions on eval stack for referenced variables
|
|
* pSymbols -> a pointer to the module symbol table
|
|
*
|
|
* Note: pLocalPosTable cannot be used if uiLocals is ZERO
|
|
*
|
|
*/
|
|
HB_CODEBLOCK_PTR hb_codeblockNew( const BYTE * pBuffer,
|
|
USHORT uiLocals,
|
|
const BYTE * pLocalPosTable,
|
|
PHB_SYMB pSymbols,
|
|
USHORT usLen )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock;
|
|
PHB_ITEM pLocals;
|
|
BYTE * pCode;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockNew(%p, %hu, %p, %p, %hu)", pBuffer, uiLocals, pLocalPosTable, pSymbols, usLen));
|
|
|
|
/*
|
|
* allocate memory for code block body and detach items hb_gcAlloc()
|
|
* to be safe for automatic GC activation in hb_xgrab() without
|
|
* calling hb_gcLock()/hb_gcUnlock(). [druzus]
|
|
*/
|
|
|
|
if( usLen )
|
|
{
|
|
/*
|
|
* The codeblock pcode is stored in dynamically allocated memory that
|
|
* can be deallocated after creation of a codeblock. We have to duplicate
|
|
* the passed buffer
|
|
*/
|
|
pCode = ( BYTE * ) hb_xgrab( usLen );
|
|
memcpy( pCode, pBuffer, usLen );
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
* The codeblock pcode is stored in static segment.
|
|
* The only allowed operation on a codeblock is evaluating it then
|
|
* there is no need to duplicate its pcode - just store the pointer to it
|
|
*/
|
|
pCode = ( BYTE * ) pBuffer;
|
|
}
|
|
|
|
if( uiLocals )
|
|
{
|
|
/* NOTE: if a codeblock will be created by macro compiler then
|
|
* uiLocal have to be ZERO
|
|
* uiLocal will be also ZERO if it is a nested codeblock
|
|
*/
|
|
USHORT ui = 1;
|
|
PHB_ITEM pLocal;
|
|
|
|
/* Create a table that will store the values of local variables
|
|
* accessed in a codeblock
|
|
* The element 0 is used as the counter of references to this table
|
|
* NOTE: This table can be shared by codeblocks created during
|
|
* evaluation of this codeblock
|
|
*/
|
|
pLocals = ( PHB_ITEM ) hb_xgrab( ( uiLocals + 1 ) * sizeof( HB_ITEM ) );
|
|
pLocals[ 0 ].type = HB_IT_LONG;
|
|
pLocals[ 0 ].item.asLong.value = 1;
|
|
|
|
do
|
|
{
|
|
/* Swap the current value of local variable with the reference to this
|
|
* value.
|
|
* TODO: If Harbour will support threads in the future then we need
|
|
* to implement some kind of semaphores here.
|
|
*/
|
|
pLocal = hb_stackItemFromBase( HB_PCODE_MKUSHORT( pLocalPosTable ) );
|
|
pLocalPosTable += 2;
|
|
|
|
pLocal = hb_memvarDetachLocal( pLocal );
|
|
memcpy( pLocals + ui, pLocal, sizeof( HB_ITEM ) );
|
|
/* Increment the reference counter so this value will not be
|
|
* released if other codeblock will be deleted
|
|
*/
|
|
hb_memvarValueIncRef( pLocal->item.asMemvar.value );
|
|
}
|
|
while( ++ui <= uiLocals );
|
|
}
|
|
else
|
|
{
|
|
/* Check if this codeblock is created during evaluation of another
|
|
* codeblock - all inner codeblocks use the local variables table
|
|
* created during creation of the outermost codeblock
|
|
*/
|
|
PHB_ITEM pLocal;
|
|
|
|
pLocal = hb_stackSelfItem();
|
|
if( HB_IS_BLOCK( pLocal ) )
|
|
{
|
|
HB_CODEBLOCK_PTR pOwner = pLocal->item.asBlock.value;
|
|
|
|
uiLocals = pOwner->uiLocals;
|
|
pLocals = pOwner->pLocals;
|
|
if( pLocals )
|
|
hb_xRefInc( pLocals );
|
|
}
|
|
else
|
|
pLocals = NULL;
|
|
}
|
|
|
|
pCBlock = ( HB_CODEBLOCK_PTR ) hb_gcAlloc( sizeof( HB_CODEBLOCK ), hb_codeblockDeleteGarbage );
|
|
|
|
pCBlock->pCode = pCode;
|
|
pCBlock->dynBuffer = usLen != 0;
|
|
pCBlock->pDefSymb = hb_stackBaseItem()->item.asSymbol.value;
|
|
pCBlock->pSymbols = pSymbols;
|
|
pCBlock->uiLocals = uiLocals;
|
|
pCBlock->pLocals = pLocals;
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created %p", pCBlock));
|
|
|
|
return pCBlock;
|
|
}
|
|
|
|
HB_CODEBLOCK_PTR hb_codeblockMacroNew( BYTE * pBuffer, USHORT usLen )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock;
|
|
BYTE * pCode;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockMacroNew(%p, %i)", pBuffer, usLen));
|
|
|
|
/*
|
|
* The codeblock pcode is stored in dynamically allocated memory that
|
|
* can be deallocated after creation of a codeblock. We have to duplicate
|
|
* the passed buffer
|
|
*/
|
|
/*
|
|
* allocate memory for code block body and detach items hb_gcAlloc()
|
|
* to be safe for automatic GC activation in hb_xgrab() without
|
|
* calling hb_gcLock()/hb_gcUnlock(). [druzus]
|
|
*/
|
|
pCode = ( BYTE * ) hb_xgrab( usLen );
|
|
memcpy( pCode, pBuffer, usLen );
|
|
|
|
pCBlock = ( HB_CODEBLOCK_PTR ) hb_gcAlloc( sizeof( HB_CODEBLOCK ), hb_codeblockDeleteGarbage );
|
|
/* Store the number of referenced local variables */
|
|
pCBlock->uiLocals = 0;
|
|
pCBlock->pLocals = NULL;
|
|
pCBlock->pCode = pCode;
|
|
pCBlock->dynBuffer = TRUE;
|
|
pCBlock->pDefSymb = hb_stackBaseItem()->item.asSymbol.value;
|
|
pCBlock->pSymbols = NULL; /* macro-compiled codeblock cannot acces a local symbol table */
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created %p", pCBlock));
|
|
|
|
return pCBlock;
|
|
}
|
|
|
|
/* Evaluate passed codeblock
|
|
* Before evaluation we have to switch to a static variable base that
|
|
* was defined when the codeblock was created.
|
|
* (The codeblock can only see the static variables defined in a module
|
|
* where the codeblock was created)
|
|
*/
|
|
void hb_codeblockEvaluate( HB_ITEM_PTR pItem )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockEvaluate(%p)", pItem));
|
|
|
|
hb_stackSetStaticsBase( pItem->item.asBlock.statics );
|
|
hb_vmExecute( pItem->item.asBlock.value->pCode, pItem->item.asBlock.value->pSymbols );
|
|
}
|
|
|
|
/* Get local variable referenced in a codeblock
|
|
*/
|
|
PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, LONG iItemPos )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock = pItem->item.asBlock.value;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockGetVar(%p, %ld)", pItem, iItemPos));
|
|
|
|
/* local variables accessed in a codeblock are always stored as reference */
|
|
return hb_itemUnRef( pCBlock->pLocals - iItemPos );
|
|
}
|
|
|
|
/* Get local variable passed by reference
|
|
*/
|
|
PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, PHB_ITEM pRefer )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockGetRef(%p, %p)", pCBlock, pRefer));
|
|
|
|
return pCBlock->pLocals - pRefer->item.asRefer.value;
|
|
}
|
|
|
|
/* retrieves the codeblock unique ID
|
|
*/
|
|
HB_EXPORT void * hb_codeblockId( PHB_ITEM pItem )
|
|
{
|
|
if( HB_IS_BLOCK( pItem ) )
|
|
return ( void * ) pItem->item.asBlock.value;
|
|
else
|
|
return NULL;
|
|
}
|