From 496629de30b43d496a93ccd185faf02a1d45ddb5 Mon Sep 17 00:00:00 2001 From: "oliver@apple.com" Date: Tue, 16 Sep 2008 06:06:23 +0000 Subject: [PATCH] Coding style cleanup. RS=Sam git-svn-id: https://svn.webkit.org/repository/webkit/trunk@36482 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 9 +++++++++ JavaScriptCore/VM/Machine.cpp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 342ff10..cc4bc8b 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,5 +1,14 @@ 2008-09-15 Oliver Hunt + RS=Sam. + + Coding style cleanup. + + * VM/Machine.cpp: + (JSC::Machine::privateExecute): + +2008-09-15 Oliver Hunt + Reviewed by Cameron Zwarich. Bug 20874: op_resolve does not do any form of caching diff --git a/JavaScriptCore/VM/Machine.cpp b/JavaScriptCore/VM/Machine.cpp index 7d05005..9a7e6b6 100644 --- a/JavaScriptCore/VM/Machine.cpp +++ b/JavaScriptCore/VM/Machine.cpp @@ -301,7 +301,7 @@ static bool NEVER_INLINE resolve(ExecState* exec, Instruction* vPC, Register* r, return false; } -static bool NEVER_INLINE resolve_skip(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue) +static bool NEVER_INLINE resolveSkip(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue) { int dst = (vPC + 1)->u.operand; int property = (vPC + 2)->u.operand; @@ -2253,7 +2253,7 @@ JSValue* Machine::privateExecute(ExecutionFlag flag, ExecState* exec, RegisterFi scope chain skipping the top 'skip' levels, and writes the resulting value to register dst. If the property is not found, raises an exception. */ - if (UNLIKELY(!resolve_skip(exec, vPC, r, scopeChain, codeBlock, exceptionValue))) + if (UNLIKELY(!resolveSkip(exec, vPC, r, scopeChain, codeBlock, exceptionValue))) goto vm_throw; vPC += 4; -- 1.8.3.1