* src/vm/runner.c
* src/vm/garbage.c
* src/vm/classes.c
* src/rtl/cdpapi.c
* src/rtl/cdpapihb.c
* src/rdd/dbcmd.c
* include/hbapicdp.h
* include/hbapiitm.h
* include/hbextern.ch
* include/hbdefs.h
* include/hbsetup.h
* include/hbapi.h
- Deleted code guarded with (previously disabled) HB_LEGACY_LEVEL2
* include/rdd.api
* include/clipdefs.h
+ Permanently enabled HB_LEGACY_LEVEL2 related changes.
* contrib/xhb/bkgtsks.c
- Deleted HB_OS_WIN_USED. It wasn't used.
* include/hbapi.h
* src/vm/cmdarg.c
* hb_winmainArgGet() changed to not use Windows types.
This function is declared in hbapi.h and this header
shouldn't depend on windows.h.
* include/hbwince.h
* include/hbsetup.h
* HB_OS_HAS_DRIVE_LETTER is now configured in central
place (hbsetup.h) for WinCE platform also.
* include/hbwince.h
* include/hbdefs.h
* Windows (CE and not-CE) specific declarations moved from
hbwince.h to hbdefs.h.
* include/hbdefs.h
% hbwince.h inclusion now better guarded to not include it
for non WinCE platforms.
+ HB_OS_WIN_USED macro will now autodetected by checking
whether windows.h was included before this header.
This is required for hbwince.h. I don't like it, since
hbapi.h still depends on windows.h for WinCE platform,
which still ties us to unnecessary windows.h inclusion
rules. Rather, hbwince.h should be included directly
by .c files when needed and when HB_OS_WIN_CE is defined.
After all this our little Windows API implementation
for compilers which need it.
* include/hbdefs.h
* include/hbwmain.c
+ hb_winmainArgInit() declaration moved to hbwmain.c, the
only place where this is used.
* Deleted HB_EXPORT from hb_winmainArgInit. Pls speak up if
this is wrong. It's possible to move this back to hbdefs.h,
but parameter types should be changed to ANSI ones.
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/gtwvg.h
* contrib/gtwvg/wvggui.c
* contrib/gtwvg/wvgcuig.c
* contrib/gtwvg/wvggui.h
* contrib/gtwvg/wvgwin.c
* contrib/gtwvg/wvgutils.c
* contrib/gtwvg/wvgcore.c
* contrib/gtwvg/wvgwing.c
- Deleted HB_OS_WIN_USED. Now it should work without it.
windows.h was already included in non-official method, so
it's now okay also.
843 lines
24 KiB
C
843 lines
24 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Harbour Portable Object (.hrb) file runner
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
/*
|
|
* The following functions are added Feb 01,2002 by
|
|
* Alexander Kresin <alex@belacy.belgorod.su>
|
|
*
|
|
* HB_HRBLOAD()
|
|
* HB_HRBDO()
|
|
* HB_HRBUNLOAD()
|
|
* HB_HRBGETFUNSYM()
|
|
*/
|
|
|
|
#include "hbvmint.h"
|
|
#include "hbapi.h"
|
|
#include "hbstack.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbapierr.h"
|
|
#include "hbapifs.h"
|
|
#include "hbvm.h"
|
|
#include "hbpcode.h"
|
|
#include "hbset.h"
|
|
#include "hb_io.h"
|
|
#include "hbhrb.ch"
|
|
|
|
typedef struct
|
|
{
|
|
char * szName; /* Name of the function */
|
|
PHB_PCODEFUNC pCodeFunc; /* Dynamic function info */
|
|
HB_BYTE * pCode; /* P-code */
|
|
} HB_DYNF, * PHB_DYNF;
|
|
|
|
typedef struct
|
|
{
|
|
HB_ULONG ulSymbols; /* Number of symbols */
|
|
HB_ULONG ulFuncs; /* Number of functions */
|
|
HB_BOOL fInit; /* should be INIT functions executed */
|
|
HB_BOOL fExit; /* should be EXIT functions executed */
|
|
HB_LONG lSymStart; /* Startup Symbol */
|
|
PHB_SYMB pSymRead; /* Symbols read */
|
|
PHB_DYNF pDynFunc; /* Functions read */
|
|
PHB_SYMBOLS pModuleSymbols;
|
|
} HRB_BODY, * PHRB_BODY;
|
|
|
|
static const HB_BYTE s_szHead[ 4 ] = { 192, 'H', 'R', 'B' };
|
|
|
|
|
|
#define SYM_NOLINK 0 /* symbol does not have to be linked */
|
|
#define SYM_FUNC 1 /* function defined in this module */
|
|
#define SYM_EXTERN 2 /* function defined in other module */
|
|
#define SYM_DEFERRED 3 /* lately bound function */
|
|
#define SYM_NOT_FOUND 0xFFFFFFFFUL /* Symbol not found. */
|
|
|
|
static int hb_hrbReadHead( const char * szBody, HB_SIZE ulBodySize, HB_SIZE * pulBodyOffset )
|
|
{
|
|
const char * pVersion;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_hrbReadHead(%p,%lu,%p)", szBody, ulBodySize, pulBodyOffset ));
|
|
|
|
if( ulBodySize < 6 || memcmp( s_szHead, szBody, 4 ) )
|
|
return 0;
|
|
|
|
pVersion = szBody + 4;
|
|
*pulBodyOffset += 6;
|
|
|
|
return HB_PCODE_MKSHORT( pVersion );
|
|
}
|
|
|
|
static HB_BOOL hb_hrbReadValue( const char * szBody, HB_SIZE ulBodySize, HB_SIZE * pulBodyOffset, HB_ULONG * pulValue )
|
|
{
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_hrbReadValue(%p,%lu,%p,%p)", szBody, ulBodySize, pulBodyOffset, pulValue));
|
|
|
|
if( *pulBodyOffset + 4 < ulBodySize )
|
|
{
|
|
*pulValue = HB_PCODE_MKLONG( szBody + *pulBodyOffset );
|
|
*pulBodyOffset += 4;
|
|
|
|
if( *pulValue <= 0x00FFFFFFUL )
|
|
return HB_TRUE;
|
|
}
|
|
|
|
return HB_FALSE;
|
|
}
|
|
|
|
/* ReadId
|
|
Read the next (zero terminated) identifier */
|
|
static char * hb_hrbReadId( const char * szBody, HB_SIZE ulBodySize, HB_SIZE * ulBodyOffset )
|
|
{
|
|
const char * szIdx;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_hrbReadId(%p,%lu,%p)", szBody, ulBodySize, ulBodyOffset));
|
|
|
|
szIdx = &szBody[ *ulBodyOffset ];
|
|
|
|
do
|
|
{
|
|
if( *ulBodyOffset > ulBodySize )
|
|
return NULL;
|
|
}
|
|
while( szBody[ ( *ulBodyOffset )++ ] );
|
|
|
|
return hb_strdup( szIdx );
|
|
}
|
|
|
|
static HB_ULONG hb_hrbFindSymbol( const char * szName, PHB_DYNF pDynFunc, HB_ULONG ulLoaded )
|
|
{
|
|
HB_ULONG ulRet;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_hrbFindSymbol(%s, %p, %lu)", szName, pDynFunc, ulLoaded));
|
|
|
|
for( ulRet = 0; ulRet < ulLoaded; ++ulRet )
|
|
{
|
|
if( ! strcmp( szName, pDynFunc[ ulRet ].szName ) )
|
|
return ulRet;
|
|
}
|
|
|
|
return SYM_NOT_FOUND;
|
|
}
|
|
|
|
static void hb_hrbInitStatic( PHRB_BODY pHrbBody )
|
|
{
|
|
if( ! pHrbBody->fInit && ! pHrbBody->fExit )
|
|
{
|
|
HB_ULONG ul;
|
|
|
|
pHrbBody->fInit = HB_TRUE;
|
|
/* Initialize static variables first */
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ ) /* Check _INITSTATICS functions */
|
|
{
|
|
if( ( pHrbBody->pSymRead[ ul ].scope.value & HB_FS_INITEXIT ) == HB_FS_INITEXIT )
|
|
{
|
|
/* call (_INITSTATICS) function. This function assigns
|
|
* literal values to static variables only. There is no need
|
|
* to pass any parameters to this function because they
|
|
* cannot be used to initialize static variable.
|
|
*/
|
|
|
|
/* changed to call VM execution instead of direct function address call
|
|
* pHrbBody->pSymRead[ ul ].value.pFunPtr();
|
|
* [MLombardo]
|
|
*/
|
|
|
|
hb_vmPushSymbol( &(pHrbBody->pSymRead[ ul ]) );
|
|
hb_vmPushNil();
|
|
hb_vmProc( 0 );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static void hb_hrbInit( PHRB_BODY pHrbBody, int iPCount, PHB_ITEM * pParams )
|
|
{
|
|
if( pHrbBody->fInit )
|
|
{
|
|
if( hb_vmRequestReenter() )
|
|
{
|
|
HB_ULONG ul;
|
|
int i;
|
|
|
|
pHrbBody->fInit = HB_FALSE;
|
|
pHrbBody->fExit = HB_TRUE;
|
|
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ ) /* Check INIT functions */
|
|
{
|
|
if( ( pHrbBody->pSymRead[ ul ].scope.value & HB_FS_INITEXIT ) == HB_FS_INIT )
|
|
{
|
|
hb_vmPushSymbol( pHrbBody->pSymRead + ul );
|
|
hb_vmPushNil();
|
|
for( i = 0; i < iPCount; i++ )
|
|
hb_vmPush( pParams[ i ] );
|
|
hb_vmProc( ( HB_USHORT ) iPCount );
|
|
if( hb_vmRequestQuery() != 0 )
|
|
break;
|
|
}
|
|
}
|
|
|
|
hb_vmRequestRestore();
|
|
}
|
|
}
|
|
}
|
|
|
|
static void hb_hrbExit( PHRB_BODY pHrbBody )
|
|
{
|
|
if( pHrbBody->fExit )
|
|
{
|
|
if( hb_vmRequestReenter() )
|
|
{
|
|
HB_ULONG ul;
|
|
|
|
pHrbBody->fExit = HB_FALSE;
|
|
pHrbBody->fInit = HB_TRUE;
|
|
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ )
|
|
{
|
|
if( ( pHrbBody->pSymRead[ ul ].scope.value & HB_FS_INITEXIT ) == HB_FS_EXIT )
|
|
{
|
|
hb_vmPushSymbol( pHrbBody->pSymRead + ul );
|
|
hb_vmPushNil();
|
|
hb_vmProc( 0 );
|
|
if( hb_vmRequestQuery() != 0 )
|
|
break;
|
|
}
|
|
}
|
|
|
|
hb_vmRequestRestore();
|
|
}
|
|
}
|
|
}
|
|
|
|
static void hb_hrbUnLoad( PHRB_BODY pHrbBody )
|
|
{
|
|
HB_ULONG ul;
|
|
|
|
hb_hrbExit( pHrbBody );
|
|
|
|
if( pHrbBody->pModuleSymbols )
|
|
{
|
|
hb_vmFreeSymbols( pHrbBody->pModuleSymbols );
|
|
}
|
|
|
|
if( pHrbBody->pDynFunc )
|
|
{
|
|
for( ul = 0; ul < pHrbBody->ulFuncs; ul++ )
|
|
{
|
|
PHB_DYNS pDyn;
|
|
|
|
if( pHrbBody->pDynFunc[ ul ].szName &&
|
|
pHrbBody->pDynFunc[ ul ].pCodeFunc )
|
|
{
|
|
pDyn = hb_dynsymFind( pHrbBody->pDynFunc[ ul ].szName );
|
|
if( pDyn && pDyn->pSymbol->value.pCodeFunc ==
|
|
pHrbBody->pDynFunc[ ul ].pCodeFunc )
|
|
{
|
|
pDyn->pSymbol->value.pCodeFunc = NULL;
|
|
}
|
|
}
|
|
if( pHrbBody->pDynFunc[ ul ].pCodeFunc )
|
|
hb_xfree( pHrbBody->pDynFunc[ ul ].pCodeFunc );
|
|
if( pHrbBody->pDynFunc[ ul ].pCode )
|
|
hb_xfree( pHrbBody->pDynFunc[ ul ].pCode );
|
|
if( pHrbBody->pDynFunc[ ul ].szName )
|
|
hb_xfree( pHrbBody->pDynFunc[ ul ].szName );
|
|
}
|
|
|
|
hb_xfree( pHrbBody->pDynFunc );
|
|
}
|
|
|
|
hb_xfree( pHrbBody );
|
|
}
|
|
|
|
|
|
|
|
static PHRB_BODY hb_hrbLoad( const char * szHrbBody, HB_SIZE ulBodySize, HB_USHORT usMode )
|
|
{
|
|
PHRB_BODY pHrbBody = NULL;
|
|
|
|
if( szHrbBody )
|
|
{
|
|
HB_SIZE ulBodyOffset = 0;
|
|
HB_SIZE ulSize; /* Size of function */
|
|
HB_SIZE ulPos;
|
|
HB_ULONG ul;
|
|
char * buffer, ch;
|
|
HB_USHORT usBind = ( usMode & HB_HRB_BIND_MODEMASK );
|
|
|
|
PHB_SYMB pSymRead; /* Symbols read */
|
|
PHB_DYNF pDynFunc; /* Functions read */
|
|
PHB_DYNS pDynSym;
|
|
|
|
int iVersion = hb_hrbReadHead( szHrbBody, ulBodySize, &ulBodyOffset );
|
|
|
|
if( iVersion == 0 )
|
|
{
|
|
hb_errRT_BASE( EG_CORRUPTION, 9995, NULL, HB_ERR_FUNCNAME, 0 );
|
|
return NULL;
|
|
}
|
|
|
|
pHrbBody = ( PHRB_BODY ) hb_xgrab( sizeof( HRB_BODY ) );
|
|
|
|
pHrbBody->fInit = HB_FALSE;
|
|
pHrbBody->fExit = HB_FALSE;
|
|
pHrbBody->lSymStart = -1;
|
|
pHrbBody->ulFuncs = 0;
|
|
pHrbBody->pSymRead = NULL;
|
|
pHrbBody->pDynFunc = NULL;
|
|
pHrbBody->pModuleSymbols = NULL;
|
|
if( ! hb_hrbReadValue( szHrbBody, ulBodySize, &ulBodyOffset, &pHrbBody->ulSymbols ) ||
|
|
pHrbBody->ulSymbols == 0 )
|
|
{
|
|
hb_hrbUnLoad( pHrbBody );
|
|
hb_errRT_BASE( EG_CORRUPTION, 9996, NULL, HB_ERR_FUNCNAME, 0 );
|
|
return NULL;
|
|
}
|
|
|
|
/* calculate the size of dynamic symbol table */
|
|
ulPos = ulBodyOffset;
|
|
ulSize = 0;
|
|
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ ) /* Read symbols in .hrb */
|
|
{
|
|
while( ulBodyOffset < ulBodySize )
|
|
{
|
|
++ulSize;
|
|
if( szHrbBody[ ulBodyOffset++ ] == 0 )
|
|
break;
|
|
}
|
|
ulBodyOffset += 2;
|
|
if( ulBodyOffset >= ulBodySize )
|
|
{
|
|
hb_hrbUnLoad( pHrbBody );
|
|
hb_errRT_BASE( EG_CORRUPTION, 9997, NULL, HB_ERR_FUNCNAME, 0 );
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
ulBodyOffset = ulPos;
|
|
ul = pHrbBody->ulSymbols * sizeof( HB_SYMB );
|
|
pSymRead = ( PHB_SYMB ) hb_xgrab( ulSize + ul );
|
|
buffer = ( ( char * ) pSymRead ) + ul;
|
|
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ ) /* Read symbols in .hrb */
|
|
{
|
|
pSymRead[ ul ].szName = buffer;
|
|
do
|
|
ch = *buffer++ = szHrbBody[ ulBodyOffset++ ];
|
|
while( ch );
|
|
pSymRead[ ul ].scope.value = ( HB_BYTE ) szHrbBody[ ulBodyOffset++ ];
|
|
pSymRead[ ul ].value.pCodeFunc = ( PHB_PCODEFUNC ) ( HB_PTRDIFF ) szHrbBody[ ulBodyOffset++ ];
|
|
pSymRead[ ul ].pDynSym = NULL;
|
|
|
|
if( pHrbBody->lSymStart == -1 &&
|
|
( pSymRead[ ul ].scope.value & HB_FS_FIRST ) != 0 &&
|
|
( pSymRead[ ul ].scope.value & HB_FS_INITEXIT ) == 0 )
|
|
{
|
|
pHrbBody->lSymStart = ul;
|
|
}
|
|
}
|
|
|
|
/* Read number of functions */
|
|
if( ! hb_hrbReadValue( szHrbBody, ulBodySize, &ulBodyOffset, &pHrbBody->ulFuncs ) )
|
|
{
|
|
hb_xfree( pSymRead );
|
|
hb_hrbUnLoad( pHrbBody );
|
|
hb_errRT_BASE( EG_CORRUPTION, 9997, NULL, HB_ERR_FUNCNAME, 0 );
|
|
return NULL;
|
|
}
|
|
|
|
pHrbBody->pSymRead = pSymRead;
|
|
|
|
if( pHrbBody->ulFuncs )
|
|
{
|
|
pDynFunc = ( PHB_DYNF ) hb_xgrab( pHrbBody->ulFuncs * sizeof( HB_DYNF ) );
|
|
memset( pDynFunc, 0, pHrbBody->ulFuncs * sizeof( HB_DYNF ) );
|
|
pHrbBody->pDynFunc = pDynFunc;
|
|
|
|
for( ul = 0; ul < pHrbBody->ulFuncs; ul++ )
|
|
{
|
|
/* Read name of function */
|
|
pDynFunc[ ul ].szName = hb_hrbReadId( szHrbBody, ulBodySize, &ulBodyOffset );
|
|
if( pDynFunc[ ul ].szName == NULL )
|
|
break;
|
|
|
|
/* Read size of function */
|
|
if( ! hb_hrbReadValue( szHrbBody, ulBodySize, &ulBodyOffset, &ulSize ) ||
|
|
ulBodyOffset + ulSize > ulBodySize )
|
|
break;
|
|
|
|
/* Copy function body */
|
|
pDynFunc[ ul ].pCode = ( HB_BYTE * ) hb_xgrab( ulSize );
|
|
memcpy( ( char * ) pDynFunc[ ul ].pCode, szHrbBody + ulBodyOffset, ulSize );
|
|
ulBodyOffset += ulSize;
|
|
|
|
pDynFunc[ ul ].pCodeFunc = (PHB_PCODEFUNC) hb_xgrab( sizeof( HB_PCODEFUNC ) );
|
|
pDynFunc[ ul ].pCodeFunc->pCode = pDynFunc[ ul ].pCode;
|
|
pDynFunc[ ul ].pCodeFunc->pSymbols = pSymRead;
|
|
}
|
|
|
|
if( ul < pHrbBody->ulFuncs )
|
|
{
|
|
hb_xfree( pSymRead );
|
|
hb_hrbUnLoad( pHrbBody );
|
|
hb_errRT_BASE( EG_CORRUPTION, 9998, NULL, HB_ERR_FUNCNAME, 0 );
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
/* End of PCODE loading, now linking */
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ )
|
|
{
|
|
if( pSymRead[ ul ].value.pCodeFunc == ( PHB_PCODEFUNC ) SYM_FUNC )
|
|
{
|
|
ulPos = hb_hrbFindSymbol( pSymRead[ ul ].szName, pHrbBody->pDynFunc, pHrbBody->ulFuncs );
|
|
|
|
if( ulPos == SYM_NOT_FOUND )
|
|
{
|
|
pSymRead[ ul ].value.pCodeFunc = ( PHB_PCODEFUNC ) SYM_EXTERN;
|
|
}
|
|
else
|
|
{
|
|
pSymRead[ ul ].value.pCodeFunc = ( PHB_PCODEFUNC ) pHrbBody->pDynFunc[ ulPos ].pCodeFunc;
|
|
pSymRead[ ul ].scope.value |= HB_FS_PCODEFUNC | HB_FS_LOCAL |
|
|
( usBind == HB_HRB_BIND_FORCELOCAL ? HB_FS_STATIC : 0 );
|
|
}
|
|
}
|
|
else if( pSymRead[ ul ].value.pCodeFunc == ( PHB_PCODEFUNC ) SYM_DEFERRED )
|
|
{
|
|
pSymRead[ ul ].value.pCodeFunc = ( PHB_PCODEFUNC ) SYM_EXTERN;
|
|
pSymRead[ ul ].scope.value |= HB_FS_DEFERRED;
|
|
}
|
|
|
|
/* External function */
|
|
if( pSymRead[ ul ].value.pCodeFunc == ( PHB_PCODEFUNC ) SYM_EXTERN )
|
|
{
|
|
pSymRead[ ul ].value.pCodeFunc = NULL;
|
|
|
|
pDynSym = hb_dynsymFind( pSymRead[ ul ].szName );
|
|
|
|
if( pDynSym )
|
|
{
|
|
pSymRead[ ul ].value.pFunPtr = pDynSym->pSymbol->value.pFunPtr;
|
|
if( pDynSym->pSymbol->scope.value & HB_FS_PCODEFUNC )
|
|
{
|
|
pSymRead[ ul ].scope.value |= HB_FS_PCODEFUNC;
|
|
}
|
|
}
|
|
else if( ( pSymRead[ ul ].scope.value & HB_FS_DEFERRED ) == 0 )
|
|
{
|
|
if( ( usMode & HB_HRB_BIND_LAZY ) != 0 )
|
|
pSymRead[ ul ].scope.value |= HB_FS_DEFERRED;
|
|
else
|
|
{
|
|
char szName[ HB_SYMBOL_NAME_LEN + 1 ];
|
|
|
|
hb_strncpy( szName, pSymRead[ ul ].szName, sizeof( szName ) - 1 );
|
|
hb_xfree( pSymRead );
|
|
hb_hrbUnLoad( pHrbBody );
|
|
hb_errRT_BASE( EG_ARG, 6101, "Unknown or unregistered symbol", szName, 0 );
|
|
return NULL;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if( hb_vmLockModuleSymbols() )
|
|
{
|
|
if( usBind == HB_HRB_BIND_LOCAL || usBind == HB_HRB_BIND_OVERLOAD )
|
|
{
|
|
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ )
|
|
{
|
|
if( ( pSymRead[ ul ].scope.value &
|
|
( HB_FS_LOCAL | HB_FS_STATIC ) ) == HB_FS_LOCAL )
|
|
{
|
|
pDynSym = hb_dynsymFind( pSymRead[ ul ].szName );
|
|
if( pDynSym )
|
|
{
|
|
if( usBind == HB_HRB_BIND_LOCAL )
|
|
{
|
|
/* convert public function to static one */
|
|
pSymRead[ ul ].scope.value |= HB_FS_STATIC;
|
|
}
|
|
else
|
|
{
|
|
/* overload existing public function */
|
|
hb_vmSetFunction( pDynSym->pSymbol, &pSymRead[ ul ] );
|
|
pDynSym->pSymbol = &pSymRead[ ul ];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
pHrbBody->pModuleSymbols = hb_vmRegisterSymbols( pHrbBody->pSymRead,
|
|
( HB_USHORT ) pHrbBody->ulSymbols, "pcode.hrb", 0, HB_TRUE, HB_FALSE );
|
|
|
|
if( pHrbBody->pModuleSymbols->pModuleSymbols != pSymRead )
|
|
{
|
|
/*
|
|
* Old unused symbol table has been recycled - free the one
|
|
* we allocated and disactivate static initialization [druzus]
|
|
*/
|
|
pHrbBody->pSymRead = pHrbBody->pModuleSymbols->pModuleSymbols;
|
|
hb_xfree( pSymRead );
|
|
|
|
pHrbBody->fInit = HB_TRUE;
|
|
}
|
|
else
|
|
{
|
|
/* mark symbol table as dynamically allocated so HVM will free it on exit */
|
|
pHrbBody->pModuleSymbols->fAllocated = HB_TRUE;
|
|
|
|
/* initialize static variables */
|
|
hb_hrbInitStatic( pHrbBody );
|
|
}
|
|
hb_vmUnlockModuleSymbols();
|
|
}
|
|
else
|
|
{
|
|
hb_xfree( pSymRead );
|
|
hb_hrbUnLoad( pHrbBody );
|
|
pHrbBody = NULL;
|
|
}
|
|
}
|
|
|
|
return pHrbBody;
|
|
}
|
|
|
|
static PHRB_BODY hb_hrbLoadFromFile( const char * szHrb, HB_USHORT usMode )
|
|
{
|
|
char szFileName[ HB_PATH_MAX ];
|
|
PHRB_BODY pHrbBody = NULL;
|
|
PHB_FNAME pFileName;
|
|
HB_FHANDLE hFile;
|
|
|
|
/* Create full filename */
|
|
|
|
pFileName = hb_fsFNameSplit( szHrb );
|
|
if( pFileName->szExtension == NULL && hb_stackSetStruct()->HB_SET_DEFEXTENSIONS )
|
|
{
|
|
pFileName->szExtension = ".hrb";
|
|
}
|
|
hb_fsFNameMerge( szFileName, pFileName );
|
|
hb_xfree( pFileName );
|
|
|
|
/* Open as binary */
|
|
|
|
do
|
|
{
|
|
hFile = hb_fsOpen( szFileName, FO_READ );
|
|
}
|
|
while( hFile == FS_ERROR &&
|
|
hb_errRT_BASE_Ext1( EG_OPEN, 6102, NULL, szFileName, hb_fsError(),
|
|
EF_CANDEFAULT | EF_CANRETRY,
|
|
HB_ERR_ARGS_BASEPARAMS ) == E_RETRY );
|
|
|
|
if( hFile != FS_ERROR )
|
|
{
|
|
HB_SIZE ulBodySize = hb_fsSeek( hFile, 0, FS_END );
|
|
|
|
if( ulBodySize )
|
|
{
|
|
char * pbyBuffer;
|
|
|
|
pbyBuffer = ( char * ) hb_xgrab( ulBodySize + sizeof( char ) + 1 );
|
|
hb_fsSeek( hFile, 0, FS_SET );
|
|
hb_fsReadLarge( hFile, pbyBuffer, ulBodySize );
|
|
pbyBuffer[ ulBodySize ] = '\0';
|
|
|
|
pHrbBody = hb_hrbLoad( ( const char * ) pbyBuffer, ulBodySize, usMode );
|
|
hb_xfree( pbyBuffer );
|
|
}
|
|
hb_fsClose( hFile );
|
|
}
|
|
|
|
return pHrbBody;
|
|
}
|
|
|
|
static void hb_hrbDo( PHRB_BODY pHrbBody, int iPCount, PHB_ITEM * pParams )
|
|
{
|
|
PHB_ITEM pRetVal = NULL;
|
|
int i;
|
|
|
|
hb_hrbInit( pHrbBody, iPCount, pParams );
|
|
|
|
/* May not have a startup symbol, if first symbol was an INIT Symbol (was executed already).*/
|
|
if( pHrbBody->lSymStart >= 0 && hb_vmRequestQuery() == 0 )
|
|
{
|
|
hb_vmPushSymbol( &pHrbBody->pSymRead[ pHrbBody->lSymStart ] );
|
|
hb_vmPushNil();
|
|
|
|
for( i = 0; i < iPCount; i++ )
|
|
hb_vmPush( pParams[ i ] );
|
|
|
|
hb_vmProc( ( HB_USHORT ) iPCount );
|
|
|
|
pRetVal = hb_itemNew( NULL );
|
|
hb_itemMove( pRetVal, hb_stackReturnItem() );
|
|
}
|
|
|
|
hb_hrbExit( pHrbBody );
|
|
|
|
if( pRetVal )
|
|
{
|
|
hb_itemReturnRelease( pRetVal );
|
|
}
|
|
}
|
|
|
|
/* HRB module destructor */
|
|
static HB_GARBAGE_FUNC( hb_hrb_Destructor )
|
|
{
|
|
PHRB_BODY * pHrbPtr = ( PHRB_BODY * ) Cargo;
|
|
|
|
if( *pHrbPtr )
|
|
{
|
|
hb_hrbUnLoad( *pHrbPtr );
|
|
*pHrbPtr = NULL;
|
|
}
|
|
}
|
|
|
|
static const HB_GC_FUNCS s_gcHrbFuncs =
|
|
{
|
|
hb_hrb_Destructor,
|
|
hb_gcDummyMark
|
|
};
|
|
|
|
static PHRB_BODY hb_hrbParam( int iParam )
|
|
{
|
|
PHRB_BODY * pHrbPtr = ( PHRB_BODY * ) hb_parptrGC( &s_gcHrbFuncs, iParam );
|
|
|
|
return pHrbPtr ? *pHrbPtr : NULL;
|
|
}
|
|
|
|
static void hb_hrbReturn( PHRB_BODY pHrbBody )
|
|
{
|
|
PHRB_BODY * pHrbPtr = ( PHRB_BODY * ) hb_gcAllocate( sizeof( PHRB_BODY ),
|
|
&s_gcHrbFuncs );
|
|
*pHrbPtr = pHrbBody;
|
|
hb_retptrGC( pHrbPtr );
|
|
}
|
|
|
|
/*
|
|
HB_HRBRUN( [ <nOptions>, ] <cHrb> [, <xparams,...> ] ) -> <retVal>
|
|
|
|
This program will get the data from the .hrb file and run the p-code
|
|
contained in it.
|
|
|
|
In due time it should also be able to collect the data from the
|
|
binary/executable itself
|
|
*/
|
|
HB_FUNC( HB_HRBRUN )
|
|
{
|
|
HB_USHORT usMode = HB_HRB_BIND_DEFAULT;
|
|
HB_USHORT nParam = 1;
|
|
HB_SIZE ulLen;
|
|
|
|
if( HB_ISNUM( 1 ) )
|
|
{
|
|
usMode = ( HB_USHORT ) hb_parni( 1 );
|
|
nParam++;
|
|
}
|
|
|
|
ulLen = hb_parclen( nParam );
|
|
|
|
if( ulLen > 0 )
|
|
{
|
|
const char * fileOrBody = hb_parc( nParam );
|
|
PHRB_BODY pHrbBody;
|
|
|
|
if( ulLen > 4 && memcmp( s_szHead, fileOrBody, 4 ) == 0 )
|
|
pHrbBody = hb_hrbLoad( fileOrBody, ulLen, usMode );
|
|
else
|
|
pHrbBody = hb_hrbLoadFromFile( fileOrBody, usMode );
|
|
|
|
if( pHrbBody )
|
|
{
|
|
int iPCount = hb_pcount() - nParam, i;
|
|
PHB_ITEM * pParams = NULL;
|
|
|
|
if( iPCount > 0 )
|
|
{
|
|
pParams = ( PHB_ITEM * ) hb_xgrab( sizeof( PHB_ITEM ) * iPCount );
|
|
for( i = 0; i < iPCount; i++ )
|
|
pParams[ i ] = hb_stackItemFromBase( i + 1 + nParam );
|
|
}
|
|
|
|
hb_hrbDo( pHrbBody, iPCount, pParams );
|
|
|
|
if( pParams )
|
|
hb_xfree( pParams );
|
|
|
|
hb_hrbUnLoad( pHrbBody );
|
|
}
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 6103, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
/* HB_HRBLOAD( [ <nOptions>, ] <cHrb> [, <xparams,...> ] ) */
|
|
|
|
HB_FUNC( HB_HRBLOAD )
|
|
{
|
|
HB_USHORT usMode = HB_HRB_BIND_DEFAULT;
|
|
HB_USHORT nParam = 1;
|
|
HB_SIZE ulLen;
|
|
|
|
if( HB_ISNUM( 1 ) )
|
|
{
|
|
usMode = ( HB_USHORT ) hb_parni( 1 );
|
|
nParam++;
|
|
}
|
|
|
|
ulLen = hb_parclen( nParam );
|
|
|
|
if( ulLen > 0 )
|
|
{
|
|
const char * fileOrBody = hb_parc( nParam );
|
|
PHRB_BODY pHrbBody;
|
|
|
|
if( ulLen > 4 && memcmp( s_szHead, fileOrBody, 4 ) == 0 )
|
|
pHrbBody = hb_hrbLoad( fileOrBody, ulLen, usMode );
|
|
else
|
|
pHrbBody = hb_hrbLoadFromFile( fileOrBody, usMode );
|
|
|
|
if( pHrbBody )
|
|
{
|
|
int iPCount = hb_pcount() - nParam;
|
|
PHB_ITEM * pParams = NULL;
|
|
int i;
|
|
|
|
if( iPCount > 0 )
|
|
{
|
|
pParams = ( PHB_ITEM * ) hb_xgrab( sizeof( PHB_ITEM ) * iPCount );
|
|
|
|
for( i = 0; i < iPCount; i++ )
|
|
pParams[ i ] = hb_stackItemFromBase( i + 1 + nParam );
|
|
}
|
|
|
|
hb_hrbInit( pHrbBody, iPCount, pParams );
|
|
|
|
if( pParams )
|
|
hb_xfree( pParams );
|
|
}
|
|
hb_hrbReturn( pHrbBody );
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 9998, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_HRBDO )
|
|
{
|
|
PHRB_BODY pHrbBody = hb_hrbParam( 1 );
|
|
|
|
if( pHrbBody )
|
|
{
|
|
int iPCount = hb_pcount() - 1;
|
|
PHB_ITEM * pParams = NULL;
|
|
int i;
|
|
|
|
if( iPCount > 0 )
|
|
{
|
|
pParams = ( PHB_ITEM * ) hb_xgrab( sizeof( PHB_ITEM ) * iPCount );
|
|
|
|
for( i = 0; i < iPCount; i++ )
|
|
pParams[ i ] = hb_stackItemFromBase( i + 2 );
|
|
}
|
|
|
|
hb_hrbDo( pHrbBody, iPCount, pParams );
|
|
|
|
if( pParams )
|
|
hb_xfree( pParams );
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 6104, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_HRBUNLOAD )
|
|
{
|
|
PHRB_BODY * pHrbPtr = ( PHRB_BODY * ) hb_parptrGC( &s_gcHrbFuncs, 1 );
|
|
|
|
if( pHrbPtr )
|
|
{
|
|
PHRB_BODY pHrbBody = *pHrbPtr;
|
|
|
|
if( pHrbBody )
|
|
{
|
|
*pHrbPtr = NULL;
|
|
hb_hrbUnLoad( pHrbBody );
|
|
}
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 6105, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|
|
|
|
HB_FUNC( HB_HRBGETFUNSYM )
|
|
{
|
|
PHRB_BODY pHrbBody = hb_hrbParam( 1 );
|
|
const char * szName = hb_parc( 2 );
|
|
|
|
if( pHrbBody && szName )
|
|
{
|
|
PHB_SYMB pSym;
|
|
HB_ULONG ulPos;
|
|
|
|
for( ulPos = 0, pSym = pHrbBody->pSymRead; ulPos < pHrbBody->ulSymbols; ++pSym, ++ulPos )
|
|
{
|
|
if( pSym->value.pFunPtr != NULL && hb_stricmp( szName, pSym->szName ) == 0 )
|
|
{
|
|
hb_itemPutSymbol( hb_stackReturnItem(), pSym );
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
hb_errRT_BASE( EG_ARG, 6106, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
|
|
}
|