fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-02-08 22:45 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

Browse Source
This commit is contained in:
Alexander S.Kresin
2002-02-08 19:44:35 +00:00
parent 1874f5f620
commit 482f6db155
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -7,6 +7,13 @@
For example:
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-02-09 14:12 UTC-0800 Ron Pinkas <ron@ronpinkas.com>
* source/compiler/hbgenerr.c
! Fixed incorrect position of "4Suspicious operand type: \'unknown\' expected: \'%s\'".
2002-02-09 20:10 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
* source/vm/runner.c
* Few bugs fixed, related to errors handling
2002-02-09 16:04 UTC+0100 Maurilio Longo <maurilio.longo@libero.it>
* source/rtl/dbedit.prg

5
harbour/include/hbextern.ch
View File

@@ -426,6 +426,11 @@ EXTERNAL __ERRINHANDLER
EXTERNAL __ERRRT_BASE
EXTERNAL __ERRRT_SBASE
EXTERNAL __HRBRUN
EXTERNAL __HRBLOAD
EXTERNAL __HRBDO
EXTERNAL __HRBUNLOAD
EXTERNAL __HRBGETFU
EXTERNAL __HRBDOFU
EXTERNAL __MVCLEAR
EXTERNAL __MVDBGINFO
EXTERNAL __MVEXIST

33
harbour/source/vm/runner.c
View File

@@ -50,7 +50,7 @@
*
*/
/*
* The following functions are added Feb 01,2002 by
* The following functions are added Feb 01,2002 by
* Alexander Kresin <alex@belacy.belgorod.su>
*
* __HRBLOAD()
@@ -91,7 +91,6 @@ static BYTE prgFunction[] =
/* #elseif ... */
/* #endif */
typedef union
{
BYTE * pAsmData; /* The assembler bytes */
@@ -257,7 +256,7 @@ HB_FUNC( __HRBDOFU )
hb_vmPushNil();
for( i = 0; i < argc-1; i++ ) /* Push other params */
hb_vmPush( hb_param( i + 2, HB_IT_ANY ) );
hb_vmSend( argc-1 ); /* Run function */
}
else
@@ -320,14 +319,15 @@ PHRB_BODY hb_hrbLoad( char* szHrb )
pSymRead[ ul ].pFunPtr = ( PHB_FUNC ) ( ULONG ) hb_hrbFileReadByte( file, szFileName );
pSymRead[ ul ].pDynSym = NULL;
if ( pHrbBody->ulSymStart == -1 &&
pSymRead[ ul ].cScope & HB_FS_FIRST &&
if ( pHrbBody->ulSymStart == -1 &&
pSymRead[ ul ].cScope & HB_FS_FIRST &&
! ( pSymRead[ ul ].cScope & HB_FS_INITEXIT ) )
pHrbBody->ulSymStart = ul;
}
pHrbBody->ulFuncs = hb_hrbFileReadLong( file, szFileName ); /* Read number of functions */
pDynFunc = ( PHB_DYNF ) hb_xgrab( pHrbBody->ulFuncs * sizeof( HB_DYNF ) );
memset( pDynFunc, 0, pHrbBody->ulFuncs * sizeof( HB_DYNF ) );
for( ul = 0; ul < pHrbBody->ulFuncs; ul++ ) /* Read symbols in .HRB */
{
pDynFunc[ ul ].szName = hb_hrbFileReadId( file, szFileName );
@@ -342,6 +342,8 @@ PHRB_BODY hb_hrbLoad( char* szHrb )
/* function */
}
pHrbBody->pSymRead = pSymRead;
pHrbBody->pDynFunc = pDynFunc;
s_ulSymEntry = 0;
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ ) /* Linker */
{
@@ -369,8 +371,10 @@ PHRB_BODY hb_hrbLoad( char* szHrb )
pDynSym = hb_dynsymFind( pSymRead[ ul ].szName );
if( !pDynSym )
{
char szName[21];
strncpy( szName,pSymRead[ ul ].szName,20 );
hb_hrbUnLoad( pHrbBody );
hb_errRT_BASE( EG_ARG, 9999, "Unknown or unregistered symbol", pSymRead[ ul ].szName, 0 );
hb_errRT_BASE( EG_ARG, 9999, "Unknown or unregistered symbol", szName, 0 );
bError = TRUE;
break;
}
@@ -382,11 +386,6 @@ PHRB_BODY hb_hrbLoad( char* szHrb )
hb_hrbUnLoad( pHrbBody );
pHrbBody = NULL;
}
else
{
pHrbBody->pSymRead = pSymRead;
pHrbBody->pDynFunc = pDynFunc;
}
hb_hrbFileClose( file );
}
@@ -423,7 +422,7 @@ void hb_hrbDo( PHRB_BODY pHrbBody, int argc, char * argv[] )
hb_vmPushNil();
for( i = 0; i < argc; i++ ) /* Push other cmdline params*/
hb_vmPushString( argv[i],strlen(argv[i]) );
hb_vmSend( argc ); /* Run init function */
}
}
@@ -465,9 +464,9 @@ void hb_hrbUnLoad( PHRB_BODY pHrbBody )
for( ul = 0; ul < pHrbBody->ulFuncs; ul++ )
{
hb_xfree( pHrbBody->pDynFunc[ ul ].pAsmCall->pAsmData );
hb_xfree( pHrbBody->pDynFunc[ ul ].pAsmCall );
hb_xfree( pHrbBody->pDynFunc[ ul ].pCode );
hb_xfree( pHrbBody->pDynFunc[ ul ].szName );
hb_xfree( pHrbBody->pDynFunc[ ul ].pAsmCall );
hb_xfree( pHrbBody->pDynFunc[ ul ].pCode );
hb_xfree( pHrbBody->pDynFunc[ ul ].szName );
}
for( ul = 0; ul < pHrbBody->ulSymbols; ul++ )
@@ -512,8 +511,8 @@ static int hb_hrbFileReadHead( FILE * file, char * szFileName )
HB_TRACE(HB_TR_DEBUG, ("hb_hrbFileReadHead(%p)", file ));
hb_hrbFileRead( file, szFileName, (char *) szBuf, 1, 4 );
if( strncmp( (char *) szHead, (char *) szBuf, 4 ) )
hb_hrbFileRead( file, szFileName, szBuf, 1, 4 );
if( strncmp( szHead,szBuf,4 ) )
{
hb_errRT_BASE_Ext1( EG_CORRUPTION, 9999, NULL, szFileName, 0, EF_CANDEFAULT, 1, hb_paramError( 1 ) );
return 0;