Merge pull request jerryscript-project#22 from ruben-ayrapetyan/experiments-dev

ruben-ayrapetyan · ruben-ayrapetyan · commit 1033ec462080 · 2015-12-01T18:48:37.000+03:00
Move registers allocation to parser.cpp (first stage) and temporary turn of evaluation of Identifier in squares (to be fixed later)
diff --git a/jerry-core/parser/js/opcodes-dumper.cpp b/jerry-core/parser/js/opcodes-dumper.cpp
@@ -503,29 +503,6 @@ literal_operand (lit_cpointer_t lit_cp)
   return jsp_operand_t::make_lit_operand (lit_cp);
 }
 
-/**
- * Creates operand for eval's return value
- *
- * @return constructed operand
- */
-jsp_operand_t
-eval_ret_operand (void)
-{
-  return jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_EVAL_RET);
-} /* eval_ret_operand */
-
-/**
- * Creates operand for taking iterator value (next property name)
- * from for-in instr handler.
- *
- * @return constructed operand
- */
-jsp_operand_t
-jsp_create_operand_for_in_special_reg (void)
-{
-  return jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_FOR_IN_PROPERTY_NAME);
-} /* jsp_create_operand_for_in_special_reg */
-
 bool
 operand_is_empty (jsp_operand_t op)
 {
@@ -777,8 +754,9 @@ dump_varg_header_for_rewrite (varg_list_type vlt, jsp_operand_t obj)
   return pos;
 }
 
-jsp_operand_t
-rewrite_varg_header_set_args_count (size_t args_count,
+void
+rewrite_varg_header_set_args_count (jsp_operand_t ret,
+                                    size_t args_count,
                                     vm_instr_counter_t pos)
 {
   /*
@@ -803,11 +781,10 @@ rewrite_varg_header_set_args_count (size_t args_count,
                      "No more than 255 formal parameters / arguments are currently supported",
                      LIT_ITERATOR_POS_ZERO);
       }
-      const jsp_operand_t res = tmp_operand ();
       om.op.data.func_expr_n.arg_list = (vm_idx_t) args_count;
-      om.op.data.func_expr_n.lhs = res.get_idx ();
+      om.op.data.func_expr_n.lhs = ret.get_idx ();
       serializer_rewrite_op_meta (pos, om);
-      return res;
+      break;
     }
     case VM_OP_FUNC_DECL_N:
     {
@@ -819,7 +796,8 @@ rewrite_varg_header_set_args_count (size_t args_count,
       }
       om.op.data.func_decl_n.arg_list = (vm_idx_t) args_count;
       serializer_rewrite_op_meta (pos, om);
-      return empty_operand ();
+      JERRY_ASSERT (ret.is_empty_operand ());
+      break;
     }
     case VM_OP_ARRAY_DECL:
     case VM_OP_OBJ_DECL:
@@ -830,12 +808,11 @@ rewrite_varg_header_set_args_count (size_t args_count,
                      "No more than 65535 formal parameters are currently supported",
                      LIT_ITERATOR_POS_ZERO);
       }
-      const jsp_operand_t res = tmp_operand ();
       om.op.data.obj_decl.list_1 = (vm_idx_t) (args_count >> 8);
       om.op.data.obj_decl.list_2 = (vm_idx_t) (args_count & 0xffu);
-      om.op.data.obj_decl.lhs = res.get_idx ();
+      om.op.data.obj_decl.lhs = ret.get_idx ();
       serializer_rewrite_op_meta (pos, om);
-      return res;
+      break;
     }
     default:
     {
@@ -970,12 +947,6 @@ rewrite_function_end (vm_instr_counter_t pos)
   serializer_rewrite_op_meta (pos, function_end_op_meta);
 }
 
-jsp_operand_t
-this_operand (void)
-{
-  return jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_THIS_BINDING);
-}
-
 void
 dump_unary_plus (jsp_operand_t res, jsp_operand_t obj)
 {
@@ -1005,19 +976,6 @@ dump_delete_prop (jsp_operand_t res,
                   jsp_operand_t base,
                   jsp_operand_t prop_name)
 {
-  if (prop_name.is_literal_operand ())
-  {
-    /*
-     * TODO:
-     *      Introduce delete_prop instruction that accepts property name as a literal-represented string
-     */
-
-    jsp_operand_t tmp = tmp_operand ();
-    dump_string_assignment (tmp, prop_name.get_literal ());
-
-    prop_name = tmp;
-  }
-
   dump_triple_address (VM_OP_DELETE_PROP, res, base, prop_name);
 }
 
@@ -1406,15 +1364,12 @@ start_dumping_case_clauses (void)
 }
 
 vm_instr_counter_t
-dump_case_clause_check_for_rewrite (jsp_operand_t switch_expr, jsp_operand_t case_expr)
+dump_case_clause_check_for_rewrite (jsp_operand_t cond)
 {
-  const jsp_operand_t res = tmp_operand ();
-  dump_triple_address (VM_OP_EQUAL_VALUE_TYPE, res, switch_expr, case_expr);
-
   vm_instr_counter_t jmp_oc = serializer_get_current_instr_counter ();
 
   dump_triple_address (VM_OP_IS_TRUE_JMP_DOWN,
-                       res,
+                       cond,
                        jsp_operand_t::make_unknown_operand (),
                        jsp_operand_t::make_unknown_operand ());
 
diff --git a/jerry-core/parser/js/opcodes-dumper.h b/jerry-core/parser/js/opcodes-dumper.h
@@ -345,8 +345,6 @@ typedef enum __attr_packed___
 
 jsp_operand_t empty_operand (void);
 jsp_operand_t literal_operand (lit_cpointer_t);
-jsp_operand_t eval_ret_operand (void);
-jsp_operand_t jsp_create_operand_for_in_special_reg (void);
 jsp_operand_t tmp_operand (void);
 bool operand_is_empty (jsp_operand_t);
 
@@ -377,7 +375,7 @@ void dump_null_assignment (jsp_operand_t);
 void dump_variable_assignment (jsp_operand_t, jsp_operand_t);
 
 vm_instr_counter_t dump_varg_header_for_rewrite (varg_list_type, jsp_operand_t);
-jsp_operand_t rewrite_varg_header_set_args_count (size_t, vm_instr_counter_t);
+void rewrite_varg_header_set_args_count (jsp_operand_t, size_t, vm_instr_counter_t);
 void dump_call_additional_info (opcode_call_flags_t, jsp_operand_t);
 void dump_varg (jsp_operand_t);
 
@@ -390,8 +388,6 @@ void dump_prop_setter (jsp_operand_t, jsp_operand_t, jsp_operand_t);
 void dump_function_end_for_rewrite (void);
 void rewrite_function_end (vm_instr_counter_t);
 
-jsp_operand_t this_operand (void);
-
 void dump_unary_plus (jsp_operand_t, jsp_operand_t);
 void dump_unary_minus (jsp_operand_t, jsp_operand_t);
 void dump_bitwise_not (jsp_operand_t, jsp_operand_t);
@@ -430,7 +426,7 @@ vm_instr_counter_t rewrite_simple_or_nested_jump_and_get_next (vm_instr_counter_
 void dump_continue_iterations_check (vm_instr_counter_t, jsp_operand_t);
 
 void start_dumping_case_clauses (void);
-vm_instr_counter_t dump_case_clause_check_for_rewrite (jsp_operand_t, jsp_operand_t);
+vm_instr_counter_t dump_case_clause_check_for_rewrite (jsp_operand_t);
 vm_instr_counter_t dump_default_clause_check_for_rewrite (void);
 void rewrite_case_clause (vm_instr_counter_t);
 void rewrite_default_clause (vm_instr_counter_t);
diff --git a/jerry-core/parser/js/parser.cpp b/jerry-core/parser/js/parser.cpp
@@ -542,7 +542,9 @@ jsp_start_parse_function_scope (jsp_operand_t func_name,
 
   skip_token ();
 
-  const jsp_operand_t func = rewrite_varg_header_set_args_count (formal_parameters_num, varg_header_pos);
+  const jsp_operand_t func = is_function_expression ? tmp_operand () : empty_operand ();
+
+  rewrite_varg_header_set_args_count (func, formal_parameters_num, varg_header_pos);
 
   dump_function_end_for_rewrite ();
 
@@ -1041,7 +1043,11 @@ static jsp_operand_t
 jsp_finish_call_dump (uint32_t args_num,
                       vm_instr_counter_t header_pos)
 {
-  return rewrite_varg_header_set_args_count (args_num, header_pos);
+  jsp_operand_t ret = tmp_operand ();
+
+  rewrite_varg_header_set_args_count (ret, args_num, header_pos);
+
+  return ret;
 } /* jsp_finish_call_dump */
 
 /*
@@ -1067,7 +1073,11 @@ static jsp_operand_t __attr_unused___
 jsp_finish_construct_dump (uint32_t args_num,
                            vm_instr_counter_t header_pos)
 {
-  return rewrite_varg_header_set_args_count (args_num, header_pos);
+  jsp_operand_t ret = tmp_operand ();
+
+  rewrite_varg_header_set_args_count (ret, args_num, header_pos);
+
+  return ret;
 } /* jsp_finish_construct_dump */
 
 static lit_cpointer_t
@@ -1545,7 +1555,7 @@ jsp_parse_source_element_list (void)
 
       if (scope_type == SCOPE_TYPE_EVAL)
       {
-        dump_undefined_assignment (eval_ret_operand ());
+        dump_undefined_assignment (jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_EVAL_RET));
       }
 
       state_p->state = JSP_STATE_SOURCE_ELEMENTS;
@@ -1661,7 +1671,7 @@ jsp_parse_source_element_list (void)
           }
           case TOK_KW_THIS:
           {
-            state_p->u.expression.operand = this_operand ();
+            state_p->u.expression.operand = jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_THIS_BINDING);
             break;
           }
           case TOK_KW_NEW:
@@ -1899,7 +1909,9 @@ jsp_parse_source_element_list (void)
         uint32_t list_len = state_p->u.expression.u.varg_sequence.list_length;
         vm_instr_counter_t header_pos = state_p->u.expression.u.varg_sequence.header_pos;
 
-        state_p->u.expression.operand = rewrite_varg_header_set_args_count (list_len, header_pos);
+        state_p->u.expression.operand = tmp_operand ();
+
+        rewrite_varg_header_set_args_count (state_p->u.expression.operand, list_len, header_pos);
 
         state_p->state = JSP_STATE_EXPR_MEMBER;
         state_p->is_list_in_process = false;
@@ -1961,7 +1973,8 @@ jsp_parse_source_element_list (void)
           uint32_t list_len = state_p->u.expression.u.varg_sequence.list_length;
           vm_instr_counter_t header_pos = state_p->u.expression.u.varg_sequence.header_pos;
 
-          state_p->u.expression.operand = rewrite_varg_header_set_args_count (list_len, header_pos);
+          state_p->u.expression.operand = tmp_operand ();
+          rewrite_varg_header_set_args_count (state_p->u.expression.operand, list_len, header_pos);
 
           state_p->state = JSP_STATE_EXPR_MEMBER;
           state_p->is_list_in_process = false;
@@ -2127,9 +2140,13 @@ jsp_parse_source_element_list (void)
 
             current_token_must_be_check_and_skip_it (TOK_CLOSE_SQUARE);
 
-            subexpr_operand = dump_get_value_if_ref (subexpr_operand,
-                                                     subexpr_prop_name_operand,
-                                                     is_subexpr_value_based_reference);
+            /*
+             * FIXME:
+             *       evaluation order - change to dump_get_value_if_ref
+             */
+            subexpr_operand = dump_get_value_if_value_based_ref (subexpr_operand,
+                                                                 subexpr_prop_name_operand,
+                                                                 is_subexpr_value_based_reference);
 
             state_p->u.expression.prop_name_operand = subexpr_operand;
             state_p->is_value_based_reference = true;
@@ -2220,9 +2237,13 @@ jsp_parse_source_element_list (void)
 
           current_token_must_be (TOK_CLOSE_SQUARE);
 
-          subexpr_operand = dump_get_value_if_ref (subexpr_operand,
-                                                   subexpr_prop_name_operand,
-                                                   is_subexpr_value_based_reference);
+          /*
+           * FIXME:
+           *       evaluation order - change to dump_get_value_if_ref
+           */
+          subexpr_operand = dump_get_value_if_value_based_ref (subexpr_operand,
+                                                               subexpr_prop_name_operand,
+                                                               is_subexpr_value_based_reference);
           state_p->u.expression.prop_name_operand = subexpr_operand;
           state_p->is_value_based_reference = true;
         }
@@ -2637,6 +2658,15 @@ jsp_parse_source_element_list (void)
           }
           else
           {
+            if (subexpr_operand.is_literal_operand ())
+            {
+              jsp_operand_t reg = tmp_operand ();
+
+              dump_string_assignment (reg, subexpr_operand.get_literal ());
+
+              subexpr_operand = reg;
+            }
+
             dump_delete_prop (state_p->u.expression.operand,
                               subexpr_operand,
                               subexpr_prop_name_operand);
@@ -4096,7 +4126,7 @@ jsp_parse_source_element_list (void)
 
       seek_token (state_p->u.statement.u.iterational.u.loop_for_in.u.body_loc);
 
-      jsp_operand_t for_in_special_reg = jsp_create_operand_for_in_special_reg ();
+      jsp_operand_t for_in_special_reg = jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_FOR_IN_PROPERTY_NAME);
 
       if (!state_p->is_var_decl_no_in)
       {
@@ -4188,7 +4218,11 @@ jsp_parse_source_element_list (void)
         current_token_must_be (TOK_COLON);
 
         jsp_operand_t switch_expr = state_p->u.statement.u.switch_statement.expr;
-        vm_instr_counter_t jmp_oc = dump_case_clause_check_for_rewrite (switch_expr, case_expr);
+
+        const jsp_operand_t cond = tmp_operand ();
+        dump_equal_value_type (cond, switch_expr, case_expr);
+
+        vm_instr_counter_t jmp_oc = dump_case_clause_check_for_rewrite (cond);
         skip_token ();
 
         jsp_state_t tmp_state = *state_p;
@@ -4468,7 +4502,8 @@ jsp_parse_source_element_list (void)
 
       if (serializer_get_scope ()->type == SCOPE_TYPE_EVAL)
       {
-        dump_variable_assignment (eval_ret_operand (), expr);
+        dump_variable_assignment (jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_EVAL_RET),
+                                  expr);
       }
 
       JSP_COMPLETE_STATEMENT_PARSE ();
@@ -4595,7 +4630,7 @@ parser_parse_program (const jerry_api_char_t *source_p, /**< source code buffer
 
     if (scope_type == SCOPE_TYPE_EVAL)
     {
-      dump_retval (eval_ret_operand ());
+      dump_retval (jsp_operand_t::make_reg_operand (VM_REG_SPECIAL_EVAL_RET));
     }
     else
     {
