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

2012-11-22 12:46 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* include/hbvmpub.h
  * src/vm/hvm.c
  * src/vm/macro.c
  * src/vm/memvars.c
    % deleted synonym type HB_DYNS_PTR (change it to PHB_DYNS)
      INCOMPATIBLE
This commit is contained in:
Viktor Szakats
2012-11-22 11:50:33 +00:00
parent e686d70a00
commit 385cc9f0fb
5 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -10,9 +10,17 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-22 12:46 UTC+0100 Viktor Szakats (harbour syenar.net)
* include/hbvmpub.h
* src/vm/hvm.c
* src/vm/macro.c
* src/vm/memvars.c
% deleted synonym type HB_DYNS_PTR (change it to PHB_DYNS)
INCOMPATIBLE
2012-11-22 12:39 UTC+0100 Viktor Szakats (harbour syenar.net)
* include/hbapifs.h
% deleted type HB_FNAME_PTR (change it to PHB_FNAME)
% deleted synonym type HB_FNAME_PTR (change it to PHB_FNAME)
INCOMPATIBLE
* include/hbapi.h

5
harbour/include/hbvmpub.h
View File

@@ -146,7 +146,7 @@ struct _HB_SYMB;
HB_ULONG ulTime; /* profiler support */
HB_ULONG ulRecurse; /* profiler support */
# endif /* !HB_NO_PROFILER */
} HB_DYNS, * PHB_DYNS, * HB_DYNS_PTR;
} HB_DYNS, * PHB_DYNS;
/* pCode dynamic function - HRB */
typedef struct _HB_PCODEFUNC
@@ -189,10 +189,9 @@ struct _HB_SYMB;
typedef struct
{
struct _HB_SYMB * pSymbol; /* pointer to its relative local symbol */
} _HB_DYNS, * PHB_DYNS, * HB_DYNS_PTR;
} _HB_DYNS, * PHB_DYNS;
#else
typedef void * PHB_DYNS;
typedef void * PHB_DYNS_PTR;
#endif
#endif /* !_HB_API_INTERNAL_ */

48
harbour/src/vm/hvm.c
View File

@@ -2615,64 +2615,64 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MMESSAGE:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPushSymbol( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPOPALIASEDFIELD:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPopAliasedField( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPOPALIASEDVAR:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPopAliasedVar( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPOPFIELD:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
/* Pops a value from the eval stack and uses it to set
* a new value of the given field
*/
hb_rddPutFieldValue( ( hb_stackItemFromTop( -1 ) ), pDynSym->pSymbol );
hb_stackPop();
HB_TRACE( HB_TR_INFO, ( "(hb_vmMPopField)" ) );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPOPMEMVAR:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_memvarSetValue( pDynSym->pSymbol, hb_stackItemFromTop( -1 ) );
hb_stackPop();
HB_TRACE( HB_TR_INFO, ( "(hb_vmMPopMemvar)" ) );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPUSHALIASEDFIELD:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPushAliasedField( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPUSHALIASEDVAR:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPushAliasedVar( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
@@ -2714,46 +2714,46 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols )
case HB_P_MPUSHFIELD:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
/* It pushes the current value of the given field onto the eval stack
*/
hb_rddGetFieldValue( hb_stackAllocItem(), pDynSym->pSymbol );
HB_TRACE( HB_TR_INFO, ( "(hb_vmMPushField)" ) );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPUSHMEMVAR:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_memvarGetValue( hb_stackAllocItem(), pDynSym->pSymbol );
HB_TRACE( HB_TR_INFO, ( "(hb_vmMPushMemvar)" ) );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPUSHMEMVARREF:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_memvarGetRefer( hb_stackAllocItem(), pDynSym->pSymbol );
HB_TRACE( HB_TR_INFO, ( "(hb_vmMPushMemvarRef)" ) );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPUSHSYM:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPushSymbol( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}
case HB_P_MPUSHVARIABLE:
{
HB_DYNS_PTR pDynSym = ( HB_DYNS_PTR ) HB_GET_PTR( pCode + 1 );
PHB_DYNS pDynSym = ( PHB_DYNS ) HB_GET_PTR( pCode + 1 );
hb_vmPushVariable( pDynSym->pSymbol );
pCode += sizeof( HB_DYNS_PTR ) + 1;
pCode += sizeof( PHB_DYNS ) + 1;
break;
}

14
harbour/src/vm/macro.c
View File

@@ -1002,7 +1002,7 @@ void hb_macroPushSymbol( PHB_ITEM pItem )
&fNewBuffer );
if( szString )
{
HB_DYNS_PTR pDynSym = hb_dynsymGetCase( szString );
PHB_DYNS pDynSym = hb_dynsymGetCase( szString );
if( fNewBuffer )
hb_xfree( szString ); /* free space allocated in hb_macroTextSymbol */
@@ -1317,8 +1317,8 @@ void hb_macroGenJumpHere( HB_SIZE nOffset, HB_COMP_DECL )
*/
static void hb_macroMemvarGenPCode( HB_BYTE bPCode, const char * szVarName, HB_COMP_DECL )
{
HB_BYTE byBuf[ sizeof( HB_DYNS_PTR ) + 1 ];
HB_DYNS_PTR pSym;
HB_BYTE byBuf[ sizeof( PHB_DYNS ) + 1 ];
PHB_DYNS pSym;
if( HB_MACRO_DATA->Flags & HB_MACRO_GEN_TYPE )
{
@@ -1345,8 +1345,8 @@ static void hb_macroMemvarGenPCode( HB_BYTE bPCode, const char * szVarName, HB_C
/* generates the pcode to push a symbol on the virtual machine stack */
void hb_macroGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP_DECL )
{
HB_BYTE byBuf[ sizeof( HB_DYNS_PTR ) + 1 ];
HB_DYNS_PTR pSym;
HB_BYTE byBuf[ sizeof( PHB_DYNS ) + 1 ];
PHB_DYNS pSym;
if( HB_MACRO_DATA->Flags & HB_MACRO_GEN_TYPE )
{
@@ -1441,11 +1441,11 @@ void hb_macroGenMessage( const char * szMsgName, HB_BOOL bIsObject, HB_COMP_DECL
{
if( szMsgName )
{
HB_BYTE byBuf[ sizeof( HB_DYNS_PTR ) + 1 ];
HB_BYTE byBuf[ sizeof( PHB_DYNS ) + 1 ];
/* Find the address of passed symbol - create the symbol if doesn't exist
*/
HB_DYNS_PTR pSym = hb_dynsymGetCase( szMsgName );
PHB_DYNS pSym = hb_dynsymGetCase( szMsgName );
byBuf[ 0 ] = HB_P_MMESSAGE;
HB_PUT_PTR( &byBuf[ 1 ], pSym );

24
harbour/src/vm/memvars.c
View File

@@ -87,9 +87,9 @@
struct mv_PUBLIC_var_info
{
int iPos;
HB_BOOL bFound;
HB_DYNS_PTR pDynSym;
int iPos;
HB_BOOL bFound;
PHB_DYNS pDynSym;
};
struct mv_memvarArray_info
@@ -542,9 +542,9 @@ void hb_memvarNewParameter( PHB_SYMB pSymbol, PHB_ITEM pValue )
hb_memvarCreateFromDynSymbol( pSymbol->pDynSym, VS_PRIVATE, pValue );
}
static HB_DYNS_PTR hb_memvarFindSymbol( const char * szArg, HB_SIZE nLen )
static PHB_DYNS hb_memvarFindSymbol( const char * szArg, HB_SIZE nLen )
{
HB_DYNS_PTR pDynSym = NULL;
PHB_DYNS pDynSym = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hb_memvarFindSymbol(%p,%" HB_PFS "u)", szArg, nLen ) );
@@ -588,7 +588,7 @@ static HB_DYNS_PTR hb_memvarFindSymbol( const char * szArg, HB_SIZE nLen )
char * hb_memvarGetStrValuePtr( char * szVarName, HB_SIZE * pnLen )
{
HB_DYNS_PTR pDynVar;
PHB_DYNS pDynVar;
char * szValue = NULL;
HB_TRACE( HB_TR_DEBUG, ( "hb_memvarGetStrValuePtr(%s, %p)", szVarName, pnLen ) );
@@ -967,7 +967,7 @@ static PHB_ITEM hb_memvarDebugVariable( int iScope, int iPos, const char ** pszN
HB_STACK_TLS_PRELOAD
if( ( HB_SIZE ) iPos < hb_stackGetPrivateStack()->count )
{
HB_DYNS_PTR pDynSym = hb_stackGetPrivateStack()->stack[ iPos ].pDynSym;
PHB_DYNS pDynSym = hb_stackGetPrivateStack()->stack[ iPos ].pDynSym;
pValue = hb_dynsymGetMemvar( pDynSym );
*pszName = pDynSym->pSymbol->szName;
@@ -1256,8 +1256,8 @@ HB_FUNC( __MVGET )
if( pName )
{
HB_STACK_TLS_PRELOAD
HB_DYNS_PTR pDynVar = hb_memvarFindSymbol( pName->item.asString.value,
pName->item.asString.length );
PHB_DYNS pDynVar = hb_memvarFindSymbol( pName->item.asString.value,
pName->item.asString.length );
if( pDynVar )
{
@@ -1313,8 +1313,8 @@ HB_FUNC( __MVPUT )
{
/* the first parameter is a string with not empty variable name
*/
HB_DYNS_PTR pDynVar = hb_memvarFindSymbol( pName->item.asString.value,
pName->item.asString.length );
PHB_DYNS pDynVar = hb_memvarFindSymbol( pName->item.asString.value,
pName->item.asString.length );
if( pDynVar )
{
/* variable was declared somwhere - assign a new value
@@ -1697,7 +1697,7 @@ HB_FUNC( __MVRESTORE )
if( bIncludeMask ? bMatch : ! bMatch )
{
/* the first parameter is a string with not empty variable name */
HB_DYNS_PTR pDynVar = hb_memvarFindSymbol( szName, strlen( szName ) );
PHB_DYNS pDynVar = hb_memvarFindSymbol( szName, strlen( szName ) );
if( pDynVar )
/* variable was declared somwhere - assign a new value */