diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-10 19:10:20 +0200 |
| commit | 284837daa07b29d6a63a748544a90b1f5842ac5c (patch) | |
| tree | ecd258180bde91fe741e0cfd2638beb3c6da7e8e /Source/JavaScriptCore/bytecode/Opcode.h | |
| parent | 2e2ba8ff45915f40ed3e014101269c175f2a89a0 (diff) | |
| download | qtwebkit-284837daa07b29d6a63a748544a90b1f5842ac5c.tar.gz | |
Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)
New snapshot
Diffstat (limited to 'Source/JavaScriptCore/bytecode/Opcode.h')
| -rw-r--r-- | Source/JavaScriptCore/bytecode/Opcode.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/bytecode/Opcode.h b/Source/JavaScriptCore/bytecode/Opcode.h index 777b4876f..a63cccaec 100644 --- a/Source/JavaScriptCore/bytecode/Opcode.h +++ b/Source/JavaScriptCore/bytecode/Opcode.h @@ -30,6 +30,8 @@ #ifndef Opcode_h #define Opcode_h +#include "LLIntOpcode.h" + #include <algorithm> #include <string.h> @@ -186,9 +188,9 @@ namespace JSC { macro(op_get_pnames, 6) \ macro(op_next_pname, 7) \ \ - macro(op_push_scope, 2) \ + macro(op_push_with_scope, 2) \ macro(op_pop_scope, 1) \ - macro(op_push_new_scope, 4) \ + macro(op_push_name_scope, 4) \ \ macro(op_catch, 2) \ macro(op_throw, 2) \ @@ -198,6 +200,8 @@ namespace JSC { macro(op_profile_will_call, 2) \ macro(op_profile_did_call, 2) \ \ + FOR_EACH_LLINT_OPCODE_EXTENSION(macro) \ + \ macro(op_end, 2) // end must be the last opcode in the list #define OPCODE_ID_ENUM(opcode, length) opcode, @@ -221,13 +225,9 @@ namespace JSC { FOR_EACH_OPCODE_ID(VERIFY_OPCODE_ID); #undef VERIFY_OPCODE_ID -#if ENABLE(COMPUTED_GOTO_CLASSIC_INTERPRETER) || ENABLE(LLINT) -#if COMPILER(RVCT) || COMPILER(INTEL) +#if ENABLE(COMPUTED_GOTO_OPCODES) typedef void* Opcode; #else - typedef const void* Opcode; -#endif -#else typedef OpcodeID Opcode; #endif |