48f8dba263
* harbour/include/hbgtinfo.ch
* harbour/contrib/libct/ctwin.c
* harbour/source/rtl/gtalleg/gtalleg.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
+ added support for GTI_FULLSCREEN, GTI_KBDSUPPORT, GTI_ISCTWIN
* harbour/source/rtl/hbgtcore.c
! fixed line and box drawing when the coordinates are out of screen size
* harbour/include/hbapi.h
* harbour/include/hbcomp.h
* harbour/include/hbpcode.h
* harbour/include/hbstack.h
* harbour/include/hbvm.h
* harbour/include/hbxvm.h
* harbour/source/compiler/complex.c
* harbour/source/compiler/genc.c
* harbour/source/compiler/gencc.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.y
* harbour/source/compiler/harbour.yyc
* harbour/source/compiler/harbour.yyh
* harbour/source/compiler/hbdead.c
* harbour/source/compiler/hbfix.c
* harbour/source/compiler/hblbl.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/hbstripl.c
* harbour/source/vm/classes.c
* harbour/source/vm/estack.c
* harbour/source/vm/hvm.c
* harbour/source/vm/itemapi.c
! added protection against cyclic references in arrays
* eliminated action parameter from hb_vmRequestReenter() /
hb_vmRequestRestore()
* moved s_lRecoverBase and s_uiActionRequest to HB_STACK structure
for future MT HVM version
+ added internal item structure hb_struRecover - it's not real item
but this structure is used to keep information about BEGIN SEQUENCE
data - it reduce HB_STACK usage
+ added support for ALWAYS clause in BEGIN SEQUENCE
The syntax is:
BEGIN SEQUENCE
<code>
[ RECOVER [ USING oErr ] ]
<recoverCode>
[ ALWAYS ]
<alwaysCode>
END [ SEQUENCE ]
It's guaranteed that <alwaysCode> is _ALWAYS_ executed even if
inside <code> or <recoverCode> some new exceptions like RETURN,
BREAK or QUIT will appear.
Please note that when the following code is executed:
BEGIN SEQUENCE
<code>
ALWAYS
<alwaysCode>
END
(without RECOVER clause) then BREAK exception inside <code> is not
recovered, <alwaysCode> is executed and then BREAK exception is
passed to outer BEGIN SEQUENCE. This is the same semantic as
used in TRY / [ CATCH ] / FINALLY / END
Those of you who prefer to use TRY / CATCH / FINALLY / END instead
of BEGIN SEQUENCE / RECOVER / ALWAYS / END can simply add to your
source code:
#command TRY => BEGIN SEQUENCE
#command CATCH [ oErr ] => RECOVER [ USING <oErr> ]
and:
errorBlock( {|oErr| break( oErr ) } )
Though instead of 'break( oErr )' I suggest to use some small function
which will support some basic recovery/substitute operations like in
default errorsys() and LockErrHandler() to not break existing code
which may depends on the default behavior.
If you want I can add direct support for TRY / CATCH / FINALLY / END
but I'm not sure it's really necessary.
Please note also that in Harbour ALWAYS code is execute even for QUIT
excpetion.
When <alwaysCode> is executed current exception is stored and restored
when is finished. If new exception appears inside <alwaysCode> then
restored exception depends on the priority in the following order:
QUIT // highest priority
BREAK
RETURN
If both exceptions have the same priority and contain additional value
(error object in BREAK or return value in RETURN) then the recently set
one is restored. It's similar behavior to destructor code.
* harbour/source/common/hbstr.c
* moved one character length string table (hb_szAscii) from hvm.c
to use it also in compiler and preprocessor
* harbour/source/compiler/ppcomp.c
* harbour/source/pp/ppcore.c
* harbour/source/pp/pplib.c
* tuned error messages to be more Clipper compatible
% use static strings from hb_szAscii
* harbour/source/rtl/alert.prg
* use hb_gtInfo( GTI_FULLSCREEN ) to detect type of GT driver
! some minor fixes
TOFIX: we have to also use GTI_ISCTWIN or add window allocation
to standard GT drivers to be Clipper compatible when CTWIN
is used - In Clipper Tools ALERT() works in differ way then
the standard one. It creates separate window box to display
data, supports SETKEY(), etc. I'll think about adding some
extended support for ALERT() and similar operations (f.e.
separate debugger windows) to GT API so it will be also
possible to overload standard alert() command by GUI message
box in GTGUI and similar GT drivers.
* harbour/source/rtl/binnumx.c
! fixed U2BIN() - wrong casting
600 lines
23 KiB
C
600 lines
23 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* dead (unaccessible) PCODE eliminator
|
|
*
|
|
* Copyright 2006 Przemyslaw Czerpak < druzus /at/ priv.onet.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.
|
|
*
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
#include "hbcomp.h"
|
|
|
|
|
|
/* helper structure to pass information */
|
|
typedef struct _HB_CODETRACE_INFO
|
|
{
|
|
BYTE * pCodeMark;
|
|
ULONG * plJumps;
|
|
ULONG ulJumpPos;
|
|
ULONG ulJumpSize;
|
|
ULONG ulJumpCount;
|
|
ULONG ulPCodeSize;
|
|
BOOL fFinished;
|
|
} HB_CODETRACE_INFO, * PHB_CODETRACE_INFO;
|
|
|
|
#define HB_CODETRACE_FUNC( func ) HB_PCODE_FUNC( func, PHB_CODETRACE_INFO )
|
|
typedef HB_CODETRACE_FUNC( HB_CODETRACE_FUNC_ );
|
|
typedef HB_CODETRACE_FUNC_ * PHB_CODETRACE_FUNC;
|
|
|
|
#define HB_JUMPADDR_ALLOC 64
|
|
|
|
|
|
static void hb_compCodeTraceAddJump( PHB_CODETRACE_INFO pInfo, ULONG ulPCodePos )
|
|
{
|
|
if( pInfo->pCodeMark[ ulPCodePos ] == 0 )
|
|
{
|
|
if( pInfo->ulJumpSize == 0 )
|
|
{
|
|
pInfo->ulJumpSize = HB_JUMPADDR_ALLOC;
|
|
pInfo->plJumps = ( ULONG * ) hb_xgrab( pInfo->ulJumpSize *
|
|
sizeof( ULONG ) );
|
|
}
|
|
else if( pInfo->ulJumpSize == pInfo->ulJumpCount )
|
|
{
|
|
pInfo->ulJumpSize += HB_JUMPADDR_ALLOC;
|
|
pInfo->plJumps = ( ULONG * ) hb_xrealloc( pInfo->plJumps,
|
|
pInfo->ulJumpSize * sizeof( ULONG ) );
|
|
}
|
|
pInfo->plJumps[ pInfo->ulJumpCount++ ] = ulPCodePos;
|
|
pInfo->pCodeMark[ ulPCodePos ] = 1;
|
|
}
|
|
}
|
|
|
|
static ULONG hb_compCodeTraceNextPos( PHB_CODETRACE_INFO pInfo, ULONG ulPCodePos )
|
|
{
|
|
if( ulPCodePos < pInfo->ulPCodeSize && pInfo->pCodeMark[ ulPCodePos ] == 0 )
|
|
return ulPCodePos;
|
|
|
|
while( pInfo->ulJumpPos < pInfo->ulJumpCount )
|
|
{
|
|
ulPCodePos = pInfo->plJumps[ pInfo->ulJumpPos++ ];
|
|
if( pInfo->pCodeMark[ ulPCodePos ] == 1 )
|
|
return ulPCodePos;
|
|
}
|
|
|
|
pInfo->fFinished = TRUE;
|
|
return pInfo->ulPCodeSize;
|
|
}
|
|
|
|
static void hb_compCodeTraceMark( PHB_CODETRACE_INFO pInfo, ULONG ulPCodePos, ULONG ulSize )
|
|
{
|
|
memset( &pInfo->pCodeMark[ ulPCodePos ], 2, ulSize );
|
|
}
|
|
|
|
/*
|
|
* PCODE trace functions
|
|
*/
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_default )
|
|
{
|
|
ULONG ulSize = hb_compPCodeSize( pFunc, lPCodePos );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, ulSize );
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + ulSize );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumpnear )
|
|
{
|
|
ULONG ulNewPos = lPCodePos + ( signed char ) pFunc->pCode[ lPCodePos + 1 ];
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 2 );
|
|
return hb_compCodeTraceNextPos( cargo, ulNewPos );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jump )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKSHORT( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 3 );
|
|
return hb_compCodeTraceNextPos( cargo, ulNewPos );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumpfar )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
return hb_compCodeTraceNextPos( cargo, ulNewPos );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumpfalsenear )
|
|
{
|
|
ULONG ulNewPos = lPCodePos + ( signed char ) pFunc->pCode[ lPCodePos + 1 ];
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 2 );
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 2 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumpfalse )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKSHORT( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 3 );
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 3 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumpfalsefar )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 4 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumptruenear )
|
|
{
|
|
ULONG ulNewPos = lPCodePos + ( signed char ) pFunc->pCode[ lPCodePos + 1 ];
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 2 );
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 2 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumptrue )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKSHORT( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 3 );
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 3 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_jumptruefar )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 4 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_seqalways )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulAlwaysPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
hb_compCodeTraceAddJump( cargo, ulAlwaysPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 4 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_alwaysbegin )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulAlwaysEndPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
hb_compCodeTraceAddJump( cargo, ulAlwaysEndPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 4 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_seqbegin )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulRecoverPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
/* this is a hack for -gc3 output - it's not really necessary
|
|
* for pure PCODE evaluation
|
|
*/
|
|
if( pFunc->pCode[ ulRecoverPos ] != HB_P_SEQEND &&
|
|
pFunc->pCode[ ulRecoverPos - 4 ] == HB_P_SEQEND )
|
|
{
|
|
hb_compCodeTraceAddJump( cargo, ulRecoverPos - 4 );
|
|
}
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
hb_compCodeTraceAddJump( cargo, ulRecoverPos );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos + 4 );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_seqend )
|
|
{
|
|
BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ];
|
|
ULONG ulNewPos = lPCodePos + HB_PCODE_MKINT24( pAddr );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 4 );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, ulNewPos );
|
|
}
|
|
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_switch )
|
|
{
|
|
USHORT usCases = HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 1 ] ), us;
|
|
ULONG ulStart = lPCodePos, ulNewPos;
|
|
|
|
lPCodePos += 3;
|
|
for( us = 0; us < usCases; ++us )
|
|
{
|
|
switch( pFunc->pCode[ lPCodePos ] )
|
|
{
|
|
case HB_P_PUSHBYTE:
|
|
lPCodePos += 2;
|
|
break;
|
|
case HB_P_PUSHINT:
|
|
lPCodePos += 3;
|
|
break;
|
|
case HB_P_PUSHLONG:
|
|
case HB_P_PUSHDATE:
|
|
lPCodePos += 5;
|
|
break;
|
|
case HB_P_PUSHLONGLONG:
|
|
lPCodePos += 9;
|
|
break;
|
|
case HB_P_PUSHSTRSHORT:
|
|
lPCodePos += 2 + pFunc->pCode[ lPCodePos + 1 ];
|
|
break;
|
|
case HB_P_PUSHSTR:
|
|
lPCodePos += 3 + HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 1 ] );
|
|
break;
|
|
case HB_P_PUSHSTRLARGE:
|
|
lPCodePos += 4 + HB_PCODE_MKUINT24( &pFunc->pCode[ lPCodePos + 1 ] );
|
|
break;
|
|
case HB_P_PUSHNIL:
|
|
/* default clause */
|
|
us = usCases;
|
|
lPCodePos++;
|
|
break;
|
|
}
|
|
switch( pFunc->pCode[ lPCodePos ] )
|
|
{
|
|
case HB_P_JUMPNEAR:
|
|
ulNewPos = lPCodePos + ( signed char ) pFunc->pCode[ lPCodePos + 1 ];
|
|
lPCodePos += 2;
|
|
break;
|
|
case HB_P_JUMP:
|
|
ulNewPos = lPCodePos + HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] );
|
|
lPCodePos += 3;
|
|
break;
|
|
/*case HB_P_JUMPFAR:*/
|
|
default:
|
|
ulNewPos = lPCodePos + HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] );
|
|
lPCodePos += 4;
|
|
break;
|
|
}
|
|
hb_compCodeTraceAddJump( cargo, ulNewPos );
|
|
}
|
|
hb_compCodeTraceMark( cargo, ulStart, lPCodePos - ulStart );
|
|
|
|
return hb_compCodeTraceNextPos( cargo, lPCodePos );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_endblock )
|
|
{
|
|
HB_SYMBOL_UNUSED( pFunc );
|
|
HB_SYMBOL_UNUSED( lPCodePos );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 1 );
|
|
return hb_compCodeTraceNextPos( cargo, cargo->ulPCodeSize );
|
|
}
|
|
|
|
static HB_CODETRACE_FUNC( hb_p_endproc )
|
|
{
|
|
HB_SYMBOL_UNUSED( pFunc );
|
|
HB_SYMBOL_UNUSED( lPCodePos );
|
|
|
|
hb_compCodeTraceMark( cargo, lPCodePos, 1 );
|
|
return hb_compCodeTraceNextPos( cargo, cargo->ulPCodeSize );
|
|
}
|
|
|
|
/* NOTE: The order of functions have to match the order of opcodes
|
|
* mnemonics
|
|
*/
|
|
static PHB_CODETRACE_FUNC s_codeTraceFuncTable[ HB_P_LAST_PCODE ] =
|
|
{
|
|
hb_p_default, /* HB_P_AND, */
|
|
hb_p_default, /* HB_P_ARRAYPUSH, */
|
|
hb_p_default, /* HB_P_ARRAYPOP, */
|
|
hb_p_default, /* HB_P_ARRAYDIM, */
|
|
hb_p_default, /* HB_P_ARRAYGEN, */
|
|
hb_p_default, /* HB_P_EQUAL, */
|
|
hb_p_endblock, /* HB_P_ENDBLOCK, */
|
|
hb_p_endproc, /* HB_P_ENDPROC, */
|
|
hb_p_default, /* HB_P_EXACTLYEQUAL, */
|
|
hb_p_default, /* HB_P_FALSE, */
|
|
hb_p_default, /* HB_P_FORTEST, */
|
|
hb_p_default, /* HB_P_FUNCTION, */
|
|
hb_p_default, /* HB_P_FUNCTIONSHORT, */
|
|
hb_p_default, /* HB_P_FRAME, */
|
|
hb_p_default, /* HB_P_FUNCPTR, */
|
|
hb_p_default, /* HB_P_GREATER, */
|
|
hb_p_default, /* HB_P_GREATEREQUAL, */
|
|
hb_p_default, /* HB_P_DEC, */
|
|
hb_p_default, /* HB_P_DIVIDE, */
|
|
hb_p_default, /* HB_P_DO, */
|
|
hb_p_default, /* HB_P_DOSHORT, */
|
|
hb_p_default, /* HB_P_DUPLICATE, */
|
|
hb_p_default, /* HB_P_DUPLTWO, */
|
|
hb_p_default, /* HB_P_INC, */
|
|
hb_p_default, /* HB_P_INSTRING, */
|
|
hb_p_jumpnear, /* HB_P_JUMPNEAR, */
|
|
hb_p_jump, /* HB_P_JUMP, */
|
|
hb_p_jumpfar, /* HB_P_JUMPFAR, */
|
|
hb_p_jumpfalsenear, /* HB_P_JUMPFALSENEAR, */
|
|
hb_p_jumpfalse, /* HB_P_JUMPFALSE, */
|
|
hb_p_jumpfalsefar, /* HB_P_JUMPFALSEFAR, */
|
|
hb_p_jumptruenear, /* HB_P_JUMPTRUENEAR, */
|
|
hb_p_jumptrue, /* HB_P_JUMPTRUE, */
|
|
hb_p_jumptruefar, /* HB_P_JUMPTRUEFAR, */
|
|
hb_p_default, /* HB_P_LESSEQUAL, */
|
|
hb_p_default, /* HB_P_LESS, */
|
|
hb_p_default, /* HB_P_LINE, */
|
|
hb_p_default, /* HB_P_LOCALNAME, */
|
|
hb_p_default, /* HB_P_MACROPOP, */
|
|
hb_p_default, /* HB_P_MACROPOPALIASED, */
|
|
hb_p_default, /* HB_P_MACROPUSH, */
|
|
hb_p_default, /* HB_P_MACROARRAYGEN, */
|
|
hb_p_default, /* HB_P_MACROPUSHLIST, */
|
|
hb_p_default, /* HB_P_MACROPUSHINDEX, */
|
|
hb_p_default, /* HB_P_MACROPUSHPARE, */
|
|
hb_p_default, /* HB_P_MACROPUSHALIASED, */
|
|
hb_p_default, /* HB_P_MACROSYMBOL, */
|
|
hb_p_default, /* HB_P_MACROTEXT, */
|
|
hb_p_default, /* HB_P_MESSAGE, */
|
|
hb_p_default, /* HB_P_MINUS, */
|
|
hb_p_default, /* HB_P_MODULUS, */
|
|
hb_p_default, /* HB_P_MODULENAME, */
|
|
/* start: pcodes generated by macro compiler */
|
|
hb_p_default, /* HB_P_MMESSAGE, */
|
|
hb_p_default, /* HB_P_MPOPALIASEDFIELD, */
|
|
hb_p_default, /* HB_P_MPOPALIASEDVAR, */
|
|
hb_p_default, /* HB_P_MPOPFIELD, */
|
|
hb_p_default, /* HB_P_MPOPMEMVAR, */
|
|
hb_p_default, /* HB_P_MPUSHALIASEDFIELD, */
|
|
hb_p_default, /* HB_P_MPUSHALIASEDVAR, */
|
|
hb_p_default, /* HB_P_MPUSHBLOCK, */
|
|
hb_p_default, /* HB_P_MPUSHFIELD, */
|
|
hb_p_default, /* HB_P_MPUSHMEMVAR, */
|
|
hb_p_default, /* HB_P_MPUSHMEMVARREF, */
|
|
hb_p_default, /* HB_P_MPUSHSYM, */
|
|
hb_p_default, /* HB_P_MPUSHVARIABLE, */
|
|
/* end: */
|
|
hb_p_default, /* HB_P_MULT, */
|
|
hb_p_default, /* HB_P_NEGATE, */
|
|
hb_p_default, /* HB_P_NOOP, */
|
|
hb_p_default, /* HB_P_NOT, */
|
|
hb_p_default, /* HB_P_NOTEQUAL, */
|
|
hb_p_default, /* HB_P_OR, */
|
|
hb_p_default, /* HB_P_PARAMETER, */
|
|
hb_p_default, /* HB_P_PLUS, */
|
|
hb_p_default, /* HB_P_POP, */
|
|
hb_p_default, /* HB_P_POPALIAS, */
|
|
hb_p_default, /* HB_P_POPALIASEDFIELD, */
|
|
hb_p_default, /* HB_P_POPALIASEDFIELDNEAR, */
|
|
hb_p_default, /* HB_P_POPALIASEDVAR, */
|
|
hb_p_default, /* HB_P_POPFIELD, */
|
|
hb_p_default, /* HB_P_POPLOCAL, */
|
|
hb_p_default, /* HB_P_POPLOCALNEAR, */
|
|
hb_p_default, /* HB_P_POPMEMVAR, */
|
|
hb_p_default, /* HB_P_POPSTATIC, */
|
|
hb_p_default, /* HB_P_POPVARIABLE, */
|
|
hb_p_default, /* HB_P_POWER, */
|
|
hb_p_default, /* HB_P_PUSHALIAS, */
|
|
hb_p_default, /* HB_P_PUSHALIASEDFIELD, */
|
|
hb_p_default, /* HB_P_PUSHALIASEDFIELDNEAR, */
|
|
hb_p_default, /* HB_P_PUSHALIASEDVAR, */
|
|
hb_p_default, /* HB_P_PUSHBLOCK, */
|
|
hb_p_default, /* HB_P_PUSHBLOCKSHORT, */
|
|
hb_p_default, /* HB_P_PUSHFIELD, */
|
|
hb_p_default, /* HB_P_PUSHBYTE, */
|
|
hb_p_default, /* HB_P_PUSHINT, */
|
|
hb_p_default, /* HB_P_PUSHLOCAL, */
|
|
hb_p_default, /* HB_P_PUSHLOCALNEAR, */
|
|
hb_p_default, /* HB_P_PUSHLOCALREF, */
|
|
hb_p_default, /* HB_P_PUSHLONG, */
|
|
hb_p_default, /* HB_P_PUSHMEMVAR, */
|
|
hb_p_default, /* HB_P_PUSHMEMVARREF, */
|
|
hb_p_default, /* HB_P_PUSHNIL, */
|
|
hb_p_default, /* HB_P_PUSHDOUBLE, */
|
|
hb_p_default, /* HB_P_PUSHSELF, */
|
|
hb_p_default, /* HB_P_PUSHSTATIC, */
|
|
hb_p_default, /* HB_P_PUSHSTATICREF, */
|
|
hb_p_default, /* HB_P_PUSHSTR, */
|
|
hb_p_default, /* HB_P_PUSHSTRSHORT, */
|
|
hb_p_default, /* HB_P_PUSHSYM, */
|
|
hb_p_default, /* HB_P_PUSHSYMNEAR, */
|
|
hb_p_default, /* HB_P_PUSHVARIABLE, */
|
|
hb_p_default, /* HB_P_RETVALUE, */
|
|
hb_p_default, /* HB_P_SEND, */
|
|
hb_p_default, /* HB_P_SENDSHORT, */
|
|
hb_p_seqbegin, /* HB_P_SEQBEGIN, */
|
|
hb_p_seqend, /* HB_P_SEQEND, */
|
|
hb_p_default, /* HB_P_SEQRECOVER, */
|
|
hb_p_default, /* HB_P_SFRAME, */
|
|
hb_p_default, /* HB_P_STATICS, */
|
|
hb_p_default, /* HB_P_STATICNAME, */
|
|
hb_p_default, /* HB_P_SWAPALIAS, */
|
|
hb_p_default, /* HB_P_TRUE, */
|
|
hb_p_default, /* HB_P_ZERO, */
|
|
hb_p_default, /* HB_P_ONE, */
|
|
hb_p_default, /* HB_P_MACROFUNC, */
|
|
hb_p_default, /* HB_P_MACRODO, */
|
|
hb_p_default, /* HB_P_MPUSHSTR, */
|
|
hb_p_default, /* HB_P_LOCALNEARADDINT, */
|
|
hb_p_default, /* HB_P_MACROPUSHREF */
|
|
hb_p_default, /* HB_P_PUSHLONGLONG */
|
|
hb_p_default, /* HB_P_ENUMSTART */
|
|
hb_p_default, /* HB_P_ENUMNEXT */
|
|
hb_p_default, /* HB_P_ENUMPREV */
|
|
hb_p_default, /* HB_P_ENUMEND */
|
|
hb_p_switch, /* HB_P_SWITCH */
|
|
hb_p_default, /* HB_P_PUSHDATE */
|
|
/* optimalization of inlined math operations */
|
|
hb_p_default, /* HB_P_PLUSEQPOP */
|
|
hb_p_default, /* HB_P_MINUSEQPOP */
|
|
hb_p_default, /* HB_P_MULTEQPOP */
|
|
hb_p_default, /* HB_P_DIVEQPOP */
|
|
hb_p_default, /* HB_P_PLUSEQ */
|
|
hb_p_default, /* HB_P_MINUSEQ */
|
|
hb_p_default, /* HB_P_MULTEQ */
|
|
hb_p_default, /* HB_P_DIVEQ */
|
|
hb_p_default, /* HB_P_WITHOBJECTSTART */
|
|
hb_p_default, /* HB_P_WITHOBJECTMESSAGE */
|
|
hb_p_default, /* HB_P_WITHOBJECTEND */
|
|
hb_p_default, /* HB_P_MACROSEND */
|
|
hb_p_default, /* HB_P_PUSHOVARREF */
|
|
hb_p_default, /* HB_P_ARRAYPUSHREF */
|
|
hb_p_default, /* HB_P_VFRAME */
|
|
hb_p_default, /* HB_P_LARGEFRAME */
|
|
hb_p_default, /* HB_P_LARGEVFRAME */
|
|
hb_p_default, /* HB_P_PUSHSTRHIDDEN */
|
|
hb_p_default, /* HB_P_LOCALADDINT */
|
|
hb_p_default, /* HB_P_MODEQPOP */
|
|
hb_p_default, /* HB_P_EXPEQPOP */
|
|
hb_p_default, /* HB_P_MODEQ */
|
|
hb_p_default, /* HB_P_EXPEQ */
|
|
hb_p_default, /* HB_P_DUPLUNREF */
|
|
hb_p_default, /* HB_P_MPUSHBLOCKLARGE */
|
|
hb_p_default, /* HB_P_MPUSHSTRLARGE */
|
|
hb_p_default, /* HB_P_PUSHBLOCKLARGE */
|
|
hb_p_default, /* HB_P_PUSHSTRLARGE */
|
|
hb_p_default, /* HB_P_SWAP */
|
|
hb_p_default, /* HB_P_PUSHVPARAMS */
|
|
hb_p_default, /* HB_P_PUSHUNREF */
|
|
hb_p_seqalways, /* HB_P_SEQALWAYS */
|
|
hb_p_alwaysbegin, /* HB_P_ALWAYSBEGIN */
|
|
hb_p_default /* HB_P_ALWAYSEND */
|
|
};
|
|
|
|
void hb_compCodeTraceMarkDead( HB_COMP_DECL, PFUNCTION pFunc )
|
|
{
|
|
HB_CODETRACE_INFO code_info;
|
|
|
|
if( ! HB_COMP_ISSUPPORTED( HB_COMPFLAG_OPTJUMP ) || pFunc->lPCodePos < 2 )
|
|
return;
|
|
|
|
assert( HB_P_LAST_PCODE == sizeof( s_codeTraceFuncTable ) / sizeof( PHB_CODETRACE_FUNC ) );
|
|
|
|
code_info.plJumps = NULL;
|
|
code_info.ulJumpPos = 0;
|
|
code_info.ulJumpSize = 0;
|
|
code_info.ulJumpCount = 0;
|
|
code_info.ulPCodeSize = pFunc->lPCodePos;
|
|
code_info.fFinished = FALSE;
|
|
|
|
code_info.pCodeMark = ( BYTE * ) hb_xgrab( code_info.ulPCodeSize );
|
|
memset( code_info.pCodeMark, 0, code_info.ulPCodeSize );
|
|
|
|
hb_compPCodeTrace( pFunc, ( HB_PCODE_FUNC_PTR * ) s_codeTraceFuncTable, ( void * ) &code_info );
|
|
|
|
if( code_info.fFinished )
|
|
{
|
|
ULONG ulPos = 0, ulCount = 0;
|
|
BYTE bLastCode = HB_P_LAST_PCODE;
|
|
|
|
do
|
|
{
|
|
if( code_info.pCodeMark[ ulPos ] == 0 )
|
|
++ulCount;
|
|
else
|
|
{
|
|
bLastCode = pFunc->pCode[ ulPos ];
|
|
if( ulCount )
|
|
{
|
|
hb_compNOOPfill( pFunc, ulPos - ulCount, ulCount, FALSE, TRUE );
|
|
ulCount = 0;
|
|
}
|
|
}
|
|
}
|
|
while( ++ulPos < code_info.ulPCodeSize );
|
|
|
|
/* do not strip the last HB_P_ENDBLOCK / HB_P_ENDPROC marker */
|
|
if( ulCount > 0 && bLastCode != ( pFunc->szName ? HB_P_ENDPROC : HB_P_ENDBLOCK ) )
|
|
{
|
|
--ulPos;
|
|
--ulCount;
|
|
}
|
|
|
|
if( ulCount > 0 )
|
|
{
|
|
/*
|
|
* We cannot simply decrease size of the generated PCODE here
|
|
* because jumps or noops tables may point to the this area
|
|
* and we will have to update also the jump table, [druzus]
|
|
*/
|
|
/*
|
|
pFunc->pCode[ ulPos - ulCount ] = pFunc->pCode[ ulPos - 1 ];
|
|
pFunc->lPCodePos = pFunc->lPCodeSize = ulPos - ulCount + 1;
|
|
*/
|
|
hb_compNOOPfill( pFunc, ulPos - ulCount, ulCount, FALSE, TRUE );
|
|
}
|
|
}
|
|
|
|
hb_xfree( code_info.pCodeMark );
|
|
if( code_info.plJumps )
|
|
hb_xfree( code_info.plJumps );
|
|
}
|