diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/JavaScriptCore/bytecode | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/JavaScriptCore/bytecode')
| -rw-r--r-- | Source/JavaScriptCore/bytecode/CodeBlock.cpp | 8 | ||||
| -rw-r--r-- | Source/JavaScriptCore/bytecode/Opcode.h | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp index 7b828acab..6a4d073bf 100644 --- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp @@ -512,15 +512,9 @@ void CodeBlock::dump(ExecState* exec, const Vector<Instruction>::const_iterator& dataLog("[%4d] init_lazy_reg\t %s\n", location, registerName(exec, r0).data()); break; } - case op_get_callee: { - int r0 = (++it)->u.operand; - dataLog("[%4d] op_get_callee %s\n", location, registerName(exec, r0).data()); - break; - } case op_create_this: { int r0 = (++it)->u.operand; - int r1 = (++it)->u.operand; - dataLog("[%4d] create_this %s %s\n", location, registerName(exec, r0).data(), registerName(exec, r1).data()); + dataLog("[%4d] create_this %s\n", location, registerName(exec, r0).data()); break; } case op_convert_this: { diff --git a/Source/JavaScriptCore/bytecode/Opcode.h b/Source/JavaScriptCore/bytecode/Opcode.h index a564de2da..ebf15bbd4 100644 --- a/Source/JavaScriptCore/bytecode/Opcode.h +++ b/Source/JavaScriptCore/bytecode/Opcode.h @@ -42,8 +42,7 @@ namespace JSC { 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_create_this, 2) \ macro(op_convert_this, 2) \ \ macro(op_new_object, 2) \ |