JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / bytecode / Opcode.h

diff --git a/bytecode/Opcode.h b/bytecode/Opcode.h
index d00178bd048fb1799a9722d2853d66ec1f9bbb47..18902eb2690a3ee406d683b68045129d6895a9f6 100644 (file)
--- a/bytecode/Opcode.h
+++ b/bytecode/Opcode.h
@@ -39,13 +39,17 @@ namespace JSC {
 
     #define FOR_EACH_OPCODE_ID(macro) \
         macro(op_enter, 1) \
 
     #define FOR_EACH_OPCODE_ID(macro) \
         macro(op_enter, 1) \

-        macro(op_enter_with_activation, 2) \
-        macro(op_create_arguments, 1) \
+        macro(op_create_activation, 2) \
+        macro(op_init_lazy_reg, 2) \
+        macro(op_create_arguments, 2) \
+        macro(op_create_this, 3) \
+        macro(op_get_callee, 2) \

         macro(op_convert_this, 2) \
         macro(op_convert_this, 2) \

+        macro(op_convert_this_strict, 2) \

         \
         \

-        macro(op_unexpected_load, 3) \

         macro(op_new_object, 2) \
         macro(op_new_array, 4) \
         macro(op_new_object, 2) \
         macro(op_new_array, 4) \

+        macro(op_new_array_buffer, 4) \

         macro(op_new_regexp, 3) \
         macro(op_mov, 3) \
         \
         macro(op_new_regexp, 3) \
         macro(op_mov, 3) \
         \


@@ -67,7 +71,7 @@ namespace JSC {
         macro(op_negate, 3) \
         macro(op_add, 5) \
         macro(op_mul, 5) \
         macro(op_negate, 3) \
         macro(op_add, 5) \
         macro(op_mul, 5) \

-        macro(op_div, 4) \
+        macro(op_div, 5) \

         macro(op_mod, 4) \
         macro(op_sub, 5) \
         \
         macro(op_mod, 4) \
         macro(op_sub, 5) \
         \


@@ -79,6 +83,7 @@ namespace JSC {
         macro(op_bitor, 5) \
         macro(op_bitnot, 3) \
         \
         macro(op_bitor, 5) \
         macro(op_bitnot, 3) \
         \

+        macro(op_check_has_instance, 2) \

         macro(op_instanceof, 5) \
         macro(op_typeof, 3) \
         macro(op_is_undefined, 3) \
         macro(op_instanceof, 5) \
         macro(op_typeof, 3) \
         macro(op_is_undefined, 3) \


@@ -91,29 +96,43 @@ namespace JSC {
         \
         macro(op_resolve, 3) \
         macro(op_resolve_skip, 4) \
         \
         macro(op_resolve, 3) \
         macro(op_resolve_skip, 4) \

-        macro(op_resolve_global, 6) \
+        macro(op_resolve_global, 5) \
+        macro(op_resolve_global_dynamic, 6) \

         macro(op_get_scoped_var, 4) \
         macro(op_put_scoped_var, 4) \
         macro(op_get_scoped_var, 4) \
         macro(op_put_scoped_var, 4) \

-        macro(op_get_global_var, 4) \
-        macro(op_put_global_var, 4) \
-        macro(op_resolve_base, 3) \
+        macro(op_get_global_var, 3) \
+        macro(op_put_global_var, 3) \
+        macro(op_resolve_base, 4) \
+        macro(op_ensure_property_exists, 3) \

         macro(op_resolve_with_base, 4) \
         macro(op_resolve_with_base, 4) \

-        macro(op_resolve_func, 4) \

         macro(op_get_by_id, 8) \
         macro(op_get_by_id_self, 8) \
         macro(op_get_by_id_self_list, 8) \
         macro(op_get_by_id_proto, 8) \
         macro(op_get_by_id_proto_list, 8) \
         macro(op_get_by_id_chain, 8) \
         macro(op_get_by_id, 8) \
         macro(op_get_by_id_self, 8) \
         macro(op_get_by_id_self_list, 8) \
         macro(op_get_by_id_proto, 8) \
         macro(op_get_by_id_proto_list, 8) \
         macro(op_get_by_id_chain, 8) \

+        macro(op_get_by_id_getter_self, 8) \
+        macro(op_get_by_id_getter_self_list, 8) \
+        macro(op_get_by_id_getter_proto, 8) \
+        macro(op_get_by_id_getter_proto_list, 8) \
+        macro(op_get_by_id_getter_chain, 8) \
+        macro(op_get_by_id_custom_self, 8) \
+        macro(op_get_by_id_custom_self_list, 8) \
+        macro(op_get_by_id_custom_proto, 8) \
+        macro(op_get_by_id_custom_proto_list, 8) \
+        macro(op_get_by_id_custom_chain, 8) \

         macro(op_get_by_id_generic, 8) \
         macro(op_get_array_length, 8) \
         macro(op_get_string_length, 8) \
         macro(op_get_by_id_generic, 8) \
         macro(op_get_array_length, 8) \
         macro(op_get_string_length, 8) \

-        macro(op_put_by_id, 8) \
-        macro(op_put_by_id_transition, 8) \
-        macro(op_put_by_id_replace, 8) \
-        macro(op_put_by_id_generic, 8) \
+        macro(op_get_arguments_length, 4) \
+        macro(op_put_by_id, 9) \
+        macro(op_put_by_id_transition, 9) \
+        macro(op_put_by_id_replace, 9) \
+        macro(op_put_by_id_generic, 9) \

         macro(op_del_by_id, 4) \
         macro(op_get_by_val, 4) \
         macro(op_del_by_id, 4) \
         macro(op_get_by_val, 4) \

+        macro(op_get_argument_by_val, 4) \
+        macro(op_get_by_pname, 7) \

         macro(op_put_by_val, 4) \
         macro(op_del_by_val, 4) \
         macro(op_put_by_index, 4) \
         macro(op_put_by_val, 4) \
         macro(op_del_by_val, 4) \
         macro(op_put_by_index, 4) \


@@ -125,29 +144,40 @@ namespace JSC {
         macro(op_jfalse, 3) \
         macro(op_jeq_null, 3) \
         macro(op_jneq_null, 3) \
         macro(op_jfalse, 3) \
         macro(op_jeq_null, 3) \
         macro(op_jneq_null, 3) \

+        macro(op_jneq_ptr, 4) \

         macro(op_jnless, 4) \
         macro(op_jnless, 4) \

+        macro(op_jnlesseq, 4) \
+        macro(op_jless, 4) \
+        macro(op_jlesseq, 4) \

         macro(op_jmp_scopes, 3) \
         macro(op_loop, 2) \
         macro(op_loop_if_true, 3) \
         macro(op_jmp_scopes, 3) \
         macro(op_loop, 2) \
         macro(op_loop_if_true, 3) \

+        macro(op_loop_if_false, 3) \

         macro(op_loop_if_less, 4) \
         macro(op_loop_if_lesseq, 4) \
         macro(op_switch_imm, 4) \
         macro(op_switch_char, 4) \
         macro(op_switch_string, 4) \
         \
         macro(op_loop_if_less, 4) \
         macro(op_loop_if_lesseq, 4) \
         macro(op_switch_imm, 4) \
         macro(op_switch_char, 4) \
         macro(op_switch_string, 4) \
         \

-        macro(op_new_func, 3) \
+        macro(op_new_func, 4) \

         macro(op_new_func_exp, 3) \
         macro(op_new_func_exp, 3) \

-        macro(op_call, 5) \
-        macro(op_call_eval, 5) \
-        macro(op_tear_off_activation, 2) \
-        macro(op_tear_off_arguments, 1) \
+        macro(op_call, 4) \
+        macro(op_call_eval, 4) \
+        macro(op_call_varargs, 4) \
+        macro(op_load_varargs, 4) \
+        macro(op_tear_off_activation, 3) \
+        macro(op_tear_off_arguments, 2) \

         macro(op_ret, 2) \
         macro(op_ret, 2) \

+        macro(op_call_put_result, 2) \
+        macro(op_ret_object_or_this, 3) \
+        macro(op_method_check, 1) \

         \
         \

-        macro(op_construct, 7) \
-        macro(op_construct_verify, 3) \
+        macro(op_construct, 4) \
+        macro(op_strcat, 4) \
+        macro(op_to_primitive, 3) \

         \
         \

-        macro(op_get_pnames, 3) \
-        macro(op_next_pname, 4) \
+        macro(op_get_pnames, 6) \
+        macro(op_next_pname, 7) \

         \
         macro(op_push_scope, 2) \
         macro(op_pop_scope, 1) \
         \
         macro(op_push_scope, 2) \
         macro(op_pop_scope, 1) \


@@ -155,7 +185,7 @@ namespace JSC {
         \
         macro(op_catch, 2) \
         macro(op_throw, 2) \
         \
         macro(op_catch, 2) \
         macro(op_throw, 2) \

-        macro(op_new_error, 4) \
+        macro(op_throw_reference_error, 2) \

         \
         macro(op_jsr, 3) \
         macro(op_sret, 2) \
         \
         macro(op_jsr, 3) \
         macro(op_sret, 2) \


@@ -174,7 +204,7 @@ namespace JSC {
 
     #define OPCODE_ID_LENGTHS(id, length) const int id##_length = length;
          FOR_EACH_OPCODE_ID(OPCODE_ID_LENGTHS);
 
     #define OPCODE_ID_LENGTHS(id, length) const int id##_length = length;
          FOR_EACH_OPCODE_ID(OPCODE_ID_LENGTHS);

-    #undef OPCODE_ID_SIZES
+    #undef OPCODE_ID_LENGTHS

     
     #define OPCODE_LENGTH(opcode) opcode##_length
 
     
     #define OPCODE_LENGTH(opcode) opcode##_length
 


@@ -186,8 +216,12 @@ namespace JSC {
         FOR_EACH_OPCODE_ID(VERIFY_OPCODE_ID);
     #undef VERIFY_OPCODE_ID
 
         FOR_EACH_OPCODE_ID(VERIFY_OPCODE_ID);
     #undef VERIFY_OPCODE_ID
 

-#if HAVE(COMPUTED_GOTO)
+#if ENABLE(COMPUTED_GOTO_INTERPRETER)
+#if COMPILER(RVCT) || COMPILER(INTEL)

     typedef void* Opcode;
     typedef void* Opcode;

+#else
+    typedef const void* Opcode;
+#endif

 #else
     typedef OpcodeID Opcode;
 #endif
 #else
     typedef OpcodeID Opcode;
 #endif


@@ -226,6 +260,17 @@ namespace JSC {
 
 #endif
 
 
 #endif
 

+    inline size_t opcodeLength(OpcodeID opcode)
+    {
+        switch (opcode) {
+#define OPCODE_ID_LENGTHS(id, length) case id: return OPCODE_LENGTH(id);
+             FOR_EACH_OPCODE_ID(OPCODE_ID_LENGTHS)
+#undef OPCODE_ID_LENGTHS
+        }
+        ASSERT_NOT_REACHED();
+        return 0;
+    }
+

 } // namespace JSC
 
 #endif // Opcode_h
 } // namespace JSC
 
 #endif // Opcode_h