26617b2472
* harbour/common.mak
* harbour/source/compiler/Makefile
* harbour/source/compiler/hbfix.c
+ harbour/source/compiler/hbopt.c
* divided hbfix.c into two separated functions:
- hb_compFixFuncPCode() which only fix generated PCODE updating
local parameters numbers when PARAMETERS is used
- hb_compOptimizePCode() which makes PCODE optimization
It allows to not execute hb_compFixFuncPCode() when PARAMETERS
is not use and execute hb_compOptimizePCode() more then once in
optimization process.
* harbour/hbgtmk.sh
* updated CVS server name
* harbour/include/hbcomp.h
* harbour/include/hbcompdf.h
* harbour/source/compiler/complex.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.y
* harbour/source/compiler/harbour.yyc
* harbour/source/compiler/hbcomp.c
* harbour/source/compiler/hbgenerr.c
* harbour/source/compiler/hbident.c
* changed code for generating in PCODE line numbers and module names
there was serious problem with line numbers and module names in old
code - in many cases line numbers were not generated at all or
generated in wrong places. Also file module name was not updated
when inside of function some code was included with #include
For such situation now modified version of HB_P_MODULE is generated
with module name only but without function name, f.e.:
HB_P_MODULE "test.prg:"
exactly the same form of HB_P_MODULE is used in xHarbour.
Debugger code should be updated to recognize such HB_P_MODULE version
Ryszard any chance that you can look at it?
And what about syncing with xHarbour debugger?
I can add some missing functions to compiler and HVM but I do not
want to update next peace of code myself. Sorry but I do not have
enough time. I'd prefer to finish some other things I'm working.
If Ryszard is busy can someone else try to port xHarbour debugger
to Harbour?
404 lines
17 KiB
C
404 lines
17 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Compiler main file
|
|
*
|
|
* Copyright 2000 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.
|
|
*
|
|
*/
|
|
#include <assert.h>
|
|
|
|
#include "hbcomp.h"
|
|
|
|
|
|
/* helper structure to pass information */
|
|
typedef struct HB_stru_fix_info
|
|
{
|
|
HB_COMP_DECL;
|
|
} HB_FIX_INFO, * HB_FIX_INFO_PTR;
|
|
|
|
#define HB_FIX_FUNC( func ) HB_PCODE_FUNC( func, HB_FIX_INFO_PTR )
|
|
typedef HB_FIX_FUNC( HB_FIX_FUNC_ );
|
|
typedef HB_FIX_FUNC_ * HB_FIX_FUNC_PTR;
|
|
|
|
|
|
static HB_FIX_FUNC( hb_p_pushblock )
|
|
{
|
|
BYTE * pLocal = &pFunc->pCode[ lPCodePos + 7 ];
|
|
USHORT wVar;
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
/* opcode + codeblock size + number of parameters + number of local variables */
|
|
wVar = HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 5 ] );
|
|
|
|
/* fix local variable's reference */
|
|
while( wVar-- )
|
|
{
|
|
USHORT wLocal = HB_PCODE_MKUSHORT( pLocal ) + pFunc->wParamCount;
|
|
pLocal[ 0 ] = HB_LOBYTE( wLocal );
|
|
pLocal[ 1 ] = HB_HIBYTE( wLocal );
|
|
pLocal += 2;
|
|
}
|
|
|
|
/* only local variables used outside of a codeblock need fixing
|
|
* skip the codeblock body
|
|
*/
|
|
return HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 1 ] );
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_pushblocklarge )
|
|
{
|
|
BYTE * pLocal = &pFunc->pCode[ lPCodePos + 8 ];
|
|
USHORT wVar;
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
/* opcode + codeblock size + number of parameters + number of local variables */
|
|
wVar = HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 6 ] );
|
|
|
|
/* fix local variable's reference */
|
|
while( wVar-- )
|
|
{
|
|
USHORT wLocal = HB_PCODE_MKUSHORT( pLocal ) + pFunc->wParamCount;
|
|
pLocal[ 0 ] = HB_LOBYTE( wLocal );
|
|
pLocal[ 1 ] = HB_HIBYTE( wLocal );
|
|
pLocal += 2;
|
|
}
|
|
|
|
/* only local variables used outside of a codeblock need fixing
|
|
* skip the codeblock body
|
|
*/
|
|
return HB_PCODE_MKUINT24( &pFunc->pCode[ lPCodePos + 1 ] );
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_poplocal )
|
|
{
|
|
BYTE * pVar = &pFunc->pCode[ lPCodePos + 1 ];
|
|
SHORT iVar = HB_PCODE_MKSHORT( pVar );
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
iVar += pFunc->wParamCount;
|
|
pVar[ 0 ] = HB_LOBYTE( iVar );
|
|
pVar[ 1 ] = HB_HIBYTE( iVar );
|
|
|
|
return 3;
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_pushlocal )
|
|
{
|
|
BYTE * pVar = &pFunc->pCode[ lPCodePos + 1 ];
|
|
SHORT iVar = HB_PCODE_MKSHORT( pVar );
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
iVar += pFunc->wParamCount;
|
|
pVar[ 0 ] = HB_LOBYTE( iVar );
|
|
pVar[ 1 ] = HB_HIBYTE( iVar );
|
|
|
|
return 3;
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_pushlocalref )
|
|
{
|
|
BYTE * pVar = &pFunc->pCode[ lPCodePos + 1 ];
|
|
SHORT iVar = HB_PCODE_MKSHORT( pVar );
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
iVar += pFunc->wParamCount;
|
|
pVar[ 0 ] = HB_LOBYTE( iVar );
|
|
pVar[ 1 ] = HB_HIBYTE( iVar );
|
|
|
|
return 3;
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_localaddint )
|
|
{
|
|
BYTE * pVar = &pFunc->pCode[ lPCodePos + 1 ];
|
|
SHORT iVar = HB_PCODE_MKSHORT( pVar );
|
|
|
|
HB_SYMBOL_UNUSED( cargo );
|
|
|
|
iVar += pFunc->wParamCount;
|
|
pVar[ 0 ] = HB_LOBYTE( iVar );
|
|
pVar[ 1 ] = HB_HIBYTE( iVar );
|
|
|
|
return 5;
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_poplocalnear )
|
|
{
|
|
HB_SYMBOL_UNUSED( pFunc );
|
|
HB_SYMBOL_UNUSED( lPCodePos );
|
|
/*
|
|
* this code should never be executed because compiler should
|
|
* generate only non size optimized HB_P_POPLOCAL pcodes
|
|
* for function body
|
|
*/
|
|
hb_compGenError( cargo->HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_OPTIMIZEDLOCAL_OUT_OF_RANGE, "", "" );
|
|
|
|
return 2;
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_pushlocalnear )
|
|
{
|
|
HB_SYMBOL_UNUSED( pFunc );
|
|
HB_SYMBOL_UNUSED( lPCodePos );
|
|
/*
|
|
* this code should never be executed because compiler should
|
|
* generate only non size optimized HB_P_POPLOCAL pcodes
|
|
* for function body
|
|
*/
|
|
hb_compGenError( cargo->HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_OPTIMIZEDLOCAL_OUT_OF_RANGE, "", "" );
|
|
|
|
return 2;
|
|
}
|
|
|
|
static HB_FIX_FUNC( hb_p_localnearaddint )
|
|
{
|
|
HB_SYMBOL_UNUSED( pFunc );
|
|
HB_SYMBOL_UNUSED( lPCodePos );
|
|
/*
|
|
* this code should never be executed because compiler should
|
|
* generate only non size optimized HB_P_POPLOCAL pcodes
|
|
* for function body
|
|
*/
|
|
hb_compGenError( cargo->HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_OPTIMIZEDLOCAL_OUT_OF_RANGE, "", "" );
|
|
|
|
return 4;
|
|
}
|
|
|
|
/* NOTE: The order of functions have to match the order of opcodes
|
|
* mnemonics
|
|
*/
|
|
static HB_FIX_FUNC_PTR s_fixlocals_table[] =
|
|
{
|
|
NULL, /* HB_P_AND, */
|
|
NULL, /* HB_P_ARRAYPUSH, */
|
|
NULL, /* HB_P_ARRAYPOP, */
|
|
NULL, /* HB_P_ARRAYDIM, */
|
|
NULL, /* HB_P_ARRAYGEN, */
|
|
NULL, /* HB_P_EQUAL, */
|
|
NULL, /* HB_P_ENDBLOCK, */
|
|
NULL, /* HB_P_ENDPROC, */
|
|
NULL, /* HB_P_EXACTLYEQUAL, */
|
|
NULL, /* HB_P_FALSE, */
|
|
NULL, /* HB_P_FORTEST, */
|
|
NULL, /* HB_P_FUNCTION, */
|
|
NULL, /* HB_P_FUNCTIONSHORT, */
|
|
NULL, /* HB_P_FRAME, */
|
|
NULL, /* HB_P_FUNCPTR, */
|
|
NULL, /* HB_P_GREATER, */
|
|
NULL, /* HB_P_GREATEREQUAL, */
|
|
NULL, /* HB_P_DEC, */
|
|
NULL, /* HB_P_DIVIDE, */
|
|
NULL, /* HB_P_DO, */
|
|
NULL, /* HB_P_DOSHORT, */
|
|
NULL, /* HB_P_DUPLICATE, */
|
|
NULL, /* HB_P_DUPLTWO, */
|
|
NULL, /* HB_P_INC, */
|
|
NULL, /* HB_P_INSTRING, */
|
|
NULL, /* HB_P_JUMPNEAR, */
|
|
NULL, /* HB_P_JUMP, */
|
|
NULL, /* HB_P_JUMPFAR, */
|
|
NULL, /* HB_P_JUMPFALSENEAR, */
|
|
NULL, /* HB_P_JUMPFALSE, */
|
|
NULL, /* HB_P_JUMPFALSEFAR, */
|
|
NULL, /* HB_P_JUMPTRUENEAR, */
|
|
NULL, /* HB_P_JUMPTRUE, */
|
|
NULL, /* HB_P_JUMPTRUEFAR, */
|
|
NULL, /* HB_P_LESSEQUAL, */
|
|
NULL, /* HB_P_LESS, */
|
|
NULL, /* HB_P_LINE, */
|
|
NULL, /* HB_P_LOCALNAME, */
|
|
NULL, /* HB_P_MACROPOP, */
|
|
NULL, /* HB_P_MACROPOPALIASED, */
|
|
NULL, /* HB_P_MACROPUSH, */
|
|
NULL, /* HB_P_MACROARRAYGEN, */
|
|
NULL, /* HB_P_MACROPUSHLIST, */
|
|
NULL, /* HB_P_MACROPUSHINDEX, */
|
|
NULL, /* HB_P_MACROPUSHPARE, */
|
|
NULL, /* HB_P_MACROPUSHALIASED, */
|
|
NULL, /* HB_P_MACROSYMBOL, */
|
|
NULL, /* HB_P_MACROTEXT, */
|
|
NULL, /* HB_P_MESSAGE, */
|
|
NULL, /* HB_P_MINUS, */
|
|
NULL, /* HB_P_MODULUS, */
|
|
NULL, /* HB_P_MODULENAME, */
|
|
/* start: pcodes generated by macro compiler */
|
|
NULL, /* HB_P_MMESSAGE, */
|
|
NULL, /* HB_P_MPOPALIASEDFIELD, */
|
|
NULL, /* HB_P_MPOPALIASEDVAR, */
|
|
NULL, /* HB_P_MPOPFIELD, */
|
|
NULL, /* HB_P_MPOPMEMVAR, */
|
|
NULL, /* HB_P_MPUSHALIASEDFIELD, */
|
|
NULL, /* HB_P_MPUSHALIASEDVAR, */
|
|
NULL, /* HB_P_MPUSHBLOCK, */
|
|
NULL, /* HB_P_MPUSHFIELD, */
|
|
NULL, /* HB_P_MPUSHMEMVAR, */
|
|
NULL, /* HB_P_MPUSHMEMVARREF, */
|
|
NULL, /* HB_P_MPUSHSYM, */
|
|
NULL, /* HB_P_MPUSHVARIABLE, */
|
|
/* end: */
|
|
NULL, /* HB_P_MULT, */
|
|
NULL, /* HB_P_NEGATE, */
|
|
NULL, /* HB_P_NOOP, */
|
|
NULL, /* HB_P_NOT, */
|
|
NULL, /* HB_P_NOTEQUAL, */
|
|
NULL, /* HB_P_OR, */
|
|
NULL, /* HB_P_PARAMETER, */
|
|
NULL, /* HB_P_PLUS, */
|
|
NULL, /* HB_P_POP, */
|
|
NULL, /* HB_P_POPALIAS, */
|
|
NULL, /* HB_P_POPALIASEDFIELD, */
|
|
NULL, /* HB_P_POPALIASEDFIELDNEAR, */
|
|
NULL, /* HB_P_POPALIASEDVAR, */
|
|
NULL, /* HB_P_POPFIELD, */
|
|
hb_p_poplocal, /* HB_P_POPLOCAL, */
|
|
hb_p_poplocalnear, /* HB_P_POPLOCALNEAR, */
|
|
NULL, /* HB_P_POPMEMVAR, */
|
|
NULL, /* HB_P_POPSTATIC, */
|
|
NULL, /* HB_P_POPVARIABLE, */
|
|
NULL, /* HB_P_POWER, */
|
|
NULL, /* HB_P_PUSHALIAS, */
|
|
NULL, /* HB_P_PUSHALIASEDFIELD, */
|
|
NULL, /* HB_P_PUSHALIASEDFIELDNEAR, */
|
|
NULL, /* HB_P_PUSHALIASEDVAR, */
|
|
hb_p_pushblock, /* HB_P_PUSHBLOCK, */
|
|
NULL, /* HB_P_PUSHBLOCKSHORT, */
|
|
NULL, /* HB_P_PUSHFIELD, */
|
|
NULL, /* HB_P_PUSHBYTE, */
|
|
NULL, /* HB_P_PUSHINT, */
|
|
hb_p_pushlocal, /* HB_P_PUSHLOCAL, */
|
|
hb_p_pushlocalnear, /* HB_P_PUSHLOCALNEAR, */
|
|
hb_p_pushlocalref, /* HB_P_PUSHLOCALREF, */
|
|
NULL, /* HB_P_PUSHLONG, */
|
|
NULL, /* HB_P_PUSHMEMVAR, */
|
|
NULL, /* HB_P_PUSHMEMVARREF, */
|
|
NULL, /* HB_P_PUSHNIL, */
|
|
NULL, /* HB_P_PUSHDOUBLE, */
|
|
NULL, /* HB_P_PUSHSELF, */
|
|
NULL, /* HB_P_PUSHSTATIC, */
|
|
NULL, /* HB_P_PUSHSTATICREF, */
|
|
NULL, /* HB_P_PUSHSTR, */
|
|
NULL, /* HB_P_PUSHSTRSHORT, */
|
|
NULL, /* HB_P_PUSHSYM, */
|
|
NULL, /* HB_P_PUSHSYMNEAR, */
|
|
NULL, /* HB_P_PUSHVARIABLE, */
|
|
NULL, /* HB_P_RETVALUE, */
|
|
NULL, /* HB_P_SEND, */
|
|
NULL, /* HB_P_SENDSHORT, */
|
|
NULL, /* HB_P_SEQBEGIN, */
|
|
NULL, /* HB_P_SEQEND, */
|
|
NULL, /* HB_P_SEQRECOVER, */
|
|
NULL, /* HB_P_SFRAME, */
|
|
NULL, /* HB_P_STATICS, */
|
|
NULL, /* HB_P_STATICNAME, */
|
|
NULL, /* HB_P_SWAPALIAS, */
|
|
NULL, /* HB_P_TRUE, */
|
|
NULL, /* HB_P_ZERO, */
|
|
NULL, /* HB_P_ONE, */
|
|
NULL, /* HB_P_MACROFUNC, */
|
|
NULL, /* HB_P_MACRODO, */
|
|
NULL, /* HB_P_MPUSHSTR, */
|
|
hb_p_localnearaddint, /* HB_P_LOCALNEARADDINT, */
|
|
NULL, /* HB_P_MACROPUSHREF */
|
|
NULL, /* HB_P_PUSHLONGLONG */
|
|
NULL, /* HB_P_ENUMSTART */
|
|
NULL, /* HB_P_ENUMNEXT */
|
|
NULL, /* HB_P_ENUMPREV */
|
|
NULL, /* HB_P_ENUMEND */
|
|
NULL, /* HB_P_SWITCH */
|
|
NULL, /* HB_P_PUSHDATE */
|
|
NULL, /* HB_P_PLUSEQPOP */
|
|
NULL, /* HB_P_MINUSEQPOP */
|
|
NULL, /* HB_P_MULTEQPOP */
|
|
NULL, /* HB_P_DIVEQPOP */
|
|
NULL, /* HB_P_PLUSEQ */
|
|
NULL, /* HB_P_MINUSEQ */
|
|
NULL, /* HB_P_MULTEQ */
|
|
NULL, /* HB_P_DIVEQ */
|
|
NULL, /* HB_P_WITHOBJECTSTART */
|
|
NULL, /* HB_P_WITHOBJECTMESSAGE */
|
|
NULL, /* HB_P_WITHOBJECTEND */
|
|
NULL, /* HB_P_MACROSEND */
|
|
NULL, /* HB_P_PUSHOVARREF */
|
|
NULL, /* HB_P_ARRAYPUSHREF */
|
|
NULL, /* HB_P_VFRAME */
|
|
NULL, /* HB_P_LARGEFRAME */
|
|
NULL, /* HB_P_LARGEVFRAME */
|
|
NULL, /* HB_P_PUSHSTRHIDDEN */
|
|
hb_p_localaddint, /* HB_P_LOCALADDINT */
|
|
NULL, /* HB_P_MODEQPOP */
|
|
NULL, /* HB_P_EXPEQPOP */
|
|
NULL, /* HB_P_MODEQ */
|
|
NULL, /* HB_P_EXPEQ */
|
|
NULL, /* HB_P_DUPLUNREF */
|
|
NULL, /* HB_P_MPUSHBLOCKLARGE */
|
|
NULL, /* HB_P_MPUSHSTRLARGE */
|
|
hb_p_pushblocklarge, /* HB_P_PUSHBLOCKLARGE */
|
|
NULL, /* HB_P_PUSHSTRLARGE */
|
|
NULL, /* HB_P_SWAP */
|
|
NULL, /* HB_P_PUSHVPARAMS */
|
|
NULL, /* HB_P_PUSHUNREF */
|
|
NULL, /* HB_P_SEQALWAYS */
|
|
NULL, /* HB_P_ALWAYSBEGIN */
|
|
NULL /* HB_P_ALWAYSEND */
|
|
};
|
|
|
|
void hb_compFixFuncPCode( HB_COMP_DECL, PFUNCTION pFunc )
|
|
{
|
|
HB_FIX_INFO fix_info;
|
|
|
|
fix_info.HB_COMP_PARAM = HB_COMP_PARAM;
|
|
|
|
assert( HB_P_LAST_PCODE == sizeof( s_fixlocals_table ) / sizeof( HB_FIX_FUNC_PTR ) );
|
|
|
|
hb_compPCodeEval( pFunc, ( HB_PCODE_FUNC_PTR * ) s_fixlocals_table, ( void * ) &fix_info );
|
|
}
|