--- parser3/src/main/execute.C 2009/05/19 08:44:00 1.334 +++ parser3/src/main/execute.C 2009/06/07 13:15:54 1.347 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_EXECUTE_C="$Date: 2009/05/19 08:44:00 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/06/07 13:15:54 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -46,21 +46,37 @@ char *opcode_name[]={ "GET_ELEMENT_OR_OPERATOR", #endif "GET_ELEMENT", -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD - "GET_ELEMENT_FIELD", - "GET_ELEMENT_FIELD__WRITE", -#endif -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - "VALUE__GET_ELEMENT", -#endif "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", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + "GET_OBJECT_VAR_ELEMENT", + "GET_OBJECT_VAR_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", "CALL", "CALL__WRITE", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + "WITH_ROOT__VALUE__CONSTRUCT_EXPR", + "WITH_ROOT__VALUE__CONSTRUCT_VALUE", + "WITH_WRITE__VALUE__CONSTRUCT_EXPR", + "WITH_WRITE__VALUE__CONSTRUCT_VALUE", + "WITH_SELF__VALUE__CONSTRUCT_EXPR", + "WITH_SELF__VALUE__CONSTRUCT_VALUE", +#endif + // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary @@ -73,6 +89,18 @@ char *opcode_name[]={ "IS" }; +const char* debug_value_to_cstr(Value& value){ + const String* string=value.get_string(); + + if(string) + return string->cstr(); + else + if(value.is_bool()) + return value.as_bool()?"":""; + else + return ""; +} + void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); @@ -91,10 +119,17 @@ void debug_dump(SAPI_Info& sapi_info, in while(i.has_next()) { OP::OPCODE opcode=i.next().code; -#if defined(OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD) && defined(OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS) +#if defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT) if( - opcode==OP::OP_GET_ELEMENT_FIELD - || opcode==OP::OP_GET_ELEMENT_FIELD__WRITE + 1==0 +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + || opcode==OP::OP_GET_OBJECT_ELEMENT + || opcode==OP::OP_GET_OBJECT_ELEMENT__WRITE +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE +#endif ){ i.next(); // skip origin Value& value1=*i.next().value; @@ -104,7 +139,7 @@ void debug_dump(SAPI_Info& sapi_info, in "%*s%s" " \"%s\" \"%s\"", level*4, "", opcode_name[opcode], - value1.get_string()->cstr(), value2.get_string()->cstr()); + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); continue; } #endif @@ -118,19 +153,29 @@ 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 -#if defined(OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD) && !defined(OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS) - || opcode==OP::OP_GET_ELEMENT_FIELD - || opcode==OP::OP_GET_ELEMENT_FIELD__WRITE +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE #endif ) { Operation::Origin origin=i.next().origin; Value& value=*i.next().value; + debug_printf(sapi_info, "%*s%s" " \"%s\" %s", level*4, "", opcode_name[opcode], - value.get_string()->cstr(), value.type()); + debug_value_to_cstr(value), value.type()); continue; } debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); @@ -140,7 +185,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: @@ -149,8 +194,22 @@ void debug_dump(SAPI_Info& sapi_info, in } } } +#define DEBUG_PRINT_STR(str) debug_printf(sapi_info, str); +#define DEBUG_PRINT_STRING(value) debug_printf(sapi_info, " \"%s\" ", value.cstr()); +#define DEBUG_PRINT_VALUE_AND_TYPE(value) debug_printf(sapi_info, " \"%s\" %s", debug_value_to_cstr(value), value.type()); +#define DEBUG_PRINT_OPS(local_ops) \ + debug_printf(sapi_info, \ + " (%d)\n", local_ops?local_ops->count():0); \ + if(local_ops) debug_dump(sapi_info, 1, *local_ops); + +#else +#define DEBUG_PRINT_STR(str) +#define DEBUG_PRINT_STRING(value) +#define DEBUG_PRINT_VALUE_AND_TYPE(value) +#define DEBUG_PRINT_OPS(local_ops) #endif + // Request void Request::execute(ArrayOperation& ops) { @@ -176,9 +235,9 @@ void Request::execute(ArrayOperation& op { debug_origin=i.next().origin; Value& value=*i.next().value; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" %s", value.get_string()->cstr(), value.type()); -#endif + + DEBUG_PRINT_VALUE_AND_TYPE(value) + stack.push(value); break; } @@ -193,9 +252,7 @@ void Request::execute(ArrayOperation& op Value& value=*i.next().value; const String& name=*value.get_string(); -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", name.cstr()); -#endif + DEBUG_PRINT_STRING(name) Value* class_value=classes().get(name); if(!class_value) @@ -229,17 +286,17 @@ void Request::execute(ArrayOperation& op stack.push(*method_frame); break; } - case OP::OP_WITH_SELF: + case OP::OP_WITH_SELF: { stack.push(get_self()); break; } - case OP::OP_WITH_READ: + case OP::OP_WITH_READ: { stack.push(*rcontext); break; } - case OP::OP_WITH_WRITE: + case OP::OP_WITH_WRITE: { if(wcontext==method_frame) throw Exception(PARSER_RUNTIME, @@ -251,34 +308,87 @@ 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[...]"); + DO_CONSTRUCT_VALUE(*wcontext) + } + + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) + + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) + + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) + + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) + +#endif // OPTIMIZE_BYTECODE_CONSTRUCT + case OP::OP_CONSTRUCT_VALUE: { +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=stack.pop().value(); +#else Value& value=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); +#endif put_element(ncontext, name, &value); break; } + case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& expr=stack.pop().value(); +#else Value& expr=stack.pop().value(); const String& name=stack.pop().string(); debug_name=&name; Value& ncontext=stack.pop().value(); +#endif Value& value=expr.as_expr_result(); put_element(ncontext, name, &value); break; } + case OP::OP_CURLY_CODE__CONSTRUCT: { ArrayOperation& local_ops=*i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops.count()); - debug_dump(sapi_info, 1, local_ops); -#endif + + DEBUG_PRINT_OPS((&local_ops)) + VJunction& value=*new VJunction( get_self(), 0, method_frame, @@ -301,10 +411,9 @@ void Request::execute(ArrayOperation& op case OP::OP_NESTED_CODE: { ArrayOperation& local_ops=*i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops.count()); - debug_dump(sapi_info, 1, local_ops); -#endif + + DEBUG_PRINT_OPS((&local_ops)) + stack.push(local_ops); break; } @@ -328,10 +437,12 @@ void Request::execute(ArrayOperation& op { i.next(); // ignore origin Value* value=i.next().value; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\"", value->get_string()->cstr()); -#endif - write_no_lang(*value->get_string()); + + const String& string_value=*value->get_string(); + + DEBUG_PRINT_STRING(string_value) + + write_no_lang(string_value); break; } @@ -341,9 +452,8 @@ void Request::execute(ArrayOperation& op debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", name.cstr()); -#endif + DEBUG_PRINT_STRING(name) + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST if(!method->junction_template) method->junction_template=new VJunction(main_class, method); stack.push(*method->junction_template); @@ -369,31 +479,54 @@ void Request::execute(ArrayOperation& op } #endif -#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD - case OP::OP_GET_ELEMENT_FIELD: - case OP::OP_GET_ELEMENT_FIELD__WRITE: +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT: + case OP::OP_GET_OBJECT_ELEMENT__WRITE: { debug_origin=i.next().origin; const String& context_name=*i.next().value->get_string(); debug_name=&context_name; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", context_name.cstr()); -#endif - Value& object=get_element(*rcontext, context_name); -#ifndef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS - i.next(); // skip OP_VALUE -#endif + DEBUG_PRINT_STRING(context_name) + + Value& object=get_element(*rcontext, context_name); debug_origin=i.next().origin; const String& field_name=*i.next().value->get_string(); debug_name=&field_name; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", field_name.cstr()); -#endif + + DEBUG_PRINT_STRING(field_name) + Value& value=get_element(object, field_name); - i.next(); // skip last OP_GET_ELEMENT + if(opcode==OP::OP_GET_OBJECT_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } + break; + } +#endif - if(opcode==OP::OP_GET_ELEMENT_FIELD){ +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; + + DEBUG_PRINT_STRING(context_name) + + Value& object=get_element(*rcontext, context_name); + + debug_origin=i.next().origin; + const String& var_name=*i.next().value->get_string(); debug_name=&var_name; + + DEBUG_PRINT_STRING(var_name) + + const String* field=get_element(*rcontext, var_name).get_string(); + + Value& value=get_element(object, *field); + + if(opcode==OP::OP_GET_OBJECT_VAR_ELEMENT){ stack.push(value); } else { write_assign_lang(value); @@ -411,44 +544,69 @@ 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: { debug_origin=i.next().origin; const String& name=*i.next().value->get_string(); debug_name=&name; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", name.cstr()); -#endif + DEBUG_PRINT_STRING(name) Value& value=get_element(*rcontext, name); 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; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " \"%s\" ", name.cstr()); + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*method_frame, name); + stack.push(value); + break; + } #endif - Value& value=get_element(*rcontext, name); - write_assign_lang(value); +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(get_self(), name); + + if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } break; } #endif @@ -500,10 +658,9 @@ void Request::execute(ArrayOperation& op { // code ArrayOperation& local_ops=*i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops.count()); - debug_dump(sapi_info, 1, local_ops); -#endif + + DEBUG_PRINT_OPS((&local_ops)) + // when they evaluate expression parameter, // the object expression result // does not need to be written into calling frame @@ -517,12 +674,10 @@ void Request::execute(ArrayOperation& op rcontext, opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, &local_ops); -#ifdef USE_DESTRUCTORS - value.set_temporal(true); -#else +#ifndef USE_DESTRUCTORS if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) + wcontext->attach_junction(&value); #endif - wcontext->attach_junction(&value); // store param stack.push(value); break; @@ -543,13 +698,10 @@ void Request::execute(ArrayOperation& op case OP::OP_CALL: { ArrayOperation* local_ops=i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0); - if(local_ops) - debug_dump(sapi_info, 1, *local_ops); - debug_printf(sapi_info, "->\n"); -#endif + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + Value& value=stack.pop().value(); Junction* junction=value.get_junction(); @@ -580,9 +732,8 @@ void Request::execute(ArrayOperation& op stack.push(frame.result().as_value()); -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-returned"); -#endif + DEBUG_PRINT_STR("<-returned") + if(get_skip()) return; if(get_interrupted()) { @@ -597,13 +748,10 @@ void Request::execute(ArrayOperation& op case OP::OP_CALL__WRITE: { ArrayOperation* local_ops=i.next().ops; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, " (%d)\n", local_ops?local_ops->count():0); - if(local_ops) - debug_dump(sapi_info, 1, *local_ops); - debug_printf(sapi_info, "->\n"); -#endif + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + Value& value=stack.pop().value(); Junction* junction=value.get_junction(); @@ -667,11 +815,10 @@ void Request::execute(ArrayOperation& op frame.empty_params(); op_call(frame); } - write_assign_lang(frame.result()); + write_pass_lang(frame.result()); } -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-returned"); -#endif + + DEBUG_PRINT_STR("<-returned") if(get_skip()) return; @@ -1212,9 +1359,8 @@ StringOrValue Request::process(Value& in if(junction->code) { // is it a code-junction? // process it StringOrValue result; -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); -#endif + + DEBUG_PRINT_STR("ja->\n") if(!junction->method_frame) throw Exception(PARSER_RUNTIME, @@ -1254,9 +1400,8 @@ StringOrValue Request::process(Value& in RESTORE_CONTEXT -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-ja returned"); -#endif + DEBUG_PRINT_STR("<-ja returned") + return result; } @@ -1306,9 +1451,9 @@ void Request::process_write(Value& input if(junction->code) { // is it a code-junction? // process it -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "ja->\n"); -#endif + + DEBUG_PRINT_STR("ja->\n") + if(!junction->method_frame) throw Exception(PARSER_RUNTIME, 0, @@ -1349,9 +1494,9 @@ void Request::process_write(Value& input RESTORE_CONTEXT write_pass_lang(local.result()); } -#ifdef DEBUG_EXECUTE - debug_printf(sapi_info, "<-ja returned"); -#endif + + DEBUG_PRINT_STR("<-ja returned") + return; }