--- parser3/src/main/execute.C 2009/06/04 09:31:38 1.345 +++ parser3/src/main/execute.C 2009/06/29 09:25:29 1.352 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/06/04 09:31:38 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/06/29 09:25:29 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -46,6 +46,12 @@ char *opcode_name[]={ "GET_ELEMENT_OR_OPERATOR", #endif "GET_ELEMENT", + "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT", + "VALUE__GET_ELEMENT__WRITE", + "WITH_ROOT__VALUE__GET_ELEMENT", +#endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT "GET_OBJECT_ELEMENT", "GET_OBJECT_ELEMENT__WRITE", @@ -54,19 +60,17 @@ char *opcode_name[]={ "GET_OBJECT_VAR_ELEMENT", "GET_OBJECT_VAR_ELEMENT__WRITE", #endif -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - "VALUE__GET_ELEMENT", -#endif - "GET_ELEMENT__WRITE", -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - "VALUE__GET_ELEMENT__WRITE", -#endif #ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT "WITH_SELF__VALUE__GET_ELEMENT", "WITH_SELF__VALUE__GET_ELEMENT__WRITE", #endif "OBJECT_POOL", "STRING_POOL", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "PREPARE_TO_CONSTRUCT_OBJECT", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", +#endif + "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", #ifdef OPTIMIZE_BYTECODE_CONSTRUCT @@ -144,6 +148,26 @@ void debug_dump(SAPI_Info& sapi_info, in continue; } #endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + if( + opcode==OP::OP_CONSTRUCT_OBJECT + || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE + ){ + i.next(); // skip origin + Value& value1=*i.next().value; + i.next(); // skip origin + Value& value2=*i.next().value; + debug_printf(sapi_info, + "%*s%s" + " \"%s\" \"%s\"", + level*4, "", opcode_name[opcode], + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); + + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); + continue; + } +#endif if( opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE @@ -154,6 +178,7 @@ void debug_dump(SAPI_Info& sapi_info, in || opcode==OP::OP_VALUE__GET_ELEMENT || opcode==OP::OP_VALUE__GET_ELEMENT__WRITE || opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR + || opcode==OP::OP_WITH_ROOT__VALUE__GET_ELEMENT #endif #ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT @@ -178,6 +203,7 @@ void debug_dump(SAPI_Info& sapi_info, in debug_value_to_cstr(value), value.type()); continue; } + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); switch(opcode) { @@ -185,7 +211,7 @@ void debug_dump(SAPI_Info& sapi_info, in case OP::OP_EXPR_CODE__STORE_PARAM: case OP::OP_CURLY_CODE__CONSTRUCT: case OP::OP_NESTED_CODE: - case OP::OP_OBJECT_POOL: + case OP::OP_OBJECT_POOL: case OP::OP_STRING_POOL: case OP::OP_CALL: case OP::OP_CALL__WRITE: @@ -310,42 +336,42 @@ void Request::execute(ArrayOperation& op // OTHER ACTIONS BUT WITHs #ifdef OPTIMIZE_BYTECODE_CONSTRUCT +#define DO_CONSTRUCT(context, vvalue) { \ + debug_origin=i.next().origin; \ + const String& name=*i.next().value->get_string(); debug_name=&name; \ + DEBUG_PRINT_STRING(name) \ + Value& value=stack.pop().value(); \ + put_element( context, name, vvalue ); \ + break; \ + } +#define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value) +#define DO_CONSTRUCT_EXPR(context) { \ + wcontext->set_in_expression(false); \ + DO_CONSTRUCT(context, &value.as_expr_result()) \ + } + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: + { + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_EXPR(*wcontext) + } + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: { if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); - // don't stop here. continue in the next block + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_VALUE(*wcontext) } - case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: - case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: - case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: - case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: - { - bool is_expr=(opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR - || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR - || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR); - if(is_expr) - wcontext->set_in_expression(false); + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) - debug_origin=i.next().origin; - const String& name=*i.next().value->get_string(); debug_name=&name; - DEBUG_PRINT_STRING(name) + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) - Value& value=stack.pop().value(); + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) - put_element( - (opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE)?*method_frame: - (opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE)?get_self():*wcontext, - name, - is_expr?&value.as_expr_result():/*value.is_void()?new VString():*/&value - ); + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) - break; - } #endif // OPTIMIZE_BYTECODE_CONSTRUCT case OP::OP_CONSTRUCT_VALUE: @@ -425,12 +451,11 @@ void Request::execute(ArrayOperation& op } case OP::OP_WRITE_EXPR_RESULT: { - Value& value=stack.pop().value(); - write_no_lang(value.as_expr_result()); - - // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); + + Value& value=stack.pop().value(); + wcontext->write(value.as_expr_result()); break; } case OP::OP_STRING__WRITE: @@ -544,6 +569,15 @@ void Request::execute(ArrayOperation& op break; } + case OP::OP_GET_ELEMENT__WRITE: + { + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name); + write_assign_lang(value); + break; + } + #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT case OP::OP_VALUE__GET_ELEMENT: { @@ -556,28 +590,28 @@ void Request::execute(ArrayOperation& op stack.push(value); break; } -#endif - - case OP::OP_GET_ELEMENT__WRITE: + case OP::OP_VALUE__GET_ELEMENT__WRITE: { - const String& name=stack.pop().string(); debug_name=&name; - Value& ncontext=stack.pop().value(); - Value& value=get_element(ncontext, name); + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*rcontext, name); write_assign_lang(value); break; } -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - case OP::OP_VALUE__GET_ELEMENT__WRITE: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: { debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; DEBUG_PRINT_STRING(name) - Value& value=get_element(*rcontext, name); - write_assign_lang(value); + Value& value=get_element(*method_frame, name); + stack.push(value); break; } #endif @@ -609,7 +643,11 @@ void Request::execute(ArrayOperation& op WContext *saved_wcontext=wcontext; String::Language saved_lang=flang; flang=String::L_PASS_APPENDED; - WWrapper local(0/*empty*/, wcontext); +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(wcontext); +#else + WWrapper local(wcontext); +#endif wcontext=&local; execute(local_ops); @@ -625,7 +663,7 @@ void Request::execute(ArrayOperation& op ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(0 /*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; execute(local_ops); @@ -674,11 +712,13 @@ void Request::execute(ArrayOperation& op break; } +#ifndef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: { - wcontext->set_constructing(true); + SET_CONSTRUCTING(wcontext,true) break; } +#endif case OP::OP_PREPARE_TO_EXPRESSION: { @@ -686,6 +726,18 @@ void Request::execute(ArrayOperation& op break; } +#define METHOD_FRAME_ACTION(action) \ + if(local_ops){ \ + size_t first = stack.top_index(); \ + execute(*local_ops); \ + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); \ + action; \ + stack.set_top_index(first); \ + } else { \ + frame.empty_params(); \ + action; \ + } + case OP::OP_CALL: { ArrayOperation* local_ops=i.next().ops; @@ -709,18 +761,7 @@ void Request::execute(ArrayOperation& op } VMethodFrame frame(*junction, method_frame); - - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - + METHOD_FRAME_ACTION(op_call(frame, GET_CONSTRUCTING(wcontext))); stack.push(frame.result().as_value()); DEBUG_PRINT_STR("<-returned") @@ -760,7 +801,7 @@ void Request::execute(ArrayOperation& op #ifdef OPTIMIZE_CALL const Method& method=*junction->method; - if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_FRAME){ + if (!GET_CONSTRUCTING(wcontext) && method.call_optimization==Method::CO_WITHOUT_FRAME){ if(local_ops){ // store param code goes here size_t first = stack.top_index(); execute(*local_ops); @@ -776,37 +817,15 @@ void Request::execute(ArrayOperation& op method.check_actual_numbered_params(junction->self, &method_params); method.native_code(*this, method_params); // execute it } - } else if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + } else if (!GET_CONSTRUCTING(wcontext) && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call_write(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call_write(frame); - } + METHOD_FRAME_ACTION(op_call_write(frame)); } else #endif // OPTIMIZE_CALL { VMethodFrame frame(*junction, method_frame); - if(local_ops){ // store param code goes here - size_t first = stack.top_index(); - execute(*local_ops); - - frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); - op_call(frame); - - stack.set_top_index(first); - } else { - frame.empty_params(); - op_call(frame); - } - write_assign_lang(frame.result()); + METHOD_FRAME_ACTION(op_call(frame, GET_CONSTRUCTING(wcontext))); + write_pass_lang(frame.result()); } DEBUG_PRINT_STR("<-returned") @@ -822,6 +841,57 @@ void Request::execute(ArrayOperation& op break; } +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); + + DEBUG_PRINT_STRING(class_name) + + Value* class_value=classes().get(class_name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &class_name, + "class is undefined"); + + SET_CONSTRUCTING(wcontext,true) + + debug_origin=i.next().origin; + Value& vconstructor_name=*i.next().value; + const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; + + DEBUG_PRINT_STRING(constructor_name) + + Value& constructor_value=get_element(*class_value, constructor_name); + + Junction* junction=constructor_value.get_junction(); +#ifdef OPTIMIZE_CONSTRUCT_OBJECT + if(!junction || junction->self.get_class()!=class_value) + throw Exception(PARSER_RUNTIME, + &constructor_name, + "constructor must be declared in class '%s'", + class_value->get_class()->name_cstr()); +#endif + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + VMethodFrame frame(*junction, method_frame); + METHOD_FRAME_ACTION(op_call(frame, true /* constructing */)); + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); + + DEBUG_PRINT_STR("<-returned") + break; + } +#endif // OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + // expression ops: unary case OP::OP_NEG: { @@ -1153,17 +1223,16 @@ void Request::execute(ArrayOperation& op rcontext=saved_rcontext; \ method_frame=saved_method_frame; -void Request::op_call(VMethodFrame& frame){ +void Request::op_call(VMethodFrame& frame, bool constructing){ const Junction &junction=frame.junction; VStateless_class& called_class=*junction.self.get_class(); Value* new_self; - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); + if(constructing) { + SET_CONSTRUCTING(wcontext,false) if(junction.method->call_type!=Method::CT_STATIC) { // this is a constructor call - HashStringValue& new_object_fields=*new HashStringValue(); - if(new_self=called_class.create_new_value(fpool, new_object_fields)) { + if(new_self=called_class.create_new_value(fpool, 0 /*creating fields only in VClass*/)) { // some stateless_class creatable derivates } else throw Exception(PARSER_RUNTIME, @@ -1244,7 +1313,7 @@ void Request::op_call_write(VMethodFrame @bug ^superbase:method would dynamically call ^base:method if there is any */ Value& Request::get_element(Value& ncontext, const String& name) { - if(!wcontext->get_constructing() // not constructing + if(!GET_CONSTRUCTING(wcontext) // not constructing && wcontext->get_somebody_entered_some_class() ) // ^class:method if(VStateless_class *called_class=ncontext.get_class()) if(VStateless_class *read_class=rcontext->get_class()) @@ -1257,7 +1326,7 @@ Value& Request::get_element(Value& ncont Value* value=ncontext.get_element(name, ncontext, true); - if(value && wcontext->get_constructing()) + if(value && GET_CONSTRUCTING(wcontext)) if(Junction* junction=value->get_junction()) if(junction->self.get_class()!=&ncontext) throw Exception(PARSER_RUNTIME, @@ -1274,8 +1343,8 @@ void Request::put_element(Value& ncontex if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { // process it VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); - int param_count=frame.method_params_count(); + size_t param_count=frame.method_params_count(); if(param_count!=1) throw Exception(PARSER_RUNTIME, 0, @@ -1315,9 +1384,8 @@ StringOrValue Request::process(Value& in if(junction) { if(junction->is_getter) { // is it a getter-junction? VMethodFrame frame(*junction, method_frame/*caller*/); - int param_count=frame.method_params_count(); - if(param_count){ + if(size_t param_count=frame.method_params_count()){ if(junction->auto_name){ // default getter if(param_count==1){ Value *param=new VString(*junction->auto_name); @@ -1355,8 +1423,8 @@ StringOrValue Request::process(Value& in if(!junction->method_frame) throw Exception(PARSER_RUNTIME, - 0, - "junction used outside of context"); + 0, + "junction used outside of context"); SAVE_CONTEXT @@ -1380,7 +1448,7 @@ StringOrValue Request::process(Value& in result=wcontext->result(); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it @@ -1408,9 +1476,8 @@ void Request::process_write(Value& input if(junction) { if(junction->is_getter) { // is it a getter-junction? VMethodFrame frame(*junction, method_frame/*caller*/); - int param_count=frame.method_params_count(); - if(param_count){ + if(size_t param_count=frame.method_params_count()){ if(junction->auto_name){ // default getter if(param_count==1){ Value *param=new VString(*junction->auto_name); @@ -1477,7 +1544,7 @@ void Request::process_write(Value& input write_pass_lang(local.result()); } else { // plain wwrapper - WWrapper local(0/*empty*/, wcontext); + WWrapper local(wcontext); wcontext=&local; // execute it