--- parser3/src/include/pa_opcode.h 2009/04/28 11:09:37 1.30 +++ parser3/src/include/pa_opcode.h 2009/05/23 06:41:01 1.36 @@ -1,7 +1,7 @@ /** @file Parser: compiled code related decls. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -11,10 +11,20 @@ namespace OP { -static const char * const IDENT_OPCODE_H="$Date: 2009/04/28 11:09:37 $"; +static const char * const IDENT_OPCODE_H="$Date: 2009/05/23 06:41:01 $"; -#define OPTIMIZE_BYTECODE_GET_CLASS 1 -#define OPTIMIZE_BYTECODE_GET_ELEMENT 1 +#define OPTIMIZE_BYTECODE_GET_CLASS +#define OPTIMIZE_BYTECODE_GET_ELEMENT // $a ^a +#define OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT // $a.b ^a.b +#define OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT // $a.$b ^a.$b +//#define OPTIMIZE_BYTECODE_STRING_POOL +#define OPTIMIZE_BYTECODE_CUT_REM_OPERATOR // cut rem with all params + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT +#define OPTIMIZE_BYTECODE_CONSTRUCT // $a(1), $.a(1), $a[b], $.a[b] + // $a($b), $.a($b), $a[$b], $.a[$b] +//#define OPTIMIZE_BYTECODE_CALL_CONSTRUCT // $a(^b[]), $.a(^b[]), $a[^b[]], $.a[^b[]] +#endif /// Compiled operation code enum OPCODE { @@ -40,6 +50,14 @@ enum OPCODE { OP_GET_ELEMENT_OR_OPERATOR, #endif OP_GET_ELEMENT, +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + OP_GET_OBJECT_ELEMENT, // $a.b & ^a.b + OP_GET_OBJECT_ELEMENT__WRITE, // $a.b & ^a.b +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + OP_GET_OBJECT_VAR_ELEMENT, // $a.$b & ^a.$b + OP_GET_OBJECT_VAR_ELEMENT__WRITE, // $a.$b & ^a.$b +#endif #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT OP_VALUE__GET_ELEMENT, #endif @@ -48,9 +66,42 @@ enum OPCODE { OP_VALUE__GET_ELEMENT__WRITE, #endif OP_OBJECT_POOL, OP_STRING_POOL, - OP_STORE_PARAM, OP_PREPARE_TO_CONSTRUCT_OBJECT, OP_PREPARE_TO_EXPRESSION, OP_CALL, OP_CALL__WRITE, + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + OP_ROOT_CONSTRUCT_EXPR, // $a(1) + OP_ROOT_ELEMENT_CONSTRUCT_EXPR, // $a($b) + + + + OP_ROOT_CONSTRUCT_VALUE, // $a[b] + OP_ROOT_ELEMENT_CONSTRUCT_VALUE, // $a[$b] + + + + OP_WRITE_CONSTRUCT_EXPR, // $.a(1) + OP_WRITE_ELEMENT_CONSTRUCT_EXPR, // $.a($b) + + + + OP_WRITE_CONSTRUCT_VALUE, // $.a[b] + OP_WRITE_ELEMENT_CONSTRUCT_VALUE, // $.a[$b] +#endif + +#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT + OP_ROOT_CALL_CONSTRUCT_EXPR, // $a(^b[]) + //OP_ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR, // $a(^b.c[]) + + OP_ROOT_CALL_CONSTRUCT_VALUE, // $a[^b[]] + //OP_ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE, // $a[^b.c[]] + + OP_WRITE_CALL_CONSTRUCT_EXPR, // $.a(^b[]) + //OP_WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR, // $.a(^b.c[]) + + OP_WRITE_CALL_CONSTRUCT_VALUE, // $.a[^b[]] + //OP_WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE, // $.a[^b.c[]] +#endif //@} //@{