* harbour/config/linux/dir.cf
* harbour/config/linux/gcc.cf
* formatting
* harbour/config/linux/global.cf
* harbour/config/linux/install.cf
* added -ldl to linked library list and RANLIB executing after library
creation
* harbour/contrib/ole/ole2.c
* added #include "hbapicls.h"
+ harbour/include/hbapicls.h
* harbour/include/hbapi.h
+ added HB_IT_ENUM item
+ added collect member to HB_IT_POINTER structure for POINTER items
inspected by GC
* changed the order of HB_CODEBLOCK members to safe few bytes on
alignment
* removed counters from HB_CODEBLOCK and HB_BASEARRAY structure
+ added hb_xRefInc(), hb_xRefDec(), hb_xRefFree(), hb_xRefCount(),
hb_xRefResize() functions. They are internal Harbour VM functions
and covered by internal API macro. Should not be used by 3-rd
party code because we may change them in the future or even remove.
+ added hb_gcRefInc(), hb_gcRefDec(), hb_gcRefFree(), hb_gcRefCount()
functions. These are also internal function which corresponds to the
above hb_x*() ones.
- removed hb_arrayRelease() function. This function is not longer
necessary and it should never be public function - it was implemented
in very dangerous way.
- removed hb_codeblockDelete() function.
- removed hb_memvarValueDecGarbageRef()
+ added USHORT usLen parameter to hb_codeblockMacroNew() - when sets
to non 0 value it informs that PCODE should be copied to dynamically
allocated buffer.
* moved all classes/object functions to separate file: hbapicls.h
+ added hb_retptrGC()
+ added internal function hb_memvarGetItem()
* harbour/include/hbapiitm.h
- removed hb_itemForwardValue() and added macro which translates
hb_itemForwardValue() to hb_itemMove()
+ added hb_itemUnShareString() and hb_itemReSizeString() functions
+ added hb_itemSetNil() macro
* harbour/include/hbdefs.h
* some cleanups in macro definitions
* harbour/include/hbexprb.c
* indenting
* harbour/include/hbvm.h
* harbour/include/hbinit.h
+ added hb_vmProcessSymbolsExt(), hb_vmRegisterSymbols(),
hb_vmFreeSymbols(), hb_vmBeginSymbolGroup(),
hb_vmInitSymbolGroup(), hb_vmExitSymbolGroup()
* changed hb_vmProcessSymbols() to return address of register symbol
table. For normal code it's the same address as given in parameter
so it does not break backward binary compatibility.
* changed symbol init macros to work correctly with modified address
of symbol table
* harbour/include/hbsetup.h
* added support for HB_USE_PROFILER macro. Now profiler code is
is disable in HVM by default
* commented out HB_ASORT_OPT_ITEMCOPY - it's not longer used - see note.
* harbour/include/hbstack.h
* added missing parenthesis in hb_stackItem() macro
* harbour/include/hbtypes.h
* updated VM_PROCESS_DLL_SYMBOLS definition
+ added VM_PROCESS_SYMBOLS_EXT
- removed HB_ARRAYRELEASE
* harbour/include/hbver.h
* changed revision number to 2
* harbour/include/hbvmpub.h
- remove pFunPtr from HB_DYNS and cover profiler member by
#ifndef HB_NO_PROFILER
+ added HB_PCODEFUNC structure
+ added HB_FS_PCODEFUNC, HB_FS_DYNCODE and HB_FS_LOCAL - the last one
is not used yet.
* harbour/include/hbxvm.h
* added some multipcode functions for some speed optimization in -gc3
output
* harbour/include/hbapicdp.h
* harbour/source/codepage/cpbg866.c
* harbour/source/codepage/cpbgiso.c
* harbour/source/codepage/cpbgwin.c
* harbour/source/codepage/cpeldos.c
* harbour/source/codepage/cpelwin.c
* harbour/source/codepage/cpesdos.c
* harbour/source/codepage/cpesmwi.c
* harbour/source/codepage/cpeswin.c
* harbour/source/codepage/cpgedos.c
* harbour/source/codepage/cpgewin.c
* harbour/source/codepage/cphu852.c
* harbour/source/codepage/cphuiso.c
* harbour/source/codepage/cphuwin.c
* harbour/source/codepage/cppl852.c
* harbour/source/codepage/cppliso.c
* harbour/source/codepage/cpplmaz.c
* harbour/source/codepage/cpplwin.c
* harbour/source/codepage/cppt850.c
* harbour/source/codepage/cpptiso.c
* harbour/source/codepage/cpru866.c
* harbour/source/codepage/cprukoi.c
* harbour/source/codepage/cpruwin.c
* harbour/source/codepage/cpsl437.c
* harbour/source/codepage/cpsl852.c
* harbour/source/codepage/cpsliso.c
* harbour/source/codepage/cpslwin.c
* harbour/source/codepage/cpsrwin.c
* harbour/source/common/hbfhnd.c
* harbour/source/common/hbstr.c
* harbour/source/common/hbver.c
* harbour/source/compiler/gencli.c
* harbour/source/rtl/fstemp.c
* harbour/source/rtl/hbgtcore.c
* harbour/source/rtl/langapi.c
* harbour/source/rtl/gtalleg/gtalleg.c
* harbour/source/rtl/gtalleg/ssf.h
* harbour/source/rtl/gtcgi/gtcgi.c
* harbour/source/rtl/gtcrs/gtcrs.c
* harbour/source/rtl/gtdos/gtdos.c
* harbour/source/rtl/gtos2/gtos2.c
* harbour/source/rtl/gtpca/gtpca.c
* harbour/source/rtl/gtsln/gtsln.c
* harbour/source/rtl/gtstd/gtstd.c
* harbour/source/rtl/gtwin/gtwin.c
* harbour/source/rtl/gtwvt/gtwvt.c
* harbour/source/rtl/gtxwc/gtxwc.c
* cleaned the code to avoid warnings for some non ANSI C constructions
* harbour/source/compiler/cmdcheck.c
* formatting
* harbour/source/compiler/gencc.c
* added some multipcode optimizations
* harbour/source/compiler/genc.c
* keep function name set by compiler for static initstatics
* harbour/source/compiler/harbour.c
* extend init statics name with the number of used static variables
* formatting
* harbour/source/compiler/hbusage.c
+ added my name to developers list - I hope that there is enough
of my code in Harbour (BTW for quite long time) ;-)
* harbour/source/rdd/dbcmd.c
- removed DBF2TEXT() function
* harbour/source/rdd/dbf1.c
* harbour/source/rdd/dbffpt/dbffpt1.c
* generate RT error when someone tries to create DBF with memo fields
without MEMO RDD linked.
* harbour/source/rtl/errorapi.c
* replace all hb_vmDo() with hb_vmSend()
* harbour/source/rtl/math.c
* use hb_errPutArgs() to pass parameters to error object
* harbour/source/rtl/philes.c
* harbour/source/rtl/space.c
* harbour/source/rtl/strpeek.c
* some minor optimizations
* harbour/source/vm/arrays.c
- removed hb_arrayRelease() function.
* changed hb_arrayReleaseGarbage() to be safe for recursive call
* updated to use GC counters
* harbour/source/vm/arrayshb.c
* use stack function/macros instead of direct accessing HB_STACK members
* harbour/source/vm/asort.c
* removed unused HB_ASORT_OPT_ITEMCOPY
* harbour/source/vm/classes.c
* added class code from HVM
% added fast overloaded operator detection and execution
+ added hb_objHasOperator(), hb_objOperatorCall()
+ added separated overloading of "=" and "==" operators
* operate on PHB_SYMB not PHB_FUNC - support for pure PCODE function
without any machine code
* use stack function/macros instead of direct accessing HB_STACK members
* separated profiler code
* some code cleaning
* harbour/source/vm/codebloc.c
+ added USHORT usLen parameter to hb_codeblockMacroNew() - when sets
to non 0 value it informs that PCODE should be copied to dynamically
allocated buffer.
* updated to use GC counters
- removed hb_codeblockDelete() function.
* changed hb_codeblockDeleteGarbage() to be safe for recursive call
- removed restoring statics base in hb_codeblockEvaluate()
* harbour/source/vm/debug.c
* cleaned and optimized some code
* harbour/source/vm/dynlibhb.c
+ added support for loading and unloading dynamic libraries with PCODE
+ added support for dynamic libraries in Linux (.so)
+ added HB_LIBERROR() - returns error string with last error in
HB_LIBLOAD() - now works only in Linux
* harbour/source/vm/dynsym.c
* separated profiler code
+ use pDynSym->pSymbol->value.pFunPtr instead of pDynSym->pFunPtr
* harbour/source/vm/estack.c
+ added #include "hbapicls.h"
+ added hb_stackPushReturn(), hb_stackPopReturn()
* harbour/source/vm/eval.c
* harbour/source/vm/extend.c
* use stack function/macros instead of direct accessing HB_STACK members
+ added hb_retptrGC()
* harbour/source/vm/fm.c
+ added hb_xRefInc(), hb_xRefDec(), hb_xRefFree(), hb_xRefCount(),
hb_xRefResize() functions. They are internal Harbour VM functions
and covered by internal API macro. Should not be used by 3-rd
party code because we may change them in the future or even remove.
* harbour/source/vm/garbage.c
+ added hb_gcRefInc(), hb_gcRefDec(), hb_gcRefFree(), hb_gcRefCount()
functions. These are also internal function which corresponds to the
above hb_x*() ones.
* changed Step 3 of GC pass and execution of clean-up function to be
safe for recursive calls and additional activity.
Ryszard see my note and s_pDeletedBlock
+ added GC inspected HB_IT_POINTER items.
* harbour/source/vm/hvm.c
* separated profiler code
* separated class code from HVM
+ added support for loading and unloading libraries with PCODE modules
+ added support for pure PCODE functions
+ added support for string item resizing and preallocating string buffer
+ added some new multipcode functions for -gc3 optimization
+ added hb_vmProcessSymbolsExt(), hb_vmRegisterSymbols(),
hb_vmFreeSymbols(), hb_vmBeginSymbolGroup(),
hb_vmInitSymbolGroup(), hb_vmExitSymbolGroup()
* changed hb_vmProcessSymbols() to return address of register symbol
table. For normal code it's the same address as given in parameter
so it does not break backward binary compatibility.
+ use new code for operator overloading
* changed FOR EACH to dynamically check iteration scope in
hb_vmEnumNext()/hb_vmEnumPrev() and remove max number of iteration
stored on HVM stack
* temporary use hb_itemUnRefOnce() instead of hb_itemUnRefRefer() as
workaround for possible GPF. I'd like Ryszard will chose the final
version
* harbour/source/vm/itemapi.c
+ added support for preallocating string buffer size
+ added hb_itemUnShareString() and hb_itemReSizeString()
* updated string items to use counters allocated with each
memory block by xh_xgrab()/hb_xalloc()
* updated codeblock and array items to use GC reference counters
+ added GC inspected HB_IT_POINTER items.
* generate RT error in hb_itemUnreOnce() for enumerator items
out of scope
+ added hb_itemPutPtrGC()
* harbour/source/vm/macro.c
* use pDynSym->pSymbol->value.pFunPtr instead of pDynSym->pFunPtr
* harbour/source/vm/maindllp.c
* updated usage of hb_vmProcessSymbols()
* added hb_vmProcessSymbolsExt()
* harbour/source/vm/memvars.c
+ added hb_memvarGetItem()
- removed hb_memvarValueDecGarbageRef()
* harbour/source/vm/proc.c
+ added #include "hbapicls.h"
* harbour/source/vm/pvalue.c
* do not access stack structure directly but use hb_stack*()
functions (macros)
* harbour/source/vm/runner.c
* synced with xHarbour
* harbour/utils/hbtest/rt_misc.prg
* added overloading "=" operator. Now "==" and "=" can be overloaded
with different methods
All names I used for new functions/macros can be changed. Please look at
it and if you will some better propositions then we can use it.
hb_vmProcessSymbolsExt() is added but not used yet.
287 lines
9.4 KiB
C
287 lines
9.4 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;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockNew(%p, %hu, %p, %p, %hu)", pBuffer, uiLocals, pLocalPosTable, pSymbols, usLen));
|
|
|
|
pCBlock = ( HB_CODEBLOCK_PTR ) hb_gcAlloc( sizeof( HB_CODEBLOCK ), hb_codeblockDeleteGarbage );
|
|
|
|
/* Store the number of referenced local variables
|
|
*/
|
|
pCBlock->uiLocals = uiLocals;
|
|
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
|
|
*/
|
|
pCBlock->pLocals = ( PHB_ITEM ) hb_xgrab( ( uiLocals + 1 ) * sizeof( HB_ITEM ) );
|
|
pCBlock->pLocals[ 0 ].type = HB_IT_LONG;
|
|
pCBlock->pLocals[ 0 ].item.asLong.value = 1;
|
|
|
|
while( uiLocals-- )
|
|
{
|
|
/* 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( pCBlock->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 );
|
|
++ui;
|
|
}
|
|
}
|
|
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;
|
|
|
|
pCBlock->uiLocals = pOwner->uiLocals;
|
|
pCBlock->pLocals = pOwner->pLocals;
|
|
if( pOwner->pLocals )
|
|
hb_xRefInc( pOwner->pLocals );
|
|
}
|
|
else
|
|
pCBlock->pLocals = NULL;
|
|
}
|
|
|
|
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
|
|
*/
|
|
pCBlock->pCode = ( BYTE * ) hb_xgrab( usLen );
|
|
memcpy( pCBlock->pCode, pBuffer, usLen );
|
|
pCBlock->dynBuffer = TRUE;
|
|
}
|
|
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
|
|
*/
|
|
pCBlock->pCode = ( BYTE * ) pBuffer;
|
|
pCBlock->dynBuffer = FALSE;
|
|
}
|
|
|
|
pCBlock->pDefSymb = hb_stackBaseItem()->item.asSymbol.value;
|
|
pCBlock->pSymbols = pSymbols;
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created %p", pCBlock));
|
|
|
|
return pCBlock;
|
|
}
|
|
|
|
HB_CODEBLOCK_PTR hb_codeblockMacroNew( BYTE * pBuffer, USHORT usLen )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockMacroNew(%p, %i)", 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;
|
|
/*
|
|
* 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
|
|
*/
|
|
pCBlock->pCode = ( BYTE * ) hb_xgrab( usLen );
|
|
memcpy( pCBlock->pCode, pBuffer, usLen );
|
|
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_stack.iStatics = 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;
|
|
}
|