* harbour/Makefile
+ harbour/make_bsd.sh
+ harbour/make_drw.sh
* harbour/make_tgz.sh
+ harbour/bin/hb-func.sh
* harbour/bin/pack_src.sh
+ harbour/bin/postinst.bat
+ harbour/bin/postinst.sh
* harbour/config/dir.cf
* harbour/config/bsd/gcc.cf
* harbour/config/bsd/global.cf
+ harbour/config/darwin/dir.cf
+ harbour/config/darwin/gcc.cf
+ harbour/config/darwin/global.cf
+ harbour/config/darwin/install.cf
* harbour/config/dos/dir.cf
* harbour/config/dos/global.cf
* harbour/config/dos/install.cf
* harbour/config/dos/owatcom.cf
* harbour/config/dos/watcom.cf
* harbour/config/linux/gcc.cf
* harbour/config/linux/global.cf
* harbour/contrib/Makefile
* harbour/contrib/dot/pp_harb.ch
* harbour/contrib/libct/Makefile
* harbour/contrib/libct/bit1.c
* harbour/contrib/libct/bit2.c
* harbour/contrib/libct/bit3.c
* harbour/contrib/libct/files.c
* harbour/contrib/libct/ftoc.c
- harbour/contrib/libct/invertwin.prg
+ harbour/contrib/libct/invrtwin.prg
* harbour/contrib/libct/keyset.c
* harbour/contrib/libct/makefile.bc
* harbour/contrib/libmisc/dates2.c
* harbour/contrib/rdd_ads/ads1.c
* harbour/contrib/rdd_ads/adsfunc.c
* harbour/contrib/samples/date.c
* harbour/include/dbinfo.ch
* harbour/include/hbapi.h
* harbour/include/hbapicdp.h
* harbour/include/hbapifs.h
* harbour/include/hbapigt.h
* harbour/include/hbapiitm.h
* harbour/include/hbcomp.h
* harbour/include/hbdate.h
* harbour/include/hbdbf.h
* harbour/include/hbdbferr.h
* harbour/include/hbdefs.h
* harbour/include/hbexprb.c
* harbour/include/hbexprc.c
* harbour/include/hbexprop.h
* harbour/include/hbmacro.h
* harbour/include/hbmath.h
* harbour/include/hbpcode.h
* harbour/include/hbrddcdx.h
* harbour/include/hbrdddbf.h
* harbour/include/hbrdddbt.h
* harbour/include/hbrddfpt.h
* harbour/include/hbrddntx.h
* harbour/include/hbset.h
* harbour/include/hbsetup.h
* harbour/include/set.ch
* harbour/source/common/Makefile
* harbour/source/common/expropt1.c
* harbour/source/common/expropt2.c
- harbour/source/common/hbffind.c
* harbour/source/common/hbfsapi.c
* harbour/source/common/hbstr.c
* harbour/source/common/hbver.c
+ harbour/source/common/hbverdsp.c
* harbour/source/compiler/genc.c
* harbour/source/compiler/gencli.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.l
* harbour/source/compiler/harbour.slx
* harbour/source/compiler/harbour.sly
* harbour/source/compiler/harbour.y
* harbour/source/compiler/hbfix.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/hbusage.c
* harbour/source/compiler/simplex.c
* harbour/source/macro/macro.l
* harbour/source/macro/macro.slx
* harbour/source/macro/macro.y
* harbour/source/pp/ppcore.c
* harbour/source/rdd/dbcmd.c
* harbour/source/rdd/dbf1.c
* harbour/source/rdd/dbfcdx/dbfcdx1.c
- harbour/source/rdd/dbfcdx/dbfcdx1.h
* harbour/source/rdd/dbffpt/dbffpt1.c
* harbour/source/rdd/dbfntx/dbfntx1.c
* harbour/source/rtl/Makefile
* harbour/source/rtl/abs.c
* harbour/source/rtl/at.c
* harbour/source/rtl/datec.c
* harbour/source/rtl/dates.c
* harbour/source/rtl/dateshb.c
* harbour/source/rtl/datesx.c
* harbour/source/rtl/empty.c
* harbour/source/rtl/errorapi.c
* harbour/source/rtl/errorint.c
* harbour/source/rtl/filesys.c
* harbour/source/rtl/fstemp.c
+ harbour/source/rtl/hbffind.c
* harbour/source/rtl/hbrandom.c
* harbour/source/rtl/idle.c
* harbour/source/rtl/inkey.c
* harbour/source/rtl/math.c
* harbour/source/rtl/minmax.c
* harbour/source/rtl/pad.c
* harbour/source/rtl/padc.c
* harbour/source/rtl/padl.c
* harbour/source/rtl/padr.c
* harbour/source/rtl/philes.c
* harbour/source/rtl/round.c
* harbour/source/rtl/soundex.c
* harbour/source/rtl/str.c
* harbour/source/rtl/strcase.c
* harbour/source/rtl/strmatch.c
* harbour/source/rtl/strtran.c
* harbour/source/rtl/strzero.c
* harbour/source/rtl/substr.c
* harbour/source/rtl/val.c
* harbour/source/rtl/gtcrs/gtcrs.c
* harbour/source/rtl/gtcrs/kbdcrs.c
* harbour/source/rtl/gtdos/gtdos.c
* harbour/source/rtl/gtsln/gtsln.c
* harbour/source/rtl/gtsln/kbsln.c
* harbour/source/rtl/gtsln/keytrans.c
* harbour/source/vm/arrays.c
* harbour/source/vm/codebloc.c
* harbour/source/vm/estack.c
* harbour/source/vm/eval.c
* harbour/source/vm/extend.c
* harbour/source/vm/hvm.c
* harbour/source/vm/itemapi.c
* harbour/source/vm/macro.c
* harbour/source/vm/memvars.c
* harbour/source/vm/runner.c
* harbour/tests/bldtest/bldtest.c
* harbour/utils/hbtest/hbtest.prg
* harbour/utils/hbtest/rt_misc.prg
* harbour/utils/hbtest/rt_str.prg
* Sorry but it's too much modification for full description
cvs diff gives file 785982 bytes length. So I only count the
main things:
! cleand the code (no more warning messages under Linux and GCC and
DOS OpenWatcom) - some of them were real bugs
! cleaned all endian dependend code I've found - now Harbour can be
compiled on LITLE and BIG endian machines - for some other like
PDP ENDIAN it's enough to define proper macros in hbdefs.h
+ added macros for to get/put values in chosen byte order:
HB_GET_LE_[U]INT{16,24,32,64}( pPtr )
HB_GET_BE_[U]INT{16,24,32,64}( pPtr )
HB_PUT_LE_[U]INT{16,24,32,64}( pPtr, nVal )
HB_PUT_BE_[U]INT{16,24,32,64}( pPtr, nVal )
+ added macro HB_CAST_BYTE_NUMBERS_OFF which disables casting in
HB_{GET|PUT}_{LE|BE}_* macros - it's necessary for some platforms
like ALPHA DEC.
! cleaned the code for 64bit machines
* changed all parameters in hb_date* functions (day, month, year, week)
from LONG to int - it doesn't change binary compatibility for 32bit
machines but can cause troubles with compiling the old source
+ changed HB_IT_LONG type to HB_LONG which is mapped to long long
by default for 32 bit machines.
+ change HB_IT_INTEGER to be real 'int' C type not 'short int'
+ added HB_IS_NUMINT() macro
+ added hb_parnll, hb_stornll, hb_retnll, hbretnlllen, hb_itemPutNLL,
hb_itemPutNLLLen, hb_itemGetNLL which operates on LONGLONG
+ added hb_parnint, hb_stornint, hb_retnint, hb_retnintlen,
hb_itemPutNInt, hb_itemPutNIntLen, hb_itemGetNInt which operates on
HB_LONG
+ added HB_PUSHLONGLONG pcode
+ changed compiler and optimizer to use HB_LONG numbers and reduce
conversion from to double which may damage the 64bit number.
+ common functions for string to number conversions for compiler, RTL
and RDD to reduce problems with differ FL values for the same number:
hb_compStrToNum(), hb_valStrnToNum(), hb_strToNum(), hb_strnToNum()
+ common function hb_numRoun() which uses exactly the same algorithms
as string to number conversion for the same reason - please keep
this functions together.
+ hack inside hb_numRound() similar to the one used by CL5.3
+ hb_numInt() which uses uses the same hack as hb_numRound()
+ rewritten number to string conversion
+ some new string manipulation functions hb_strncpy(), hb_strncat(), ...
They works differ the the C one - always set 0 at the end, the buffer
has to be n+1 bytes length, the n is total size of buffer not the
left free space.
! cleaned some code which operates on ASCIIZ string to avoid potential
buffer overflow
+ updated RDD code - it's the first part - in few days I plan to change
workarea structure in both projects - it will break any 3rd party RDDs
so they have to be updated. I want to add SUPERTABLE into workarea
to allow creating new RDD on-line.
! cleaned the bugs with negating integers - on most machines (like x86)
the integers are not 0 symmetric - it means that x = -x does not work
for {INT,LONG,LONGLONG}_MIN (hb_vmNegate, ABS())
+ cleaned error messages to be Clipper compatible.
+ updated build process for .DEB packages - now hb* scripts and shared
libs are created by standard make install
* added new .prg #defines: __PLATFORM__<cPlatfrom>,
__ARCH{16|32|64}BIT__, __LITTLE_ENDIAN__|__BIG_ENDIAN__|__PDP_ENDIAN__
!!! cPlatfrom can have lower letters (for xHarbour compatibility)
If you do not like it please change it.
* others ...
331 lines
11 KiB
C
331 lines
11 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 "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbvm.h"
|
|
#include "hbstack.h"
|
|
|
|
/* 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( BYTE * pBuffer,
|
|
USHORT uiLocals,
|
|
BYTE * pLocalPosTable,
|
|
PHB_SYMB pSymbols )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockNew(%p, %hu, %p, %p)", pBuffer, uiLocals, pLocalPosTable, pSymbols));
|
|
|
|
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;
|
|
|
|
if( ! HB_IS_MEMVAR( pLocal ) )
|
|
{
|
|
/* Change the value only if this variable is not referenced
|
|
* by another codeblock yet.
|
|
* In this case we have to copy the current value to a global memory
|
|
* pool so it can be shared by codeblocks
|
|
*/
|
|
|
|
if( HB_IS_BYREF( pLocal ) )
|
|
{
|
|
pLocal = hb_itemUnRef( pLocal );
|
|
}
|
|
|
|
hb_memvarDetachLocal( pLocal );
|
|
memcpy( pCBlock->pLocals + ui, pLocal, sizeof( HB_ITEM ) );
|
|
}
|
|
else
|
|
{
|
|
/* This variable is already detached (by another codeblock)
|
|
* - copy the reference to a value
|
|
*/
|
|
/* Increment the reference counter so this value will not be
|
|
* released if other codeblock will be deleted
|
|
*/
|
|
memcpy( pCBlock->pLocals + ui, pLocal, sizeof( HB_ITEM ) );
|
|
}
|
|
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->pLocals = pOwner->pLocals;
|
|
pCBlock->uiLocals = uiLocals = pOwner->uiLocals;
|
|
if( pOwner->pLocals )
|
|
{ /* the outer codeblock have the table with local references - reuse it */
|
|
while( uiLocals )
|
|
{
|
|
hb_memvarValueIncRef( pCBlock->pLocals[ uiLocals ].item.asMemvar.value );
|
|
--uiLocals;
|
|
}
|
|
/* increment a reference counter for the table of local references
|
|
*/
|
|
pCBlock->pLocals[ 0 ].item.asLong.value++;
|
|
}
|
|
}
|
|
else
|
|
pCBlock->pLocals = NULL;
|
|
}
|
|
|
|
/*
|
|
* 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 = pBuffer;
|
|
pCBlock->dynBuffer = FALSE;
|
|
|
|
pCBlock->pDefSymb = hb_stackBaseItem()->item.asSymbol.value;
|
|
pCBlock->pSymbols = pSymbols;
|
|
pCBlock->ulCounter = 1;
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created (%li) %lx", pCBlock->ulCounter, 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 */
|
|
pCBlock->ulCounter = 1;
|
|
|
|
HB_TRACE(HB_TR_INFO, ("codeblock created (%li) %lx", pCBlock->ulCounter, pCBlock));
|
|
|
|
return pCBlock;
|
|
}
|
|
|
|
/* Delete a codeblock
|
|
*/
|
|
void hb_codeblockDelete( HB_ITEM_PTR pItem )
|
|
{
|
|
HB_CODEBLOCK_PTR pCBlock = pItem->item.asBlock.value;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_codeblockDelete(%p)", pItem));
|
|
|
|
if( pCBlock && (--pCBlock->ulCounter == 0) )
|
|
{
|
|
if( pCBlock->pLocals )
|
|
{
|
|
USHORT ui = pCBlock->uiLocals;
|
|
while( ui )
|
|
hb_memvarValueDecRef( pCBlock->pLocals[ ui-- ].item.asMemvar.value );
|
|
/* decrement the table reference counter and release memory if
|
|
* it was the last reference
|
|
*/
|
|
if( --pCBlock->pLocals[ 0 ].item.asLong.value == 0 )
|
|
hb_xfree( pCBlock->pLocals );
|
|
}
|
|
|
|
/* 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 a CODEBLOCK structure
|
|
*/
|
|
hb_gcFree( pCBlock );
|
|
}
|
|
}
|
|
|
|
/* Release all allocated memory when called from the garbage collector
|
|
*/
|
|
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 local variables
|
|
*/
|
|
if( pCBlock->pLocals )
|
|
{
|
|
USHORT ui = 1;
|
|
while( ui <= pCBlock->uiLocals )
|
|
{
|
|
hb_memvarValueDecGarbageRef( pCBlock->pLocals[ ui ].item.asMemvar.value );
|
|
++ui;
|
|
}
|
|
/* decrement the table reference counter and release memory if
|
|
* it was the last reference
|
|
*/
|
|
if( --pCBlock->pLocals[ 0 ].item.asLong.value == 0 )
|
|
{
|
|
hb_xfree( pCBlock->pLocals );
|
|
pCBlock->pLocals = NULL;
|
|
}
|
|
}
|
|
|
|
/* free space allocated for pcodes - if it was a macro-compiled codeblock
|
|
*/
|
|
if( pCBlock->pCode && pCBlock->dynBuffer )
|
|
{
|
|
hb_xfree( pCBlock->pCode );
|
|
pCBlock->pCode = NULL;
|
|
}
|
|
}
|
|
|
|
/* 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 )
|
|
{
|
|
int iStatics = hb_stack.iStatics;
|
|
|
|
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 );
|
|
hb_stack.iStatics = iStatics;
|
|
}
|
|
|
|
/* 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;
|
|
}
|