--- parser3/src/main/compile_tools.h 2009/04/17 09:03:25 1.82 +++ parser3/src/main/compile_tools.h 2009/06/07 13:15:54 1.96 @@ -8,7 +8,7 @@ #ifndef COMPILE_TOOLS #define COMPILE_TOOLS -static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2009/04/17 09:03:25 $"; +static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2009/06/07 13:15:54 $"; #include "pa_opcode.h" #include "pa_types.h" @@ -84,7 +84,6 @@ public: bool in_call_value; bool explicit_result; bool append; - bool write_to_result; //@} /// output: filled input 'methods' and 'error' if any @@ -115,8 +114,7 @@ public: ls_sp(0), in_call_value(false), explicit_result(false), - append(false), - write_to_result(false) { + append(false) { *cclasses+=aclass; } @@ -203,6 +201,11 @@ inline void P(ArrayOperation& result, Ar result.append(code_array, offset); } +/// aPpend part of 'code_array', starting from offset, to 'result' +inline void P(ArrayOperation& result, ArrayOperation& code_array, int offset, int limit) { + result.append(code_array, offset, limit); +} + /// append cOde Array inline void OA(ArrayOperation& result, OP::OPCODE code, ArrayOperation* code_array) { result+=Operation(code); // append OP_CODE @@ -228,10 +231,10 @@ inline ArrayOperation* VL(Value* value, } /// Literal Array to(2) Value @return Value from literal Array OP+origin+Value -Value* LA2V(ArrayOperation& literal_string_array, int offset=0); +Value* LA2V(ArrayOperation& literal_string_array, int offset=0, OP::OPCODE code=OP::OP_VALUE); /// Literal Array to(2) String @return String value from literal Array OP+origin+String array -inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0) { - if(Value* value=LA2V(literal_string_array, offset)) +inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0, OP::OPCODE code=OP::OP_VALUE) { + if(Value* value=LA2V(literal_string_array, offset, code)) return value->get_string(); return 0; } @@ -240,7 +243,6 @@ inline void change_string_literal_to_wri literal_string_array.put(0, OP::OP_STRING__WRITE); } - void maybe_change_string_literal_to_double_literal(ArrayOperation& literal_string_array); void change_string_literal_value(ArrayOperation& literal_string_array, const String& new_value); @@ -248,6 +250,135 @@ void change_string_literal_value(ArrayOp void changetail_or_append(ArrayOperation& opcodes, OP::OPCODE find, bool with_argument, OP::OPCODE replace, OP::OPCODE notfound); +bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace); + + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT +// OP_VALUE+origin+value+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT => OP_GET_OBJECT_ELEMENT+origin+value+origin+value +inline bool maybe_make_get_object_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){ + if(divine_count<8) + return false; + + assert(diving_code[0].code==OP::OP_VALUE); + if( + diving_code[3].code==OP::OP_GET_ELEMENT + && diving_code[4].code==OP::OP_VALUE + && diving_code[7].code==OP::OP_GET_ELEMENT + ){ + O(opcodes, OP::OP_GET_OBJECT_ELEMENT); + P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy first origin+value + P(opcodes, diving_code, 5, 2); // second origin+value + if(divine_count>8) + P(opcodes, diving_code, 8/*offset*/); // tail + return true; + } + return false; +} +#endif + + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT +// OP_VALUE+origin+value+OP_GET_ELEMENT+OP_WITH_READ+OP_VALUE+origin+value+OP_GET_ELEMENT+OP_GET_ELEMENT => OP_GET_OBJECT_VAR_ELEMENT+origin+value+origin+value +inline bool maybe_make_get_object_var_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){ + if(divine_count<10) + return false; + + assert(diving_code[0].code==OP::OP_VALUE); + if( + diving_code[3].code==OP::OP_GET_ELEMENT + && diving_code[4].code==OP::OP_WITH_READ + && diving_code[5].code==OP::OP_VALUE + && diving_code[8].code==OP::OP_GET_ELEMENT + && diving_code[9].code==OP::OP_GET_ELEMENT + ){ + O(opcodes, OP::OP_GET_OBJECT_VAR_ELEMENT); + P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy first origin+value + P(opcodes, diving_code, 6, 2); // second origin+value + if(divine_count>10) + P(opcodes, diving_code, 10/*offset*/); // tail + return true; + } + return false; +} +#endif + + +bool maybe_make_self(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count); + + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT +inline bool maybe_optimize_construct(ArrayOperation& opcodes, ArrayOperation& var_ops, ArrayOperation& expr_ops){ + size_t expr_count=expr_ops.count(); + OP::OPCODE construct_op=expr_ops[expr_count-1].code; + size_t construct=(construct_op==OP::OP_CONSTRUCT_VALUE)?0x01:(construct_op==OP::OP_CONSTRUCT_EXPR)?0x02:0x00; + if(construct){ + P(opcodes, expr_ops, 0/*offset*/, expr_count-1/*limit*/); // copy constructor body without CONSTRUCT_(VALUE|EXPR) + + size_t with=0x00; + switch(var_ops[0].code){ + case OP::OP_WITH_ROOT: + { + with=0x10; + break; + } + case OP::OP_WITH_WRITE: + { + with=0x20; + break; + } + case OP::OP_WITH_SELF: + { + with=0x30; + break; + } + } + + if(with && var_ops[1].code==OP::OP_VALUE && var_ops.count()==4){ + OP::OPCODE code=OP::OP_VALUE; // calm down compiler. will be reassigned for sure. + switch( with | construct ) { + case 0x11: + { + code=OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE; + break; + } + case 0x12: + { + code=OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR; + break; + } + case 0x21: + { + code=OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE; + break; + } + case 0x22: + { + code=OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR; + break; + } + case 0x31: + { + code=OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE; + break; + } + case 0x32: + { + code=OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR; + break; + } + } + O(opcodes, code); + P(opcodes, var_ops, 2/*offset*/, 2/*limit*/); // copy origin+value + } else { + P(opcodes, var_ops); + O(opcodes, construct_op); + } + return true; + } + return false; +} +#endif + void push_LS(Parse_control& pc, lexical_state new_state); void pop_LS(Parse_control& pc);