<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38423] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/38423">38423</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2008-11-15 11:55:20 -0800 (Sat, 15 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>JavaScriptCore:

2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Reviewed by Sam Weinig.
        
        Renamed Machine to BytecodeInterpreter.
        
        Nixed the Interpreter class, and changed its two functions to stand-alone
        functions.

        * JavaScriptCore.exp:
        * VM/CTI.cpp:
        (JSC::):
        (JSC::CTI::emitCTICall):
        (JSC::CTI::CTI):
        (JSC::CTI::compileOpCall):
        (JSC::CTI::emitSlowScriptCheck):
        (JSC::CTI::compileBinaryArithOpSlowCase):
        (JSC::CTI::privateCompileMainPass):
        (JSC::CTI::privateCompileSlowCases):
        (JSC::CTI::privateCompile):
        (JSC::CTI::privateCompileGetByIdSelf):
        (JSC::CTI::privateCompileGetByIdProto):
        (JSC::CTI::privateCompileGetByIdChain):
        (JSC::CTI::privateCompilePutByIdReplace):
        (JSC::CTI::privateCompilePutByIdTransition):
        (JSC::CTI::privateCompileCTIMachineTrampolines):
        (JSC::CTI::freeCTIMachineTrampolines):
        (JSC::CTI::patchGetByIdSelf):
        (JSC::CTI::patchPutByIdReplace):
        (JSC::CTI::privateCompilePatchGetArrayLength):
        (JSC::CTI::compileRegExp):
        * VM/CTI.h:
        * VM/CodeBlock.cpp:
        (JSC::CodeBlock::printStructureIDs):
        (JSC::CodeBlock::dump):
        (JSC::CodeBlock::derefStructureIDs):
        (JSC::CodeBlock::refStructureIDs):
        * VM/ExceptionHelpers.cpp:
        (JSC::createNotAnObjectError):
        * VM/Machine.cpp:
        (JSC::jsLess):
        (JSC::jsLessEq):
        (JSC::BytecodeInterpreter::resolve):
        (JSC::BytecodeInterpreter::resolveSkip):
        (JSC::BytecodeInterpreter::resolveGlobal):
        (JSC::BytecodeInterpreter::resolveBase):
        (JSC::BytecodeInterpreter::resolveBaseAndProperty):
        (JSC::BytecodeInterpreter::resolveBaseAndFunc):
        (JSC::BytecodeInterpreter::slideRegisterWindowForCall):
        (JSC::BytecodeInterpreter::callEval):
        (JSC::BytecodeInterpreter::BytecodeInterpreter):
        (JSC::BytecodeInterpreter::initialize):
        (JSC::BytecodeInterpreter::~BytecodeInterpreter):
        (JSC::BytecodeInterpreter::dumpCallFrame):
        (JSC::BytecodeInterpreter::dumpRegisters):
        (JSC::BytecodeInterpreter::isOpcode):
        (JSC::BytecodeInterpreter::unwindCallFrame):
        (JSC::BytecodeInterpreter::throwException):
        (JSC::BytecodeInterpreter::execute):
        (JSC::BytecodeInterpreter::debug):
        (JSC::BytecodeInterpreter::resetTimeoutCheck):
        (JSC::BytecodeInterpreter::checkTimeout):
        (JSC::BytecodeInterpreter::createExceptionScope):
        (JSC::BytecodeInterpreter::tryCachePutByID):
        (JSC::BytecodeInterpreter::uncachePutByID):
        (JSC::BytecodeInterpreter::tryCacheGetByID):
        (JSC::BytecodeInterpreter::uncacheGetByID):
        (JSC::BytecodeInterpreter::privateExecute):
        (JSC::BytecodeInterpreter::retrieveArguments):
        (JSC::BytecodeInterpreter::retrieveCaller):
        (JSC::BytecodeInterpreter::retrieveLastCaller):
        (JSC::BytecodeInterpreter::findFunctionCallFrame):
        (JSC::BytecodeInterpreter::tryCTICachePutByID):
        (JSC::BytecodeInterpreter::tryCTICacheGetByID):
        (JSC::BytecodeInterpreter::cti_op_convert_this):
        (JSC::BytecodeInterpreter::cti_op_end):
        (JSC::BytecodeInterpreter::cti_op_add):
        (JSC::BytecodeInterpreter::cti_op_pre_inc):
        (JSC::BytecodeInterpreter::cti_timeout_check):
        (JSC::BytecodeInterpreter::cti_register_file_check):
        (JSC::BytecodeInterpreter::cti_op_loop_if_less):
        (JSC::BytecodeInterpreter::cti_op_loop_if_lesseq):
        (JSC::BytecodeInterpreter::cti_op_new_object):
        (JSC::BytecodeInterpreter::cti_op_put_by_id):
        (JSC::BytecodeInterpreter::cti_op_put_by_id_second):
        (JSC::BytecodeInterpreter::cti_op_put_by_id_generic):
        (JSC::BytecodeInterpreter::cti_op_put_by_id_fail):
        (JSC::BytecodeInterpreter::cti_op_get_by_id):
        (JSC::BytecodeInterpreter::cti_op_get_by_id_second):
        (JSC::BytecodeInterpreter::cti_op_get_by_id_generic):
        (JSC::BytecodeInterpreter::cti_op_get_by_id_fail):
        (JSC::BytecodeInterpreter::cti_op_instanceof):
        (JSC::BytecodeInterpreter::cti_op_del_by_id):
        (JSC::BytecodeInterpreter::cti_op_mul):
        (JSC::BytecodeInterpreter::cti_op_new_func):
        (JSC::BytecodeInterpreter::cti_op_call_JSFunction):
        (JSC::BytecodeInterpreter::cti_op_call_arityCheck):
        (JSC::BytecodeInterpreter::cti_vm_dontLazyLinkCall):
        (JSC::BytecodeInterpreter::cti_vm_lazyLinkCall):
        (JSC::BytecodeInterpreter::cti_op_push_activation):
        (JSC::BytecodeInterpreter::cti_op_call_NotJSFunction):
        (JSC::BytecodeInterpreter::cti_op_create_arguments):
        (JSC::BytecodeInterpreter::cti_op_create_arguments_no_params):
        (JSC::BytecodeInterpreter::cti_op_tear_off_activation):
        (JSC::BytecodeInterpreter::cti_op_tear_off_arguments):
        (JSC::BytecodeInterpreter::cti_op_profile_will_call):
        (JSC::BytecodeInterpreter::cti_op_profile_did_call):
        (JSC::BytecodeInterpreter::cti_op_ret_scopeChain):
        (JSC::BytecodeInterpreter::cti_op_new_array):
        (JSC::BytecodeInterpreter::cti_op_resolve):
        (JSC::BytecodeInterpreter::cti_op_construct_JSConstruct):
        (JSC::BytecodeInterpreter::cti_op_construct_NotJSConstruct):
        (JSC::BytecodeInterpreter::cti_op_get_by_val):
        (JSC::BytecodeInterpreter::cti_op_resolve_func):
        (JSC::BytecodeInterpreter::cti_op_sub):
        (JSC::BytecodeInterpreter::cti_op_put_by_val):
        (JSC::BytecodeInterpreter::cti_op_put_by_val_array):
        (JSC::BytecodeInterpreter::cti_op_lesseq):
        (JSC::BytecodeInterpreter::cti_op_loop_if_true):
        (JSC::BytecodeInterpreter::cti_op_negate):
        (JSC::BytecodeInterpreter::cti_op_resolve_base):
        (JSC::BytecodeInterpreter::cti_op_resolve_skip):
        (JSC::BytecodeInterpreter::cti_op_resolve_global):
        (JSC::BytecodeInterpreter::cti_op_div):
        (JSC::BytecodeInterpreter::cti_op_pre_dec):
        (JSC::BytecodeInterpreter::cti_op_jless):
        (JSC::BytecodeInterpreter::cti_op_not):
        (JSC::BytecodeInterpreter::cti_op_jtrue):
        (JSC::BytecodeInterpreter::cti_op_post_inc):
        (JSC::BytecodeInterpreter::cti_op_eq):
        (JSC::BytecodeInterpreter::cti_op_lshift):
        (JSC::BytecodeInterpreter::cti_op_bitand):
        (JSC::BytecodeInterpreter::cti_op_rshift):
        (JSC::BytecodeInterpreter::cti_op_bitnot):
        (JSC::BytecodeInterpreter::cti_op_resolve_with_base):
        (JSC::BytecodeInterpreter::cti_op_new_func_exp):
        (JSC::BytecodeInterpreter::cti_op_mod):
        (JSC::BytecodeInterpreter::cti_op_less):
        (JSC::BytecodeInterpreter::cti_op_neq):
        (JSC::BytecodeInterpreter::cti_op_post_dec):
        (JSC::BytecodeInterpreter::cti_op_urshift):
        (JSC::BytecodeInterpreter::cti_op_bitxor):
        (JSC::BytecodeInterpreter::cti_op_new_regexp):
        (JSC::BytecodeInterpreter::cti_op_bitor):
        (JSC::BytecodeInterpreter::cti_op_call_eval):
        (JSC::BytecodeInterpreter::cti_op_throw):
        (JSC::BytecodeInterpreter::cti_op_get_pnames):
        (JSC::BytecodeInterpreter::cti_op_next_pname):
        (JSC::BytecodeInterpreter::cti_op_push_scope):
        (JSC::BytecodeInterpreter::cti_op_pop_scope):
        (JSC::BytecodeInterpreter::cti_op_typeof):
        (JSC::BytecodeInterpreter::cti_op_is_undefined):
        (JSC::BytecodeInterpreter::cti_op_is_boolean):
        (JSC::BytecodeInterpreter::cti_op_is_number):
        (JSC::BytecodeInterpreter::cti_op_is_string):
        (JSC::BytecodeInterpreter::cti_op_is_object):
        (JSC::BytecodeInterpreter::cti_op_is_function):
        (JSC::BytecodeInterpreter::cti_op_stricteq):
        (JSC::BytecodeInterpreter::cti_op_nstricteq):
        (JSC::BytecodeInterpreter::cti_op_to_jsnumber):
        (JSC::BytecodeInterpreter::cti_op_in):
        (JSC::BytecodeInterpreter::cti_op_push_new_scope):
        (JSC::BytecodeInterpreter::cti_op_jmp_scopes):
        (JSC::BytecodeInterpreter::cti_op_put_by_index):
        (JSC::BytecodeInterpreter::cti_op_switch_imm):
        (JSC::BytecodeInterpreter::cti_op_switch_char):
        (JSC::BytecodeInterpreter::cti_op_switch_string):
        (JSC::BytecodeInterpreter::cti_op_del_by_val):
        (JSC::BytecodeInterpreter::cti_op_put_getter):
        (JSC::BytecodeInterpreter::cti_op_put_setter):
        (JSC::BytecodeInterpreter::cti_op_new_error):
        (JSC::BytecodeInterpreter::cti_op_debug):
        (JSC::BytecodeInterpreter::cti_vm_throw):
        * VM/Machine.h:
        * VM/Register.h:
        * VM/SamplingTool.cpp:
        (JSC::SamplingTool::run):
        * VM/SamplingTool.h:
        (JSC::SamplingTool::SamplingTool):
        * bytecompiler/CodeGenerator.cpp:
        (JSC::CodeGenerator::generate):
        (JSC::CodeGenerator::CodeGenerator):
        (JSC::CodeGenerator::emitOpcode):
        * debugger/DebuggerCallFrame.cpp:
        (JSC::DebuggerCallFrame::evaluate):
        * jsc.cpp:
        (runWithScripts):
        * parser/Nodes.cpp:
        (JSC::ScopeNode::ScopeNode):
        * profiler/ProfileGenerator.cpp:
        (JSC::ProfileGenerator::addParentForConsoleStart):
        * runtime/ArrayPrototype.cpp:
        (JSC::arrayProtoFuncPop):
        (JSC::arrayProtoFuncPush):
        * runtime/Collector.cpp:
        (JSC::Heap::collect):
        * runtime/ExecState.h:
        (JSC::ExecState::interpreter):
        * runtime/FunctionPrototype.cpp:
        (JSC::functionProtoFuncApply):
        * runtime/Interpreter.cpp:
        (JSC::Interpreter::evaluate):
        * runtime/JSCell.h:
        * runtime/JSFunction.cpp:
        (JSC::JSFunction::call):
        (JSC::JSFunction::argumentsGetter):
        (JSC::JSFunction::callerGetter):
        (JSC::JSFunction::construct):
        * runtime/JSFunction.h:
        * runtime/JSGlobalData.cpp:
        (JSC::JSGlobalData::JSGlobalData):
        (JSC::JSGlobalData::~JSGlobalData):
        * runtime/JSGlobalData.h:
        * runtime/JSGlobalObject.cpp:
        (JSC::JSGlobalObject::~JSGlobalObject):
        (JSC::JSGlobalObject::setTimeoutTime):
        (JSC::JSGlobalObject::startTimeoutCheck):
        (JSC::JSGlobalObject::stopTimeoutCheck):
        (JSC::JSGlobalObject::mark):
        * runtime/JSGlobalObjectFunctions.cpp:
        (JSC::globalFuncEval):
        * runtime/JSString.h:
        * runtime/RegExp.cpp:
        (JSC::RegExp::RegExp):

JavaScriptGlue:

2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Reviewed by Sam Weinig.
        
        Updated for JavaScriptCore renames.

        * JSRun.cpp:
        (JSRun::Evaluate):
        (JSRun::CheckSyntax):

WebCore:

2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Reviewed by Sam Weinig.
        
        Updated for JavaScriptCore renames.

        * bindings/js/JSNodeCustom.cpp:
        (WebCore::JSNode::mark):
        * bindings/js/JSXMLHttpRequestCustom.cpp:
        (WebCore::JSXMLHttpRequest::send):
        * bindings/js/ScriptController.cpp:
        (WebCore::ScriptController::evaluate):
        * bindings/js/WorkerScriptController.cpp:
        (WebCore::WorkerScriptController::evaluate):
        * bindings/objc/WebScriptObject.mm:
        (-[WebScriptObject evaluateWebScript:]):
        * bridge/NP_jsobject.cpp:
        (_NPN_Evaluate):
        * bridge/jni/jni_jsobject.mm:
        (JavaJSObject::eval):
        * page/Console.cpp:
        (WebCore::retrieveLastCaller):
        (WebCore::Console::trace):

WebKit/win:

2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Reviewed by Sam Weinig.
        
        Updated for JavaScriptCore renames.

        * WebScriptCallFrame.cpp:
        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreAPIJSBasecpp">trunk/JavaScriptCore/API/JSBase.cpp</a></li>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCoreJavaScriptCoreexp">trunk/JavaScriptCore/JavaScriptCore.exp</a></li>
<li><a href="#trunkJavaScriptCoreVMCTIcpp">trunk/JavaScriptCore/VM/CTI.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMCTIh">trunk/JavaScriptCore/VM/CTI.h</a></li>
<li><a href="#trunkJavaScriptCoreVMCodeBlockcpp">trunk/JavaScriptCore/VM/CodeBlock.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMExceptionHelperscpp">trunk/JavaScriptCore/VM/ExceptionHelpers.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMMachinecpp">trunk/JavaScriptCore/VM/Machine.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMMachineh">trunk/JavaScriptCore/VM/Machine.h</a></li>
<li><a href="#trunkJavaScriptCoreVMRegisterh">trunk/JavaScriptCore/VM/Register.h</a></li>
<li><a href="#trunkJavaScriptCoreVMSamplingToolcpp">trunk/JavaScriptCore/VM/SamplingTool.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMSamplingToolh">trunk/JavaScriptCore/VM/SamplingTool.h</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerCodeGeneratorcpp">trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkJavaScriptCorejsccpp">trunk/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkJavaScriptCoreparserNodescpp">trunk/JavaScriptCore/parser/Nodes.cpp</a></li>
<li><a href="#trunkJavaScriptCoreprofilerProfileGeneratorcpp">trunk/JavaScriptCore/profiler/ProfileGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeArrayPrototypecpp">trunk/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeCollectorcpp">trunk/JavaScriptCore/runtime/Collector.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecStateh">trunk/JavaScriptCore/runtime/ExecState.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeFunctionPrototypecpp">trunk/JavaScriptCore/runtime/FunctionPrototype.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeInterpretercpp">trunk/JavaScriptCore/runtime/Interpreter.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeInterpreterh">trunk/JavaScriptCore/runtime/Interpreter.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSCellh">trunk/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSFunctioncpp">trunk/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSFunctionh">trunk/JavaScriptCore/runtime/JSFunction.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalDatacpp">trunk/JavaScriptCore/runtime/JSGlobalData.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalDatah">trunk/JavaScriptCore/runtime/JSGlobalData.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSStringh">trunk/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeRegExpcpp">trunk/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkJavaScriptGlueChangeLog">trunk/JavaScriptGlue/ChangeLog</a></li>
<li><a href="#trunkJavaScriptGlueJSRuncpp">trunk/JavaScriptGlue/JSRun.cpp</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsjsJSNodeCustomcpp">trunk/WebCore/bindings/js/JSNodeCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSXMLHttpRequestCustomcpp">trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsScriptControllercpp">trunk/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsWorkerScriptControllercpp">trunk/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkWebCorebindingsobjcWebScriptObjectmm">trunk/WebCore/bindings/objc/WebScriptObject.mm</a></li>
<li><a href="#trunkWebCorebridgeNP_jsobjectcpp">trunk/WebCore/bridge/NP_jsobject.cpp</a></li>
<li><a href="#trunkWebCorebridgejnijni_jsobjectmm">trunk/WebCore/bridge/jni/jni_jsobject.mm</a></li>
<li><a href="#trunkWebCorepageConsolecpp">trunk/WebCore/page/Console.cpp</a></li>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebScriptCallFramecpp">trunk/WebKit/win/WebScriptCallFrame.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreAPIJSBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/API/JSBase.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/API/JSBase.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/API/JSBase.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx"> 
</span><span class="cx">     JSObject* jsThisObject = toJS(thisObject);
</span><span class="cx"> 
</span><del>-    // Interpreter::evaluate sets &quot;this&quot; to the global object if it is NULL
</del><ins>+    // evaluate sets &quot;this&quot; to the global object if it is NULL
</ins><span class="cx">     JSGlobalObject* globalObject = exec-&gt;dynamicGlobalObject();
</span><span class="cx">     SourceCode source = makeSource(script-&gt;ustring(), sourceURL-&gt;ustring(), startingLineNumber);
</span><del>-    Completion completion = Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), source, jsThisObject);
</del><ins>+    Completion completion = evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), source, jsThisObject);
</ins><span class="cx"> 
</span><span class="cx">     if (completion.complType() == Throw) {
</span><span class="cx">         if (exception)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">     JSLock lock(exec);
</span><span class="cx"> 
</span><span class="cx">     SourceCode source = makeSource(script-&gt;ustring(), sourceURL-&gt;ustring(), startingLineNumber);
</span><del>-    Completion completion = Interpreter::checkSyntax(exec-&gt;dynamicGlobalObject()-&gt;globalExec(), source);
</del><ins>+    Completion completion = checkSyntax(exec-&gt;dynamicGlobalObject()-&gt;globalExec(), source);
</ins><span class="cx">     if (completion.complType() == Throw) {
</span><span class="cx">         if (exception)
</span><span class="cx">             *exception = toRef(completion.value());
</span></span></pre></div>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/ChangeLog        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -1,3 +1,228 @@
</span><ins>+2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+        
+        Renamed Machine to BytecodeInterpreter.
+        
+        Nixed the Interpreter class, and changed its two functions to stand-alone
+        functions.
+
+        * JavaScriptCore.exp:
+        * VM/CTI.cpp:
+        (JSC::):
+        (JSC::CTI::emitCTICall):
+        (JSC::CTI::CTI):
+        (JSC::CTI::compileOpCall):
+        (JSC::CTI::emitSlowScriptCheck):
+        (JSC::CTI::compileBinaryArithOpSlowCase):
+        (JSC::CTI::privateCompileMainPass):
+        (JSC::CTI::privateCompileSlowCases):
+        (JSC::CTI::privateCompile):
+        (JSC::CTI::privateCompileGetByIdSelf):
+        (JSC::CTI::privateCompileGetByIdProto):
+        (JSC::CTI::privateCompileGetByIdChain):
+        (JSC::CTI::privateCompilePutByIdReplace):
+        (JSC::CTI::privateCompilePutByIdTransition):
+        (JSC::CTI::privateCompileCTIMachineTrampolines):
+        (JSC::CTI::freeCTIMachineTrampolines):
+        (JSC::CTI::patchGetByIdSelf):
+        (JSC::CTI::patchPutByIdReplace):
+        (JSC::CTI::privateCompilePatchGetArrayLength):
+        (JSC::CTI::compileRegExp):
+        * VM/CTI.h:
+        * VM/CodeBlock.cpp:
+        (JSC::CodeBlock::printStructureIDs):
+        (JSC::CodeBlock::dump):
+        (JSC::CodeBlock::derefStructureIDs):
+        (JSC::CodeBlock::refStructureIDs):
+        * VM/ExceptionHelpers.cpp:
+        (JSC::createNotAnObjectError):
+        * VM/Machine.cpp:
+        (JSC::jsLess):
+        (JSC::jsLessEq):
+        (JSC::BytecodeInterpreter::resolve):
+        (JSC::BytecodeInterpreter::resolveSkip):
+        (JSC::BytecodeInterpreter::resolveGlobal):
+        (JSC::BytecodeInterpreter::resolveBase):
+        (JSC::BytecodeInterpreter::resolveBaseAndProperty):
+        (JSC::BytecodeInterpreter::resolveBaseAndFunc):
+        (JSC::BytecodeInterpreter::slideRegisterWindowForCall):
+        (JSC::BytecodeInterpreter::callEval):
+        (JSC::BytecodeInterpreter::BytecodeInterpreter):
+        (JSC::BytecodeInterpreter::initialize):
+        (JSC::BytecodeInterpreter::~BytecodeInterpreter):
+        (JSC::BytecodeInterpreter::dumpCallFrame):
+        (JSC::BytecodeInterpreter::dumpRegisters):
+        (JSC::BytecodeInterpreter::isOpcode):
+        (JSC::BytecodeInterpreter::unwindCallFrame):
+        (JSC::BytecodeInterpreter::throwException):
+        (JSC::BytecodeInterpreter::execute):
+        (JSC::BytecodeInterpreter::debug):
+        (JSC::BytecodeInterpreter::resetTimeoutCheck):
+        (JSC::BytecodeInterpreter::checkTimeout):
+        (JSC::BytecodeInterpreter::createExceptionScope):
+        (JSC::BytecodeInterpreter::tryCachePutByID):
+        (JSC::BytecodeInterpreter::uncachePutByID):
+        (JSC::BytecodeInterpreter::tryCacheGetByID):
+        (JSC::BytecodeInterpreter::uncacheGetByID):
+        (JSC::BytecodeInterpreter::privateExecute):
+        (JSC::BytecodeInterpreter::retrieveArguments):
+        (JSC::BytecodeInterpreter::retrieveCaller):
+        (JSC::BytecodeInterpreter::retrieveLastCaller):
+        (JSC::BytecodeInterpreter::findFunctionCallFrame):
+        (JSC::BytecodeInterpreter::tryCTICachePutByID):
+        (JSC::BytecodeInterpreter::tryCTICacheGetByID):
+        (JSC::BytecodeInterpreter::cti_op_convert_this):
+        (JSC::BytecodeInterpreter::cti_op_end):
+        (JSC::BytecodeInterpreter::cti_op_add):
+        (JSC::BytecodeInterpreter::cti_op_pre_inc):
+        (JSC::BytecodeInterpreter::cti_timeout_check):
+        (JSC::BytecodeInterpreter::cti_register_file_check):
+        (JSC::BytecodeInterpreter::cti_op_loop_if_less):
+        (JSC::BytecodeInterpreter::cti_op_loop_if_lesseq):
+        (JSC::BytecodeInterpreter::cti_op_new_object):
+        (JSC::BytecodeInterpreter::cti_op_put_by_id):
+        (JSC::BytecodeInterpreter::cti_op_put_by_id_second):
+        (JSC::BytecodeInterpreter::cti_op_put_by_id_generic):
+        (JSC::BytecodeInterpreter::cti_op_put_by_id_fail):
+        (JSC::BytecodeInterpreter::cti_op_get_by_id):
+        (JSC::BytecodeInterpreter::cti_op_get_by_id_second):
+        (JSC::BytecodeInterpreter::cti_op_get_by_id_generic):
+        (JSC::BytecodeInterpreter::cti_op_get_by_id_fail):
+        (JSC::BytecodeInterpreter::cti_op_instanceof):
+        (JSC::BytecodeInterpreter::cti_op_del_by_id):
+        (JSC::BytecodeInterpreter::cti_op_mul):
+        (JSC::BytecodeInterpreter::cti_op_new_func):
+        (JSC::BytecodeInterpreter::cti_op_call_JSFunction):
+        (JSC::BytecodeInterpreter::cti_op_call_arityCheck):
+        (JSC::BytecodeInterpreter::cti_vm_dontLazyLinkCall):
+        (JSC::BytecodeInterpreter::cti_vm_lazyLinkCall):
+        (JSC::BytecodeInterpreter::cti_op_push_activation):
+        (JSC::BytecodeInterpreter::cti_op_call_NotJSFunction):
+        (JSC::BytecodeInterpreter::cti_op_create_arguments):
+        (JSC::BytecodeInterpreter::cti_op_create_arguments_no_params):
+        (JSC::BytecodeInterpreter::cti_op_tear_off_activation):
+        (JSC::BytecodeInterpreter::cti_op_tear_off_arguments):
+        (JSC::BytecodeInterpreter::cti_op_profile_will_call):
+        (JSC::BytecodeInterpreter::cti_op_profile_did_call):
+        (JSC::BytecodeInterpreter::cti_op_ret_scopeChain):
+        (JSC::BytecodeInterpreter::cti_op_new_array):
+        (JSC::BytecodeInterpreter::cti_op_resolve):
+        (JSC::BytecodeInterpreter::cti_op_construct_JSConstruct):
+        (JSC::BytecodeInterpreter::cti_op_construct_NotJSConstruct):
+        (JSC::BytecodeInterpreter::cti_op_get_by_val):
+        (JSC::BytecodeInterpreter::cti_op_resolve_func):
+        (JSC::BytecodeInterpreter::cti_op_sub):
+        (JSC::BytecodeInterpreter::cti_op_put_by_val):
+        (JSC::BytecodeInterpreter::cti_op_put_by_val_array):
+        (JSC::BytecodeInterpreter::cti_op_lesseq):
+        (JSC::BytecodeInterpreter::cti_op_loop_if_true):
+        (JSC::BytecodeInterpreter::cti_op_negate):
+        (JSC::BytecodeInterpreter::cti_op_resolve_base):
+        (JSC::BytecodeInterpreter::cti_op_resolve_skip):
+        (JSC::BytecodeInterpreter::cti_op_resolve_global):
+        (JSC::BytecodeInterpreter::cti_op_div):
+        (JSC::BytecodeInterpreter::cti_op_pre_dec):
+        (JSC::BytecodeInterpreter::cti_op_jless):
+        (JSC::BytecodeInterpreter::cti_op_not):
+        (JSC::BytecodeInterpreter::cti_op_jtrue):
+        (JSC::BytecodeInterpreter::cti_op_post_inc):
+        (JSC::BytecodeInterpreter::cti_op_eq):
+        (JSC::BytecodeInterpreter::cti_op_lshift):
+        (JSC::BytecodeInterpreter::cti_op_bitand):
+        (JSC::BytecodeInterpreter::cti_op_rshift):
+        (JSC::BytecodeInterpreter::cti_op_bitnot):
+        (JSC::BytecodeInterpreter::cti_op_resolve_with_base):
+        (JSC::BytecodeInterpreter::cti_op_new_func_exp):
+        (JSC::BytecodeInterpreter::cti_op_mod):
+        (JSC::BytecodeInterpreter::cti_op_less):
+        (JSC::BytecodeInterpreter::cti_op_neq):
+        (JSC::BytecodeInterpreter::cti_op_post_dec):
+        (JSC::BytecodeInterpreter::cti_op_urshift):
+        (JSC::BytecodeInterpreter::cti_op_bitxor):
+        (JSC::BytecodeInterpreter::cti_op_new_regexp):
+        (JSC::BytecodeInterpreter::cti_op_bitor):
+        (JSC::BytecodeInterpreter::cti_op_call_eval):
+        (JSC::BytecodeInterpreter::cti_op_throw):
+        (JSC::BytecodeInterpreter::cti_op_get_pnames):
+        (JSC::BytecodeInterpreter::cti_op_next_pname):
+        (JSC::BytecodeInterpreter::cti_op_push_scope):
+        (JSC::BytecodeInterpreter::cti_op_pop_scope):
+        (JSC::BytecodeInterpreter::cti_op_typeof):
+        (JSC::BytecodeInterpreter::cti_op_is_undefined):
+        (JSC::BytecodeInterpreter::cti_op_is_boolean):
+        (JSC::BytecodeInterpreter::cti_op_is_number):
+        (JSC::BytecodeInterpreter::cti_op_is_string):
+        (JSC::BytecodeInterpreter::cti_op_is_object):
+        (JSC::BytecodeInterpreter::cti_op_is_function):
+        (JSC::BytecodeInterpreter::cti_op_stricteq):
+        (JSC::BytecodeInterpreter::cti_op_nstricteq):
+        (JSC::BytecodeInterpreter::cti_op_to_jsnumber):
+        (JSC::BytecodeInterpreter::cti_op_in):
+        (JSC::BytecodeInterpreter::cti_op_push_new_scope):
+        (JSC::BytecodeInterpreter::cti_op_jmp_scopes):
+        (JSC::BytecodeInterpreter::cti_op_put_by_index):
+        (JSC::BytecodeInterpreter::cti_op_switch_imm):
+        (JSC::BytecodeInterpreter::cti_op_switch_char):
+        (JSC::BytecodeInterpreter::cti_op_switch_string):
+        (JSC::BytecodeInterpreter::cti_op_del_by_val):
+        (JSC::BytecodeInterpreter::cti_op_put_getter):
+        (JSC::BytecodeInterpreter::cti_op_put_setter):
+        (JSC::BytecodeInterpreter::cti_op_new_error):
+        (JSC::BytecodeInterpreter::cti_op_debug):
+        (JSC::BytecodeInterpreter::cti_vm_throw):
+        * VM/Machine.h:
+        * VM/Register.h:
+        * VM/SamplingTool.cpp:
+        (JSC::SamplingTool::run):
+        * VM/SamplingTool.h:
+        (JSC::SamplingTool::SamplingTool):
+        * bytecompiler/CodeGenerator.cpp:
+        (JSC::CodeGenerator::generate):
+        (JSC::CodeGenerator::CodeGenerator):
+        (JSC::CodeGenerator::emitOpcode):
+        * debugger/DebuggerCallFrame.cpp:
+        (JSC::DebuggerCallFrame::evaluate):
+        * jsc.cpp:
+        (runWithScripts):
+        * parser/Nodes.cpp:
+        (JSC::ScopeNode::ScopeNode):
+        * profiler/ProfileGenerator.cpp:
+        (JSC::ProfileGenerator::addParentForConsoleStart):
+        * runtime/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncPop):
+        (JSC::arrayProtoFuncPush):
+        * runtime/Collector.cpp:
+        (JSC::Heap::collect):
+        * runtime/ExecState.h:
+        (JSC::ExecState::interpreter):
+        * runtime/FunctionPrototype.cpp:
+        (JSC::functionProtoFuncApply):
+        * runtime/Interpreter.cpp:
+        (JSC::Interpreter::evaluate):
+        * runtime/JSCell.h:
+        * runtime/JSFunction.cpp:
+        (JSC::JSFunction::call):
+        (JSC::JSFunction::argumentsGetter):
+        (JSC::JSFunction::callerGetter):
+        (JSC::JSFunction::construct):
+        * runtime/JSFunction.h:
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData):
+        (JSC::JSGlobalData::~JSGlobalData):
+        * runtime/JSGlobalData.h:
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::~JSGlobalObject):
+        (JSC::JSGlobalObject::setTimeoutTime):
+        (JSC::JSGlobalObject::startTimeoutCheck):
+        (JSC::JSGlobalObject::stopTimeoutCheck):
+        (JSC::JSGlobalObject::mark):
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::globalFuncEval):
+        * runtime/JSString.h:
+        * runtime/RegExp.cpp:
+        (JSC::RegExp::RegExp):
+
</ins><span class="cx"> 2008-11-15  Maciej Stachowiak  &lt;mjs@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span></span></pre></div>
<a id="trunkJavaScriptCoreJavaScriptCoreexp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/JavaScriptCore.exp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/JavaScriptCore.exp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/JavaScriptCore.exp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -99,8 +99,6 @@
</span><span class="cx"> __ZN3JSC10throwErrorEPNS_9ExecStateENS_9ErrorTypeE
</span><span class="cx"> __ZN3JSC10throwErrorEPNS_9ExecStateENS_9ErrorTypeEPKc
</span><span class="cx"> __ZN3JSC10throwErrorEPNS_9ExecStateENS_9ErrorTypeERKNS_7UStringE
</span><del>-__ZN3JSC11Interpreter11checkSyntaxEPNS_9ExecStateERKNS_10SourceCodeE
-__ZN3JSC11Interpreter8evaluateEPNS_9ExecStateERNS_10ScopeChainERKNS_10SourceCodeEPNS_7JSValueE
</del><span class="cx"> __ZN3JSC11JSImmediate12nonInlineNaNEv
</span><span class="cx"> __ZN3JSC11JSImmediate8toObjectEPNS_7JSValueEPNS_9ExecStateE
</span><span class="cx"> __ZN3JSC11JSImmediate8toStringEPNS_7JSValueE
</span><span class="lines">@@ -119,6 +117,7 @@
</span><span class="cx"> __ZN3JSC11StructureID40addPropertyTransitionToExistingStructureEPS0_RKNS_10IdentifierEjRm
</span><span class="cx"> __ZN3JSC11StructureIDC1EPNS_7JSValueERKNS_8TypeInfoE
</span><span class="cx"> __ZN3JSC11StructureIDD1Ev
</span><ins>+__ZN3JSC11checkSyntaxEPNS_9ExecStateERKNS_10SourceCodeE
</ins><span class="cx"> __ZN3JSC12DateInstance4infoE
</span><span class="cx"> __ZN3JSC12JSGlobalData10ClientDataD2Ev
</span><span class="cx"> __ZN3JSC12JSGlobalData12createLeakedEv
</span><span class="lines">@@ -257,6 +256,7 @@
</span><span class="cx"> __ZN3JSC8Profiler13stopProfilingEPNS_9ExecStateERKNS_7UStringE
</span><span class="cx"> __ZN3JSC8Profiler14startProfilingEPNS_9ExecStateERKNS_7UStringE
</span><span class="cx"> __ZN3JSC8Profiler8profilerEv
</span><ins>+__ZN3JSC8evaluateEPNS_9ExecStateERNS_10ScopeChainERKNS_10SourceCodeEPNS_7JSValueE
</ins><span class="cx"> __ZN3JSC8jsStringEPNS_12JSGlobalDataERKNS_7UStringE
</span><span class="cx"> __ZN3JSC9CodeBlockD1Ev
</span><span class="cx"> __ZN3JSC9CodeBlockD2Ev
</span><span class="lines">@@ -315,6 +315,8 @@
</span><span class="cx"> __ZNK3JSC17DebuggerCallFrame12functionNameEv
</span><span class="cx"> __ZNK3JSC17DebuggerCallFrame4typeEv
</span><span class="cx"> __ZNK3JSC17DebuggerCallFrame8evaluateERKNS_7UStringERPNS_7JSValueE
</span><ins>+__ZNK3JSC19BytecodeInterpreter14retrieveCallerEPNS_9ExecStateEPNS_16InternalFunctionE
+__ZNK3JSC19BytecodeInterpreter18retrieveLastCallerEPNS_9ExecStateERiRlRNS_7UStringERPNS_7JSValueE
</ins><span class="cx"> __ZNK3JSC6JSCell12toThisObjectEPNS_9ExecStateE
</span><span class="cx"> __ZNK3JSC6JSCell12toThisStringEPNS_9ExecStateE
</span><span class="cx"> __ZNK3JSC6JSCell14isGetterSetterEv
</span><span class="lines">@@ -330,8 +332,6 @@
</span><span class="cx"> __ZNK3JSC7JSValue16toUInt32SlowCaseEPNS_9ExecStateERb
</span><span class="cx"> __ZNK3JSC7JSValue7toFloatEPNS_9ExecStateE
</span><span class="cx"> __ZNK3JSC7JSValue9toIntegerEPNS_9ExecStateE
</span><del>-__ZNK3JSC7Machine14retrieveCallerEPNS_9ExecStateEPNS_16InternalFunctionE
-__ZNK3JSC7Machine18retrieveLastCallerEPNS_9ExecStateERiRlRNS_7UStringERPNS_7JSValueE
</del><span class="cx"> __ZNK3JSC7UString10UTF8StringEb
</span><span class="cx"> __ZNK3JSC7UString14toStrictUInt32EPb
</span><span class="cx"> __ZNK3JSC7UString5asciiEv
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCTIcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CTI.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CTI.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/CTI.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -117,9 +117,9 @@
</span><span class="cx"> #else
</span><span class="cx">     &quot;movl %esp, 0(%esp)&quot; &quot;\n&quot;
</span><span class="cx"> #endif
</span><del>-    &quot;call &quot; SYMBOL_STRING(_ZN3JSC7Machine12cti_vm_throwEPPv) &quot;\n&quot;
</del><ins>+    &quot;call &quot; SYMBOL_STRING(_ZN3JSC19BytecodeInterpreter12cti_vm_throwEPPv) &quot;\n&quot;
</ins><span class="cx"> #else
</span><del>-    &quot;call &quot; SYMBOL_STRING(_ZN3JSC7Machine12cti_vm_throwEPvz) &quot;\n&quot;
</del><ins>+    &quot;call &quot; SYMBOL_STRING(_ZN3JSC19BytecodeInterpreter12cti_vm_throwEPvz) &quot;\n&quot;
</ins><span class="cx"> #endif
</span><span class="cx">     &quot;addl $0x20, %esp&quot; &quot;\n&quot;
</span><span class="cx">     &quot;popl %ebx&quot; &quot;\n&quot;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">     {
</span><span class="cx">         __asm {
</span><span class="cx">             mov ecx, esp;
</span><del>-            call JSC::Machine::cti_vm_throw;
</del><ins>+            call JSC::BytecodeInterpreter::cti_vm_throw;
</ins><span class="cx">             add esp, 0x20;
</span><span class="cx">             pop ebx;
</span><span class="cx">             pop edi;
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_j helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_o helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_p helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_b helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_v helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_s helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> ALWAYS_INLINE X86Assembler::JmpSrc CTI::emitCTICall(Instruction* vPC, unsigned opcodeIndex, CTIHelper_2 helper)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, true), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, true), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(vPC);
</span><span class="cx"> #endif
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx">     X86Assembler::JmpSrc call = m_jit.emitCall();
</span><span class="cx">     m_calls.append(CallRecord(call, helper, opcodeIndex));
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(vPC, false), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+    m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(vPC, false), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx">     killLastResultRegister();
</span><span class="cx"> 
</span><span class="lines">@@ -614,8 +614,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> CTI::CTI(JSGlobalData* globalData, CodeBlock* codeBlock)
</span><del>-    : m_jit(globalData-&gt;machine-&gt;jitCodeBuffer())
-    , m_machine(globalData-&gt;machine)
</del><ins>+    : m_jit(globalData-&gt;interpreter-&gt;jitCodeBuffer())
+    , m_interpreter(globalData-&gt;interpreter)
</ins><span class="cx">     , m_globalData(globalData)
</span><span class="cx">     , m_codeBlock(codeBlock)
</span><span class="cx">     , m_labels(codeBlock ? codeBlock-&gt;instructions.size() : 0)
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">     case name: { \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx); \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx); \
</span><del>-        emitCTICall(instruction + i, i, Machine::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, BytecodeInterpreter::cti_##name); \
</ins><span class="cx">         emitPutVirtualRegister(instruction[i + 1].u.operand); \
</span><span class="cx">         i += 4; \
</span><span class="cx">         break; \
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> #define CTI_COMPILE_UNARY_OP(name) \
</span><span class="cx">     case name: { \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx); \
</span><del>-        emitCTICall(instruction + i, i, Machine::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, BytecodeInterpreter::cti_##name); \
</ins><span class="cx">         emitPutVirtualRegister(instruction[i + 1].u.operand); \
</span><span class="cx">         i += 3; \
</span><span class="cx">         break; \
</span><span class="lines">@@ -715,7 +715,7 @@
</span><span class="cx">         emitGetVirtualRegister(callee, X86::ecx, i);
</span><span class="cx">         compileOpCallEvalSetupArgs(instruction);
</span><span class="cx"> 
</span><del>-        emitCTICall(instruction, i, Machine::cti_op_call_eval);
</del><ins>+        emitCTICall(instruction, i, BytecodeInterpreter::cti_op_call_eval);
</ins><span class="cx">         m_jit.cmpl_i32r(asInteger(JSImmediate::impossibleValue()), X86::eax);
</span><span class="cx">         wasEval = m_jit.emitUnlinkedJne();
</span><span class="cx">     }
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> 
</span><span class="cx">         emitPutCTIArg(X86::ecx, 0);
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(proto, 12, X86::eax);
</span><del>-        emitCTICall(instruction, i, Machine::cti_op_construct_JSConstruct);
</del><ins>+        emitCTICall(instruction, i, BytecodeInterpreter::cti_op_construct_JSConstruct);
</ins><span class="cx">         emitPutVirtualRegister(thisRegister);
</span><span class="cx">         emitGetVirtualRegister(callee, X86::ecx, i);
</span><span class="cx">     }
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx">     emitPutVirtualRegister(dst);
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CODEBLOCK_SAMPLING)
</span><del>-        m_jit.movl_i32m(reinterpret_cast&lt;unsigned&gt;(m_codeBlock), m_machine-&gt;sampler()-&gt;codeBlockSlot());
</del><ins>+        m_jit.movl_i32m(reinterpret_cast&lt;unsigned&gt;(m_codeBlock), m_interpreter-&gt;sampler()-&gt;codeBlockSlot());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -826,11 +826,11 @@
</span><span class="cx"> {
</span><span class="cx">     m_jit.subl_i8r(1, X86::esi);
</span><span class="cx">     X86Assembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
</span><del>-    emitCTICall(vPC, opcodeIndex, Machine::cti_timeout_check);
</del><ins>+    emitCTICall(vPC, opcodeIndex, BytecodeInterpreter::cti_timeout_check);
</ins><span class="cx"> 
</span><span class="cx">     emitGetCTIParam(CTI_ARGS_globalData, X86::ecx);
</span><del>-    m_jit.movl_mr(OBJECT_OFFSET(JSGlobalData, machine), X86::ecx, X86::ecx);
-    m_jit.movl_mr(OBJECT_OFFSET(Machine, m_ticksUntilNextTimeoutCheck), X86::ecx, X86::esi);
</del><ins>+    m_jit.movl_mr(OBJECT_OFFSET(JSGlobalData, interpreter), X86::ecx, X86::ecx);
+    m_jit.movl_mr(OBJECT_OFFSET(BytecodeInterpreter, m_ticksUntilNextTimeoutCheck), X86::ecx, X86::esi);
</ins><span class="cx">     m_jit.link(skipTimeout, m_jit.label());
</span><span class="cx"> 
</span><span class="cx">     killLastResultRegister();
</span><span class="lines">@@ -1065,12 +1065,12 @@
</span><span class="cx">     emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">     emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><span class="cx">     if (opcodeID == op_add)
</span><del>-        emitCTICall(vPC, i, Machine::cti_op_add);
</del><ins>+        emitCTICall(vPC, i, BytecodeInterpreter::cti_op_add);
</ins><span class="cx">     else if (opcodeID == op_sub)
</span><del>-        emitCTICall(vPC, i, Machine::cti_op_sub);
</del><ins>+        emitCTICall(vPC, i, BytecodeInterpreter::cti_op_sub);
</ins><span class="cx">     else {
</span><span class="cx">         ASSERT(opcodeID == op_mul);
</span><del>-        emitCTICall(vPC, i, Machine::cti_op_mul);
</del><ins>+        emitCTICall(vPC, i, BytecodeInterpreter::cti_op_mul);
</ins><span class="cx">     }
</span><span class="cx">     emitPutVirtualRegister(dst);
</span><span class="cx"> }
</span><span class="lines">@@ -1084,15 +1084,15 @@
</span><span class="cx">     unsigned callLinkInfoIndex = 0;
</span><span class="cx"> 
</span><span class="cx">     for (unsigned i = 0; i &lt; instructionCount; ) {
</span><del>-        ASSERT_WITH_MESSAGE(m_machine-&gt;isOpcode(instruction[i].u.opcode), &quot;privateCompileMainPass gone bad @ %d&quot;, i);
</del><ins>+        ASSERT_WITH_MESSAGE(m_interpreter-&gt;isOpcode(instruction[i].u.opcode), &quot;privateCompileMainPass gone bad @ %d&quot;, i);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><span class="cx">         if (i &gt; 0) // Avoid the overhead of sampling op_enter twice.
</span><del>-            m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(instruction + i), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+            m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(instruction + i), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">         m_labels[i] = m_jit.label();
</span><del>-        OpcodeID opcodeID = m_machine-&gt;getOpcodeID(instruction[i].u.opcode);
</del><ins>+        OpcodeID opcodeID = m_interpreter-&gt;getOpcodeID(instruction[i].u.opcode);
</ins><span class="cx">         switch (opcodeID) {
</span><span class="cx">         case op_mov: {
</span><span class="cx">             unsigned src = instruction[i + 2].u.operand;
</span><span class="lines">@@ -1128,7 +1128,7 @@
</span><span class="cx">                 else {
</span><span class="cx">                     emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><span class="cx">                     emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx);
</span><del>-                    emitCTICall(instruction + i, i, Machine::cti_op_add);
</del><ins>+                    emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_add);
</ins><span class="cx">                     emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">                 }
</span><span class="cx">             }
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx">         }
</span><span class="cx">         case op_end: {
</span><span class="cx">             if (m_codeBlock-&gt;needsFullScopeChain)
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_end);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_end);
</ins><span class="cx">             emitGetVirtualRegister(instruction[i + 1].u.operand, X86::eax, i);
</span><span class="cx">             m_jit.pushl_m(RegisterFile::ReturnPC * static_cast&lt;int&gt;(sizeof(Register)), X86::edi);
</span><span class="cx">             m_jit.ret();
</span><span class="lines">@@ -1210,7 +1210,7 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         case op_new_object: {
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_new_object);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_object);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 2;
</span><span class="cx">             break;
</span><span class="lines">@@ -1340,7 +1340,7 @@
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 3].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_del_by_id);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_del_by_id);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -1379,7 +1379,7 @@
</span><span class="cx">         case op_new_func: {
</span><span class="cx">             FuncDeclNode* func = (m_codeBlock-&gt;functions[instruction[i + 2].u.operand]).get();
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(func), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_new_func);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_func);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -1435,19 +1435,19 @@
</span><span class="cx">         }
</span><span class="cx">         case op_tear_off_activation: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_tear_off_activation);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_tear_off_activation);
</ins><span class="cx">             i += 2;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         case op_tear_off_arguments: {
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_tear_off_arguments);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_tear_off_arguments);
</ins><span class="cx">             i += 1;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         case op_ret: {
</span><span class="cx">             // We could JIT generate the deref, only calling out to C when the refcount hits zero.
</span><span class="cx">             if (m_codeBlock-&gt;needsFullScopeChain)
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_ret_scopeChain);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_ret_scopeChain);
</ins><span class="cx"> 
</span><span class="cx">             // Return the result in %eax.
</span><span class="cx">             emitGetVirtualRegister(instruction[i + 1].u.operand, X86::eax, i);
</span><span class="lines">@@ -1469,7 +1469,7 @@
</span><span class="cx">             m_jit.leal_mr(sizeof(Register) * instruction[i + 2].u.operand, X86::edi, X86::edx);
</span><span class="cx">             emitPutCTIArg(X86::edx, 0);
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 3].u.operand, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_new_array);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_array);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx">         case op_resolve: {
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 2].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_resolve);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_resolve);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -1505,7 +1505,7 @@
</span><span class="cx">             emitFastArithImmToInt(X86::edx);
</span><span class="cx">             m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
</span><span class="cx">             m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJne(), i));
</span><del>-            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsArrayVptr), X86::eax);
</del><ins>+            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsArrayVptr), X86::eax);
</ins><span class="cx">             m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJne(), i));
</span><span class="cx"> 
</span><span class="cx">             // This is an array; get the m_storage pointer into ecx, then check if the index is below the fast cutoff
</span><span class="lines">@@ -1522,7 +1522,7 @@
</span><span class="cx">         case op_resolve_func: {
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 3].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_resolve_func);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_resolve_func);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 2].u.operand, X86::edx);
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="lines">@@ -1539,7 +1539,7 @@
</span><span class="cx">             emitFastArithImmToInt(X86::edx);
</span><span class="cx">             m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
</span><span class="cx">             m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJne(), i));
</span><del>-            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsArrayVptr), X86::eax);
</del><ins>+            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsArrayVptr), X86::eax);
</ins><span class="cx">             m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJne(), i));
</span><span class="cx"> 
</span><span class="cx">             // This is an array; get the m_storage pointer into ecx, then check if the index is below the fast cutoff
</span><span class="lines">@@ -1586,7 +1586,7 @@
</span><span class="cx">         case op_resolve_base: {
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 2].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_resolve_base);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_resolve_base);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -1611,7 +1611,7 @@
</span><span class="cx">                 m_jit.link(overflow, m_jit.label());
</span><span class="cx">                 m_jit.link(notImmediate, m_jit.label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_negate);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_negate);
</ins><span class="cx">                 emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             } else {
</span><span class="cx">                 // Slow case immediates
</span><span class="lines">@@ -1645,7 +1645,7 @@
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 2].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 0);
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 3].u.operand + m_codeBlock-&gt;needsFullScopeChain, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_resolve_skip);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_resolve_skip);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -1675,7 +1675,7 @@
</span><span class="cx">             emitPutCTIArgConstant(globalObject, 0);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 4);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(instruction + i), 8);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_resolve_global);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_resolve_global);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             m_jit.link(end, m_jit.label());
</span><span class="cx">             i += 6;
</span><span class="lines">@@ -1901,7 +1901,7 @@
</span><span class="cx">         case op_resolve_with_base: {
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 3].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_resolve_with_base);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_resolve_with_base);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 2].u.operand, X86::edx);
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="lines">@@ -1910,7 +1910,7 @@
</span><span class="cx">         case op_new_func_exp: {
</span><span class="cx">             FuncExprNode* func = (m_codeBlock-&gt;functionExpressions[instruction[i + 2].u.operand]).get();
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(func), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_new_func_exp);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_func_exp);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -1987,7 +1987,7 @@
</span><span class="cx">         case op_new_regexp: {
</span><span class="cx">             RegExp* regExp = m_codeBlock-&gt;regexps[instruction[i + 2].u.operand].get();
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(regExp), 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_new_regexp);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_regexp);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -2002,7 +2002,7 @@
</span><span class="cx">         }
</span><span class="cx">         case op_throw: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_throw);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_throw);
</ins><span class="cx">             m_jit.addl_i8r(0x20, X86::esp);
</span><span class="cx">             m_jit.popl_r(X86::ebx);
</span><span class="cx">             m_jit.popl_r(X86::edi);
</span><span class="lines">@@ -2013,7 +2013,7 @@
</span><span class="cx">         }
</span><span class="cx">         case op_get_pnames: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_get_pnames);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_get_pnames);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -2021,7 +2021,7 @@
</span><span class="cx">         case op_next_pname: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><span class="cx">             unsigned target = instruction[i + 3].u.operand;
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_next_pname);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_next_pname);
</ins><span class="cx">             m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">             X86Assembler::JmpSrc endOfIter = m_jit.emitUnlinkedJe();
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="lines">@@ -2032,12 +2032,12 @@
</span><span class="cx">         }
</span><span class="cx">         case op_push_scope: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_push_scope);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_push_scope);
</ins><span class="cx">             i += 2;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         case op_pop_scope: {
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_pop_scope);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_pop_scope);
</ins><span class="cx">             i += 1;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2081,7 +2081,7 @@
</span><span class="cx">         case op_in: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_in);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_in);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2090,7 +2090,7 @@
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 2].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 0);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_push_new_scope);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_push_new_scope);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2104,7 +2104,7 @@
</span><span class="cx">         case op_jmp_scopes: {
</span><span class="cx">             unsigned count = instruction[i + 1].u.operand;
</span><span class="cx">             emitPutCTIArgConstant(count, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_jmp_scopes);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jmp_scopes);
</ins><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             m_jmpTable.append(JmpTable(m_jit.emitUnlinkedJmp(), i + 2 + target));
</span><span class="cx">             i += 3;
</span><span class="lines">@@ -2114,7 +2114,7 @@
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 2].u.operand, 4);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 8, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_put_by_index);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_put_by_index);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2130,7 +2130,7 @@
</span><span class="cx"> 
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(scrutinee, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgConstant(tableIndex, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_switch_imm);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_switch_imm);
</ins><span class="cx">             m_jit.jmp_r(X86::eax);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2147,7 +2147,7 @@
</span><span class="cx"> 
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(scrutinee, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgConstant(tableIndex, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_switch_char);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_switch_char);
</ins><span class="cx">             m_jit.jmp_r(X86::eax);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2163,7 +2163,7 @@
</span><span class="cx"> 
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(scrutinee, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgConstant(tableIndex, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_switch_string);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_switch_string);
</ins><span class="cx">             m_jit.jmp_r(X86::eax);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2171,7 +2171,7 @@
</span><span class="cx">         case op_del_by_val: {
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_del_by_val);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_del_by_val);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2181,7 +2181,7 @@
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 2].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 4);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 8, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_put_getter);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_put_getter);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2190,7 +2190,7 @@
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 2].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 4);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 8, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_put_setter);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_put_setter);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2199,7 +2199,7 @@
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 2].u.operand, 0);
</span><span class="cx">             emitPutCTIArgConstant(asInteger(message), 4);
</span><span class="cx">             emitPutCTIArgConstant(m_codeBlock-&gt;lineNumberForVPC(&amp;instruction[i]), 8);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_new_error);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_error);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2208,7 +2208,7 @@
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 1].u.operand, 0);
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 2].u.operand, 4);
</span><span class="cx">             emitPutCTIArgConstant(instruction[i + 3].u.operand, 8);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_debug);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_debug);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2291,14 +2291,14 @@
</span><span class="cx">             for (size_t j = 0; j &lt; count; ++j)
</span><span class="cx">                 emitInitRegister(j);
</span><span class="cx"> 
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_push_activation);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_push_activation);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx"> 
</span><span class="cx">             i+= 2;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         case op_create_arguments: {
</span><del>-            emitCTICall(instruction + i, i, (m_codeBlock-&gt;numParameters == 1) ? Machine::cti_op_create_arguments_no_params : Machine::cti_op_create_arguments);
</del><ins>+            emitCTICall(instruction + i, i, (m_codeBlock-&gt;numParameters == 1) ? BytecodeInterpreter::cti_op_create_arguments_no_params : BytecodeInterpreter::cti_op_create_arguments);
</ins><span class="cx">             i += 1;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2318,7 +2318,7 @@
</span><span class="cx">             m_jit.cmpl_i32m(0, X86::eax);
</span><span class="cx">             X86Assembler::JmpSrc noProfiler = m_jit.emitUnlinkedJe();
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::eax);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_profile_will_call);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_profile_will_call);
</ins><span class="cx">             m_jit.link(noProfiler, m_jit.label());
</span><span class="cx"> 
</span><span class="cx">             i += 2;
</span><span class="lines">@@ -2329,7 +2329,7 @@
</span><span class="cx">             m_jit.cmpl_i32m(0, X86::eax);
</span><span class="cx">             X86Assembler::JmpSrc noProfiler = m_jit.emitUnlinkedJe();
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::eax);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_profile_did_call);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_profile_did_call);
</ins><span class="cx">             m_jit.link(noProfiler, m_jit.label());
</span><span class="cx"> 
</span><span class="cx">             i += 2;
</span><span class="lines">@@ -2366,7 +2366,7 @@
</span><span class="cx">         m_jit.link(iter-&gt;from, m_jit.label()); \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx); \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx); \
</span><del>-        emitCTICall(instruction + i, i, Machine::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, BytecodeInterpreter::cti_##name); \
</ins><span class="cx">         emitPutVirtualRegister(instruction[i + 1].u.operand); \
</span><span class="cx">         i += 4; \
</span><span class="cx">         break; \
</span><span class="lines">@@ -2378,7 +2378,7 @@
</span><span class="cx">         m_jit.link((++iter)-&gt;from, m_jit.label());                \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx); \
</span><span class="cx">         emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx); \
</span><del>-        emitCTICall(instruction + i, i, Machine::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, BytecodeInterpreter::cti_##name); \
</ins><span class="cx">         emitPutVirtualRegister(instruction[i + 1].u.operand); \
</span><span class="cx">         i += 4; \
</span><span class="cx">         break; \
</span><span class="lines">@@ -2399,12 +2399,12 @@
</span><span class="cx">         unsigned firstTo = i;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        switch (OpcodeID opcodeID = m_machine-&gt;getOpcodeID(instruction[i].u.opcode)) {
</del><ins>+        switch (OpcodeID opcodeID = m_interpreter-&gt;getOpcodeID(instruction[i].u.opcode)) {
</ins><span class="cx">         case op_convert_this: {
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_convert_this);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_convert_this);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 2;
</span><span class="cx">             break;
</span><span class="lines">@@ -2420,7 +2420,7 @@
</span><span class="cx">                 m_jit.link(notImm, m_jit.label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArg(X86::eax, 4);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_add);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_add);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else if (JSValue* value = getConstantImmediateNumericArg(src2)) {
</span><span class="cx">                 X86Assembler::JmpSrc notImm = iter-&gt;from;
</span><span class="lines">@@ -2429,7 +2429,7 @@
</span><span class="cx">                 m_jit.link(notImm, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_add);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_add);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else {
</span><span class="cx">                 OperandTypes types = OperandTypes::fromInt(instruction[i + 4].u.operand);
</span><span class="lines">@@ -2453,7 +2453,7 @@
</span><span class="cx">             m_jit.link(notImm, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_get_by_val);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_get_by_val);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             m_jit.link(m_jit.emitUnlinkedJmp(), m_labels[i + 4]);
</span><span class="cx"> 
</span><span class="lines">@@ -2490,7 +2490,7 @@
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_negate);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_negate);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2500,7 +2500,7 @@
</span><span class="cx">             m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_rshift);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_rshift);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2514,7 +2514,7 @@
</span><span class="cx">             m_jit.link(notImm2, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_lshift);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_lshift);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2528,7 +2528,7 @@
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::edx, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_loop_if_less);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_loop_if_less);
</ins><span class="cx">                 m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 m_jit.link(m_jit.emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             } else {
</span><span class="lines">@@ -2536,7 +2536,7 @@
</span><span class="cx">                 m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_loop_if_less);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_loop_if_less);
</ins><span class="cx">                 m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 m_jit.link(m_jit.emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             }
</span><span class="lines">@@ -2552,7 +2552,7 @@
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 4);
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 8);
</span><del>-            X86Assembler::JmpSrc call = emitCTICall(instruction + i, i, Machine::cti_op_put_by_id);
</del><ins>+            X86Assembler::JmpSrc call = emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_put_by_id);
</ins><span class="cx"> 
</span><span class="cx">             // Track the location of the call; this will be used to recover repatch information.
</span><span class="cx">             ASSERT(m_codeBlock-&gt;propertyAccessInstructions[propertyAccessInstructionIndex].opcodeIndex == i);
</span><span class="lines">@@ -2579,7 +2579,7 @@
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             Identifier* ident = &amp;(m_codeBlock-&gt;identifiers[instruction[i + 3].u.operand]);
</span><span class="cx">             emitPutCTIArgConstant(reinterpret_cast&lt;unsigned&gt;(ident), 4);
</span><del>-            X86Assembler::JmpSrc call = emitCTICall(instruction + i, i, Machine::cti_op_get_by_id);
</del><ins>+            X86Assembler::JmpSrc call = emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_get_by_id);
</ins><span class="cx">             ASSERT(X86Assembler::getDifferenceBetweenLabels(coldPathBegin, call) == repatchOffsetGetByIdSlowCaseCall);
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx"> 
</span><span class="lines">@@ -2600,7 +2600,7 @@
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::edx, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_loop_if_lesseq);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_loop_if_lesseq);
</ins><span class="cx">                 m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 m_jit.link(m_jit.emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             } else {
</span><span class="lines">@@ -2608,7 +2608,7 @@
</span><span class="cx">                 m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_loop_if_lesseq);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_loop_if_lesseq);
</ins><span class="cx">                 m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 m_jit.link(m_jit.emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             }
</span><span class="lines">@@ -2622,7 +2622,7 @@
</span><span class="cx">             m_jit.subl_i8r(getDeTaggedConstantImmediate(JSImmediate::oneImmediate()), X86::eax);
</span><span class="cx">             m_jit.link(notImm, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_pre_inc);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_pre_inc);
</ins><span class="cx">             emitPutVirtualRegister(srcDst);
</span><span class="cx">             i += 2;
</span><span class="cx">             break;
</span><span class="lines">@@ -2638,7 +2638,7 @@
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 8);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_put_by_val);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_put_by_val);
</ins><span class="cx">             m_jit.link(m_jit.emitUnlinkedJmp(), m_labels[i + 4]);
</span><span class="cx"> 
</span><span class="cx">             // slow cases for immediate int accesses to arrays
</span><span class="lines">@@ -2648,7 +2648,7 @@
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 8);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_put_by_val_array);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_put_by_val_array);
</ins><span class="cx"> 
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2658,7 +2658,7 @@
</span><span class="cx"> 
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_jtrue);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jtrue);
</ins><span class="cx">             m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             m_jit.link(m_jit.emitUnlinkedJne(), m_labels[i + 2 + target]);
</span><span class="lines">@@ -2672,7 +2672,7 @@
</span><span class="cx">             m_jit.addl_i8r(getDeTaggedConstantImmediate(JSImmediate::oneImmediate()), X86::eax);
</span><span class="cx">             m_jit.link(notImm, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_pre_dec);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_pre_dec);
</ins><span class="cx">             emitPutVirtualRegister(srcDst);
</span><span class="cx">             i += 2;
</span><span class="cx">             break;
</span><span class="lines">@@ -2684,7 +2684,7 @@
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::edx, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_jless);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jless);
</ins><span class="cx">                 m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 m_jit.link(m_jit.emitUnlinkedJe(), m_labels[i + 3 + target]);
</span><span class="cx">             } else {
</span><span class="lines">@@ -2692,7 +2692,7 @@
</span><span class="cx">                 m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_jless);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jless);
</ins><span class="cx">                 m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 m_jit.link(m_jit.emitUnlinkedJe(), m_labels[i + 3 + target]);
</span><span class="cx">             }
</span><span class="lines">@@ -2703,7 +2703,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             m_jit.xorl_i8r(JSImmediate::FullTagTypeBool, X86::eax);
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_not);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_not);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -2711,7 +2711,7 @@
</span><span class="cx">         case op_jfalse: {
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_jtrue);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jtrue);
</ins><span class="cx">             m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             m_jit.link(m_jit.emitUnlinkedJe(), m_labels[i + 2 + target]); // inverted!
</span><span class="lines">@@ -2723,7 +2723,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_post_inc);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_post_inc);
</ins><span class="cx">             emitPutVirtualRegister(srcDst, X86::edx);
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="lines">@@ -2732,7 +2732,7 @@
</span><span class="cx">         case op_bitnot: {
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_bitnot);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitnot);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="cx">             break;
</span><span class="lines">@@ -2745,19 +2745,19 @@
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArg(X86::eax, 4);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_bitand);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitand);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else if (getConstantImmediateNumericArg(src2)) {
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_bitand);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitand);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else {
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_bitand);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitand);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             }
</span><span class="cx">             i += 5;
</span><span class="lines">@@ -2766,7 +2766,7 @@
</span><span class="cx">         case op_jtrue: {
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_jtrue);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jtrue);
</ins><span class="cx">             m_jit.testl_rr(X86::eax, X86::eax);
</span><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             m_jit.link(m_jit.emitUnlinkedJne(), m_labels[i + 2 + target]);
</span><span class="lines">@@ -2778,7 +2778,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             m_jit.link((++iter)-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_post_dec);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_post_dec);
</ins><span class="cx">             emitPutVirtualRegister(srcDst, X86::edx);
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="lines">@@ -2788,7 +2788,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_bitxor);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitxor);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 5;
</span><span class="cx">             break;
</span><span class="lines">@@ -2797,7 +2797,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_bitor);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitor);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 5;
</span><span class="cx">             break;
</span><span class="lines">@@ -2806,7 +2806,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_eq);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_eq);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2815,7 +2815,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_neq);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_neq);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2829,7 +2829,7 @@
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 3].u.operand, 4, X86::ecx);
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 4].u.operand, 8, X86::ecx);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_instanceof);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_instanceof);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 5;
</span><span class="cx">             break;
</span><span class="lines">@@ -2844,7 +2844,7 @@
</span><span class="cx">             m_jit.link(notImm2, m_jit.label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 4);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_mod);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_mod);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2862,7 +2862,7 @@
</span><span class="cx">                 // There is an extra slow case for (op1 * -N) or (-N * op2), to check for 0 since this should produce a result of -0.
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_mul);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_mul);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else if (src2Value &amp;&amp; ((value = JSImmediate::intValue(src2Value)) &gt; 0)) {
</span><span class="cx">                 m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="lines">@@ -2870,7 +2870,7 @@
</span><span class="cx">                 // There is an extra slow case for (op1 * -N) or (-N * op2), to check for 0 since this should produce a result of -0.
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, Machine::cti_op_mul);
</del><ins>+                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_mul);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else
</span><span class="cx">                 compileBinaryArithOpSlowCase(instruction + i, op_mul, iter, dst, src1, src2, OperandTypes::fromInt(instruction[i + 4].u.operand), i);
</span><span class="lines">@@ -2897,12 +2897,12 @@
</span><span class="cx">             // Fast check for JS function.
</span><span class="cx">             m_jit.testl_i32r(JSImmediate::TagMask, X86::ecx);
</span><span class="cx">             X86Assembler::JmpSrc callLinkFailNotObject = m_jit.emitUnlinkedJne();
</span><del>-            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsFunctionVptr), X86::ecx);
</del><ins>+            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsFunctionVptr), X86::ecx);
</ins><span class="cx">             X86Assembler::JmpSrc callLinkFailNotJSFunction = m_jit.emitUnlinkedJne();
</span><span class="cx"> 
</span><span class="cx">             // First, in the case of a construct, allocate the new object.
</span><span class="cx">             if (opcodeID == op_construct) {
</span><del>-                emitCTICall(instruction, i, Machine::cti_op_construct_JSConstruct);
</del><ins>+                emitCTICall(instruction, i, BytecodeInterpreter::cti_op_construct_JSConstruct);
</ins><span class="cx">                 emitPutVirtualRegister(registerOffset - RegisterFile::CallFrameHeaderSize - argCount);
</span><span class="cx">                 emitGetVirtualRegister(callee, X86::ecx, i);
</span><span class="cx">             }
</span><span class="lines">@@ -2914,7 +2914,7 @@
</span><span class="cx">             m_jit.addl_i32r(registerOffset * static_cast&lt;int&gt;(sizeof(Register)), X86::edi);
</span><span class="cx"> 
</span><span class="cx">             m_callStructureStubCompilationInfo[callLinkInfoIndex].callReturnLocation =
</span><del>-                emitNakedCall(i, m_machine-&gt;m_ctiVirtualCallPreLink);
</del><ins>+                emitNakedCall(i, m_interpreter-&gt;m_ctiVirtualCallPreLink);
</ins><span class="cx"> 
</span><span class="cx">             X86Assembler::JmpSrc storeResultForFirstRun = m_jit.emitUnlinkedJmp();
</span><span class="cx"> 
</span><span class="lines">@@ -2930,7 +2930,7 @@
</span><span class="cx">             // Check for JSFunctions.
</span><span class="cx">             m_jit.testl_i32r(JSImmediate::TagMask, X86::ecx);
</span><span class="cx">             X86Assembler::JmpSrc isNotObject = m_jit.emitUnlinkedJne();
</span><del>-            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsFunctionVptr), X86::ecx);
</del><ins>+            m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsFunctionVptr), X86::ecx);
</ins><span class="cx">             X86Assembler::JmpSrc isJSFunction = m_jit.emitUnlinkedJe();
</span><span class="cx"> 
</span><span class="cx">             // This handles host functions
</span><span class="lines">@@ -2938,7 +2938,7 @@
</span><span class="cx">             m_jit.link(isNotObject, notJSFunctionlabel);
</span><span class="cx">             m_jit.link(callLinkFailNotObject, notJSFunctionlabel);
</span><span class="cx">             m_jit.link(callLinkFailNotJSFunction, notJSFunctionlabel);
</span><del>-            emitCTICall(instruction + i, i, ((opcodeID == op_construct) ? Machine::cti_op_construct_NotJSConstruct : Machine::cti_op_call_NotJSFunction));
</del><ins>+            emitCTICall(instruction + i, i, ((opcodeID == op_construct) ? BytecodeInterpreter::cti_op_construct_NotJSConstruct : BytecodeInterpreter::cti_op_call_NotJSFunction));
</ins><span class="cx">             X86Assembler::JmpSrc wasNotJSFunction = m_jit.emitUnlinkedJmp();
</span><span class="cx"> 
</span><span class="cx">             // Next, handle JSFunctions...
</span><span class="lines">@@ -2946,7 +2946,7 @@
</span><span class="cx"> 
</span><span class="cx">             // First, in the case of a construct, allocate the new object.
</span><span class="cx">             if (opcodeID == op_construct) {
</span><del>-                emitCTICall(instruction, i, Machine::cti_op_construct_JSConstruct);
</del><ins>+                emitCTICall(instruction, i, BytecodeInterpreter::cti_op_construct_JSConstruct);
</ins><span class="cx">                 emitPutVirtualRegister(registerOffset - RegisterFile::CallFrameHeaderSize - argCount);
</span><span class="cx">                 emitGetVirtualRegister(callee, X86::ecx, i);
</span><span class="cx">             }
</span><span class="lines">@@ -2956,7 +2956,7 @@
</span><span class="cx">             m_jit.addl_i32r(registerOffset * static_cast&lt;int&gt;(sizeof(Register)), X86::edi);
</span><span class="cx">             m_jit.movl_i32r(argCount, X86::edx);
</span><span class="cx"> 
</span><del>-            emitNakedCall(i, m_machine-&gt;m_ctiVirtualCall);
</del><ins>+            emitNakedCall(i, m_interpreter-&gt;m_ctiVirtualCall);
</ins><span class="cx"> 
</span><span class="cx">             // Put the return value in dst. In the interpreter, op_ret does this.
</span><span class="cx">             X86Assembler::JmpDst storeResult = m_jit.label();
</span><span class="lines">@@ -2965,7 +2965,7 @@
</span><span class="cx">             emitPutVirtualRegister(dst);
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CODEBLOCK_SAMPLING)
</span><del>-            m_jit.movl_i32m(reinterpret_cast&lt;unsigned&gt;(m_codeBlock), m_machine-&gt;sampler()-&gt;codeBlockSlot());
</del><ins>+            m_jit.movl_i32m(reinterpret_cast&lt;unsigned&gt;(m_codeBlock), m_interpreter-&gt;sampler()-&gt;codeBlockSlot());
</ins><span class="cx"> #endif
</span><span class="cx">             ++callLinkInfoIndex;
</span><span class="cx"> 
</span><span class="lines">@@ -2978,7 +2978,7 @@
</span><span class="cx">             m_jit.link(iter-&gt;from, m_jit.label());
</span><span class="cx"> 
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, Machine::cti_op_to_jsnumber);
</del><ins>+            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_to_jsnumber);
</ins><span class="cx"> 
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             i += 3;
</span><span class="lines">@@ -3003,10 +3003,10 @@
</span><span class="cx"> void CTI::privateCompile()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CODEBLOCK_SAMPLING)
</span><del>-        m_jit.movl_i32m(reinterpret_cast&lt;unsigned&gt;(m_codeBlock), m_machine-&gt;sampler()-&gt;codeBlockSlot());
</del><ins>+        m_jit.movl_i32m(reinterpret_cast&lt;unsigned&gt;(m_codeBlock), m_interpreter-&gt;sampler()-&gt;codeBlockSlot());
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-        m_jit.movl_i32m(m_machine-&gt;sampler()-&gt;encodeSample(m_codeBlock-&gt;instructions.begin()), m_machine-&gt;sampler()-&gt;sampleSlot());
</del><ins>+        m_jit.movl_i32m(m_interpreter-&gt;sampler()-&gt;encodeSample(m_codeBlock-&gt;instructions.begin()), m_interpreter-&gt;sampler()-&gt;sampleSlot());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // Could use a popl_m, but would need to offset the following instruction if so.
</span><span class="lines">@@ -3032,7 +3032,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_codeBlock-&gt;codeType == FunctionCode) {
</span><span class="cx">         m_jit.link(slowRegisterFileCheck, m_jit.label());
</span><del>-        emitCTICall(m_codeBlock-&gt;instructions.begin(), 0, Machine::cti_register_file_check);
</del><ins>+        emitCTICall(m_codeBlock-&gt;instructions.begin(), 0, BytecodeInterpreter::cti_register_file_check);
</ins><span class="cx">         X86Assembler::JmpSrc backToBody = m_jit.emitUnlinkedJmp();
</span><span class="cx">         m_jit.link(backToBody, afterRegisterFileCheck);
</span><span class="cx">     }
</span><span class="lines">@@ -3115,8 +3115,8 @@
</span><span class="cx">     void* code = m_jit.copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><del>-    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
</del><ins>+    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
</ins><span class="cx">     
</span><span class="cx">     m_codeBlock-&gt;getStubInfo(returnAddress).stubRoutine = code;
</span><span class="cx">     
</span><span class="lines">@@ -3129,7 +3129,7 @@
</span><span class="cx">     StructureStubInfo&amp; info = m_codeBlock-&gt;getStubInfo(returnAddress);
</span><span class="cx"> 
</span><span class="cx">     // We don't want to repatch more than once - in future go to cti_op_put_by_id_generic.
</span><del>-    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
</del><ins>+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     // The prototype object definitely exists (if this stub exists the CodeBlock is referencing a StructureID that is
</span><span class="cx">     // referencing the prototype object - let's speculatively load it's table nice and early!)
</span><span class="lines">@@ -3199,9 +3199,9 @@
</span><span class="cx">     void* code = m_jit.copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><del>-    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, failureCases3, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
</del><ins>+    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases3, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     m_codeBlock-&gt;getStubInfo(returnAddress).stubRoutine = code;
</span><span class="cx"> 
</span><span class="lines">@@ -3246,7 +3246,7 @@
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><span class="cx">     for (unsigned i = 0; i &lt; bucketsOfFail.size(); ++i)
</span><del>-        X86Assembler::link(code, bucketsOfFail[i], reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
</del><ins>+        X86Assembler::link(code, bucketsOfFail[i], reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     m_codeBlock-&gt;getStubInfo(returnAddress).stubRoutine = code;
</span><span class="cx"> 
</span><span class="lines">@@ -3269,8 +3269,8 @@
</span><span class="cx">     void* code = m_jit.copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx">     
</span><del>-    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_put_by_id_fail));
-    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_put_by_id_fail));
</del><ins>+    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_put_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_put_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     m_codeBlock-&gt;getStubInfo(returnAddress).stubRoutine = code;
</span><span class="cx">     
</span><span class="lines">@@ -3366,7 +3366,7 @@
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><span class="cx">     if (failureCases.size())
</span><del>-        X86Assembler::link(code, failureJump, reinterpret_cast&lt;void*&gt;(Machine::cti_op_put_by_id_fail));
</del><ins>+        X86Assembler::link(code, failureJump, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_put_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     if (transitionWillNeedStorageRealloc(oldStructureID, newStructureID))
</span><span class="cx">         X86Assembler::link(code, callTarget, reinterpret_cast&lt;void*&gt;(resizePropertyStorage));
</span><span class="lines">@@ -3408,7 +3408,7 @@
</span><span class="cx">     // Check eax is an array
</span><span class="cx">     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
</span><span class="cx">     X86Assembler::JmpSrc array_failureCases1 = m_jit.emitUnlinkedJne();
</span><del>-    m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsArrayVptr), X86::eax);
</del><ins>+    m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsArrayVptr), X86::eax);
</ins><span class="cx">     X86Assembler::JmpSrc array_failureCases2 = m_jit.emitUnlinkedJne();
</span><span class="cx"> 
</span><span class="cx">     // Checks out okay! - get the length from the storage
</span><span class="lines">@@ -3428,7 +3428,7 @@
</span><span class="cx">     // Check eax is a string
</span><span class="cx">     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
</span><span class="cx">     X86Assembler::JmpSrc string_failureCases1 = m_jit.emitUnlinkedJne();
</span><del>-    m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsStringVptr), X86::eax);
</del><ins>+    m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsStringVptr), X86::eax);
</ins><span class="cx">     X86Assembler::JmpSrc string_failureCases2 = m_jit.emitUnlinkedJne();
</span><span class="cx"> 
</span><span class="cx">     // Checks out okay! - get the length from the Ustring.
</span><span class="lines">@@ -3570,31 +3570,31 @@
</span><span class="cx">     void* code = m_jit.copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><del>-    X86Assembler::link(code, array_failureCases1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, array_failureCases2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, array_failureCases3, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, string_failureCases1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, string_failureCases2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, string_failureCases3, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
-    X86Assembler::link(code, callArityCheck1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_call_arityCheck));
-    X86Assembler::link(code, callArityCheck2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_call_arityCheck));
-    X86Assembler::link(code, callArityCheck3, reinterpret_cast&lt;void*&gt;(Machine::cti_op_call_arityCheck));
-    X86Assembler::link(code, callJSFunction1, reinterpret_cast&lt;void*&gt;(Machine::cti_op_call_JSFunction));
-    X86Assembler::link(code, callJSFunction2, reinterpret_cast&lt;void*&gt;(Machine::cti_op_call_JSFunction));
-    X86Assembler::link(code, callJSFunction3, reinterpret_cast&lt;void*&gt;(Machine::cti_op_call_JSFunction));
-    X86Assembler::link(code, callDontLazyLinkCall, reinterpret_cast&lt;void*&gt;(Machine::cti_vm_dontLazyLinkCall));
-    X86Assembler::link(code, callLazyLinkCall, reinterpret_cast&lt;void*&gt;(Machine::cti_vm_lazyLinkCall));
</del><ins>+    X86Assembler::link(code, array_failureCases1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, array_failureCases2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, array_failureCases3, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases3, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, callArityCheck1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_call_arityCheck));
+    X86Assembler::link(code, callArityCheck2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_call_arityCheck));
+    X86Assembler::link(code, callArityCheck3, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_call_arityCheck));
+    X86Assembler::link(code, callJSFunction1, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_call_JSFunction));
+    X86Assembler::link(code, callJSFunction2, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_call_JSFunction));
+    X86Assembler::link(code, callJSFunction3, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_call_JSFunction));
+    X86Assembler::link(code, callDontLazyLinkCall, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_vm_dontLazyLinkCall));
+    X86Assembler::link(code, callLazyLinkCall, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_vm_lazyLinkCall));
</ins><span class="cx"> 
</span><del>-    m_machine-&gt;m_ctiArrayLengthTrampoline = code;
-    m_machine-&gt;m_ctiStringLengthTrampoline = X86Assembler::getRelocatedAddress(code, stringLengthBegin);
-    m_machine-&gt;m_ctiVirtualCallPreLink = X86Assembler::getRelocatedAddress(code, virtualCallPreLinkBegin);
-    m_machine-&gt;m_ctiVirtualCallLink = X86Assembler::getRelocatedAddress(code, virtualCallLinkBegin);
-    m_machine-&gt;m_ctiVirtualCall = X86Assembler::getRelocatedAddress(code, virtualCallBegin);
</del><ins>+    m_interpreter-&gt;m_ctiArrayLengthTrampoline = code;
+    m_interpreter-&gt;m_ctiStringLengthTrampoline = X86Assembler::getRelocatedAddress(code, stringLengthBegin);
+    m_interpreter-&gt;m_ctiVirtualCallPreLink = X86Assembler::getRelocatedAddress(code, virtualCallPreLinkBegin);
+    m_interpreter-&gt;m_ctiVirtualCallLink = X86Assembler::getRelocatedAddress(code, virtualCallLinkBegin);
+    m_interpreter-&gt;m_ctiVirtualCall = X86Assembler::getRelocatedAddress(code, virtualCallBegin);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CTI::freeCTIMachineTrampolines(Machine* machine)
</del><ins>+void CTI::freeCTIMachineTrampolines(BytecodeInterpreter* interpreter)
</ins><span class="cx"> {
</span><del>-    WTF::fastFreeExecutable(machine-&gt;m_ctiArrayLengthTrampoline);
</del><ins>+    WTF::fastFreeExecutable(interpreter-&gt;m_ctiArrayLengthTrampoline);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CTI::patchGetByIdSelf(CodeBlock* codeBlock, StructureID* structureID, size_t cachedOffset, void* returnAddress)
</span><span class="lines">@@ -3602,8 +3602,8 @@
</span><span class="cx">     StructureStubInfo&amp; info = codeBlock-&gt;getStubInfo(returnAddress);
</span><span class="cx"> 
</span><span class="cx">     // We don't want to repatch more than once - in future go to cti_op_get_by_id_generic.
</span><del>-    // Should probably go to Machine::cti_op_get_by_id_fail, but that doesn't do anything interesting right now.
-    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_generic));
</del><ins>+    // Should probably go to BytecodeInterpreter::cti_op_get_by_id_fail, but that doesn't do anything interesting right now.
+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_generic));
</ins><span class="cx"> 
</span><span class="cx">     // Repatch the offset into the propoerty map to load from, then repatch the StructureID to look for.
</span><span class="cx">     X86Assembler::repatchDisplacement(reinterpret_cast&lt;intptr_t&gt;(info.hotPathBegin) + repatchOffsetGetByIdPropertyMapOffset, cachedOffset * sizeof(JSValue*));
</span><span class="lines">@@ -3615,8 +3615,8 @@
</span><span class="cx">     StructureStubInfo&amp; info = codeBlock-&gt;getStubInfo(returnAddress);
</span><span class="cx">     
</span><span class="cx">     // We don't want to repatch more than once - in future go to cti_op_put_by_id_generic.
</span><del>-    // Should probably go to Machine::cti_op_put_by_id_fail, but that doesn't do anything interesting right now.
-    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Machine::cti_op_put_by_id_generic));
</del><ins>+    // Should probably go to BytecodeInterpreter::cti_op_put_by_id_fail, but that doesn't do anything interesting right now.
+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_put_by_id_generic));
</ins><span class="cx"> 
</span><span class="cx">     // Repatch the offset into the propoerty map to load from, then repatch the StructureID to look for.
</span><span class="cx">     X86Assembler::repatchDisplacement(reinterpret_cast&lt;intptr_t&gt;(info.hotPathBegin) + repatchOffsetPutByIdPropertyMapOffset, cachedOffset * sizeof(JSValue*));
</span><span class="lines">@@ -3628,12 +3628,12 @@
</span><span class="cx">     StructureStubInfo&amp; info = m_codeBlock-&gt;getStubInfo(returnAddress);
</span><span class="cx"> 
</span><span class="cx">     // We don't want to repatch more than once - in future go to cti_op_put_by_id_generic.
</span><del>-    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Machine::cti_op_get_by_id_fail));
</del><ins>+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(BytecodeInterpreter::cti_op_get_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     // Check eax is an array
</span><span class="cx">     m_jit.testl_i32r(JSImmediate::TagMask, X86::eax);
</span><span class="cx">     X86Assembler::JmpSrc failureCases1 = m_jit.emitUnlinkedJne();
</span><del>-    m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_machine-&gt;m_jsArrayVptr), X86::eax);
</del><ins>+    m_jit.cmpl_i32m(reinterpret_cast&lt;unsigned&gt;(m_interpreter-&gt;m_jsArrayVptr), X86::eax);
</ins><span class="cx">     X86Assembler::JmpSrc failureCases2 = m_jit.emitUnlinkedJne();
</span><span class="cx"> 
</span><span class="cx">     // Checks out okay! - get the length from the storage
</span><span class="lines">@@ -3686,7 +3686,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WREC)
</span><span class="cx"> 
</span><del>-void* CTI::compileRegExp(Machine* machine, const UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase, bool multiline)
</del><ins>+void* CTI::compileRegExp(BytecodeInterpreter* interpreter, const UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase, bool multiline)
</ins><span class="cx"> {
</span><span class="cx">     // TODO: better error messages
</span><span class="cx">     if (pattern.size() &gt; MaxPatternSize) {
</span><span class="lines">@@ -3694,7 +3694,7 @@
</span><span class="cx">         return 0;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    X86Assembler jit(machine-&gt;jitCodeBuffer());
</del><ins>+    X86Assembler jit(interpreter-&gt;jitCodeBuffer());
</ins><span class="cx">     WRECParser parser(pattern, ignoreCase, multiline, jit);
</span><span class="cx">     
</span><span class="cx">     jit.emitConvertToFastCall();
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCTIh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CTI.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CTI.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/CTI.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> 
</span><span class="cx">     class CodeBlock;
</span><span class="cx">     class JSPropertyNameIterator;
</span><del>-    class Machine;
</del><ins>+    class BytecodeInterpreter;
</ins><span class="cx">     class Register;
</span><span class="cx">     class RegisterFile;
</span><span class="cx">     class ScopeChainNode;
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WREC)
</span><del>-        static void* compileRegExp(Machine*, const UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase = false, bool multiline = false);
</del><ins>+        static void* compileRegExp(BytecodeInterpreter*, const UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase = false, bool multiline = false);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">         static void compileGetByIdSelf(JSGlobalData* globalData, CodeBlock* codeBlock, StructureID* structureID, size_t cachedOffset, void* returnAddress)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx">             CTI cti(globalData);
</span><span class="cx">             cti.privateCompileCTIMachineTrampolines();
</span><span class="cx">         }
</span><del>-        static void freeCTIMachineTrampolines(Machine*);
</del><ins>+        static void freeCTIMachineTrampolines(BytecodeInterpreter*);
</ins><span class="cx"> 
</span><span class="cx">         static void patchGetByIdSelf(CodeBlock* codeBlock, StructureID* structureID, size_t cachedOffset, void* returnAddress);
</span><span class="cx">         static void patchPutByIdReplace(CodeBlock* codeBlock, StructureID* structureID, size_t cachedOffset, void* returnAddress);
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx">         void killLastResultRegister();
</span><span class="cx"> 
</span><span class="cx">         X86Assembler m_jit;
</span><del>-        Machine* m_machine;
</del><ins>+        BytecodeInterpreter* m_interpreter;
</ins><span class="cx">         JSGlobalData* m_globalData;
</span><span class="cx">         CodeBlock* m_codeBlock;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CodeBlock.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CodeBlock.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/CodeBlock.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -181,44 +181,44 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::printStructureIDs(const Instruction* vPC) const
</span><span class="cx"> {
</span><del>-    Machine* machine = globalData-&gt;machine;
</del><ins>+    BytecodeInterpreter* interpreter = globalData-&gt;interpreter;
</ins><span class="cx">     unsigned instructionOffset = vPC - instructions.begin();
</span><span class="cx"> 
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id)) {
</ins><span class="cx">         printStructureID(&quot;get_by_id&quot;, vPC, 4);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_self)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_self)) {
</ins><span class="cx">         printStructureID(&quot;get_by_id_self&quot;, vPC, 4);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_proto)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_proto)) {
</ins><span class="cx">         printf(&quot;  [%4d] %s: %s, %s\n&quot;, instructionOffset, &quot;get_by_id_proto&quot;, pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureID).UTF8String().c_str());
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_transition)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_transition)) {
</ins><span class="cx">         printf(&quot;  [%4d] %s: %s, %s, %s\n&quot;, instructionOffset, &quot;put_by_id_new&quot;, pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[6].u.structureIDChain).UTF8String().c_str());
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_chain)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_chain)) {
</ins><span class="cx">         printf(&quot;  [%4d] %s: %s, %s\n&quot;, instructionOffset, &quot;get_by_id_chain&quot;, pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureIDChain).UTF8String().c_str());
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id)) {
</ins><span class="cx">         printStructureID(&quot;put_by_id&quot;, vPC, 4);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_replace)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_replace)) {
</ins><span class="cx">         printStructureID(&quot;put_by_id_replace&quot;, vPC, 4);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_resolve_global)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_resolve_global)) {
</ins><span class="cx">         printStructureID(&quot;resolve_global&quot;, vPC, 4);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // These instructions doesn't ref StructureIDs.
</span><del>-    ASSERT(vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == machine-&gt;getOpcode(op_call) || vPC[0].u.opcode == machine-&gt;getOpcode(op_call_eval) || vPC[0].u.opcode == machine-&gt;getOpcode(op_construct));
</del><ins>+    ASSERT(vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_call) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_call_eval) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_construct));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::dump(ExecState* exec) const
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> 
</span><span class="cx">     size_t instructionCount = 0;
</span><span class="cx">     for (Vector&lt;Instruction&gt;::const_iterator it = begin; it != end; ++it)
</span><del>-        if (exec-&gt;machine()-&gt;isOpcode(it-&gt;u.opcode))
</del><ins>+        if (exec-&gt;interpreter()-&gt;isOpcode(it-&gt;u.opcode))
</ins><span class="cx">             ++instructionCount;
</span><span class="cx"> 
</span><span class="cx">     printf(&quot;%lu instructions; %lu bytes at %p; %d parameter(s); %d callee register(s)\n\n&quot;,
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> void CodeBlock::dump(ExecState* exec, const Vector&lt;Instruction&gt;::const_iterator&amp; begin, Vector&lt;Instruction&gt;::const_iterator&amp; it) const
</span><span class="cx"> {
</span><span class="cx">     int location = it - begin;
</span><del>-    switch (exec-&gt;machine()-&gt;getOpcodeID(it-&gt;u.opcode)) {
</del><ins>+    switch (exec-&gt;interpreter()-&gt;getOpcodeID(it-&gt;u.opcode)) {
</ins><span class="cx">         case op_enter: {
</span><span class="cx">             printf(&quot;[%4d] enter\n&quot;, location);
</span><span class="cx">             break;
</span><span class="lines">@@ -988,73 +988,73 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::derefStructureIDs(Instruction* vPC) const
</span><span class="cx"> {
</span><del>-    Machine* machine = globalData-&gt;machine;
</del><ins>+    BytecodeInterpreter* interpreter = globalData-&gt;interpreter;
</ins><span class="cx"> 
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_self)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_self)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;deref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_proto)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_proto)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;deref();
</span><span class="cx">         vPC[5].u.structureID-&gt;deref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_chain)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_chain)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;deref();
</span><span class="cx">         vPC[5].u.structureIDChain-&gt;deref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_transition)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_transition)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;deref();
</span><span class="cx">         vPC[5].u.structureID-&gt;deref();
</span><span class="cx">         vPC[6].u.structureIDChain-&gt;deref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_replace)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_replace)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;deref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_resolve_global)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_resolve_global)) {
</ins><span class="cx">         if(vPC[4].u.structureID)
</span><span class="cx">             vPC[4].u.structureID-&gt;deref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     // These instructions don't ref their StructureIDs.
</span><del>-    ASSERT(vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id) || vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id) || vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == machine-&gt;getOpcode(op_get_array_length) || vPC[0].u.opcode == machine-&gt;getOpcode(op_get_string_length));
</del><ins>+    ASSERT(vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_array_length) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_string_length));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::refStructureIDs(Instruction* vPC) const
</span><span class="cx"> {
</span><del>-    Machine* machine = globalData-&gt;machine;
</del><ins>+    BytecodeInterpreter* interpreter = globalData-&gt;interpreter;
</ins><span class="cx"> 
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_self)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_self)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;ref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_proto)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_proto)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;ref();
</span><span class="cx">         vPC[5].u.structureID-&gt;ref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_chain)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_chain)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;ref();
</span><span class="cx">         vPC[5].u.structureIDChain-&gt;ref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_transition)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_transition)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;ref();
</span><span class="cx">         vPC[5].u.structureID-&gt;ref();
</span><span class="cx">         vPC[6].u.structureIDChain-&gt;ref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    if (vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_replace)) {
</del><ins>+    if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_replace)) {
</ins><span class="cx">         vPC[4].u.structureID-&gt;ref();
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     // These instructions don't ref their StructureIDs.
</span><del>-    ASSERT(vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id) || vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id) || vPC[0].u.opcode == machine-&gt;getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == machine-&gt;getOpcode(op_put_by_id_generic));
</del><ins>+    ASSERT(vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter-&gt;getOpcode(op_put_by_id_generic));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::mark()
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMExceptionHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/ExceptionHelpers.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/ExceptionHelpers.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/ExceptionHelpers.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -208,9 +208,9 @@
</span><span class="cx"> 
</span><span class="cx"> JSObject* createNotAnObjectError(ExecState* exec, JSNotAnObjectErrorStub* error, const Instruction* vPC, CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>-    if (vPC[8].u.opcode == exec-&gt;machine()-&gt;getOpcode(op_instanceof))
</del><ins>+    if (vPC[8].u.opcode == exec-&gt;interpreter()-&gt;getOpcode(op_instanceof))
</ins><span class="cx">         return createInvalidParamError(exec, &quot;instanceof&quot;, error-&gt;isNull() ? jsNull() : jsUndefined(), vPC, codeBlock);
</span><del>-    if (vPC[8].u.opcode == exec-&gt;machine()-&gt;getOpcode(op_construct))
</del><ins>+    if (vPC[8].u.opcode == exec-&gt;interpreter()-&gt;getOpcode(op_construct))
</ins><span class="cx">         return createNotAConstructorError(exec, error-&gt;isNull() ? jsNull() : jsUndefined(), vPC, codeBlock);
</span><span class="cx"> 
</span><span class="cx">     int startOffset = 0;
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMMachinecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/Machine.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Machine.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/Machine.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx">     if (fastIsNumber(v1, n1) &amp;&amp; fastIsNumber(v2, n2))
</span><span class="cx">         return n1 &lt; n2;
</span><span class="cx"> 
</span><del>-    Machine* machine = callFrame-&gt;machine();
-    if (machine-&gt;isJSString(v1) &amp;&amp; machine-&gt;isJSString(v2))
</del><ins>+    BytecodeInterpreter* interpreter = callFrame-&gt;interpreter();
+    if (interpreter-&gt;isJSString(v1) &amp;&amp; interpreter-&gt;isJSString(v2))
</ins><span class="cx">         return asString(v1)-&gt;value() &lt; asString(v2)-&gt;value();
</span><span class="cx"> 
</span><span class="cx">     JSValue* p1;
</span><span class="lines">@@ -202,8 +202,8 @@
</span><span class="cx">     if (fastIsNumber(v1, n1) &amp;&amp; fastIsNumber(v2, n2))
</span><span class="cx">         return n1 &lt;= n2;
</span><span class="cx"> 
</span><del>-    Machine* machine = callFrame-&gt;machine();
-    if (machine-&gt;isJSString(v1) &amp;&amp; machine-&gt;isJSString(v2))
</del><ins>+    BytecodeInterpreter* interpreter = callFrame-&gt;interpreter();
+    if (interpreter-&gt;isJSString(v1) &amp;&amp; interpreter-&gt;isJSString(v2))
</ins><span class="cx">         return !(asString(v2)-&gt;value() &lt; asString(v1)-&gt;value());
</span><span class="cx"> 
</span><span class="cx">     JSValue* p1;
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE bool Machine::resolve(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool BytecodeInterpreter::resolve(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</ins><span class="cx"> {
</span><span class="cx">     int dst = (vPC + 1)-&gt;u.operand;
</span><span class="cx">     int property = (vPC + 2)-&gt;u.operand;
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE bool Machine::resolveSkip(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool BytecodeInterpreter::resolveSkip(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</ins><span class="cx"> {
</span><span class="cx">     CodeBlock* codeBlock = callFrame-&gt;codeBlock();
</span><span class="cx"> 
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE bool Machine::resolveGlobal(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool BytecodeInterpreter::resolveGlobal(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</ins><span class="cx"> {
</span><span class="cx">     int dst = (vPC + 1)-&gt;u.operand;
</span><span class="cx">     JSGlobalObject* globalObject = static_cast&lt;JSGlobalObject*&gt;((vPC + 2)-&gt;u.jsCell);
</span><span class="lines">@@ -447,14 +447,14 @@
</span><span class="cx">     return noValue();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::resolveBase(CallFrame* callFrame, Instruction* vPC)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::resolveBase(CallFrame* callFrame, Instruction* vPC)
</ins><span class="cx"> {
</span><span class="cx">     int dst = (vPC + 1)-&gt;u.operand;
</span><span class="cx">     int property = (vPC + 2)-&gt;u.operand;
</span><span class="cx">     callFrame[dst] = inlineResolveBase(callFrame, callFrame-&gt;codeBlock()-&gt;identifiers[property], callFrame-&gt;scopeChain());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE bool Machine::resolveBaseAndProperty(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool BytecodeInterpreter::resolveBaseAndProperty(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</ins><span class="cx"> {
</span><span class="cx">     int baseDst = (vPC + 1)-&gt;u.operand;
</span><span class="cx">     int propDst = (vPC + 2)-&gt;u.operand;
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE bool Machine::resolveBaseAndFunc(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool BytecodeInterpreter::resolveBaseAndFunc(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</ins><span class="cx"> {
</span><span class="cx">     int baseDst = (vPC + 1)-&gt;u.operand;
</span><span class="cx">     int funcDst = (vPC + 2)-&gt;u.operand;
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ALWAYS_INLINE CallFrame* Machine::slideRegisterWindowForCall(CodeBlock* newCodeBlock, RegisterFile* registerFile, CallFrame* callFrame, size_t registerOffset, int argc)
</del><ins>+ALWAYS_INLINE CallFrame* BytecodeInterpreter::slideRegisterWindowForCall(CodeBlock* newCodeBlock, RegisterFile* registerFile, CallFrame* callFrame, size_t registerOffset, int argc)
</ins><span class="cx"> {
</span><span class="cx">     Register* r = callFrame-&gt;registers();
</span><span class="cx">     Register* newEnd = r + registerOffset + newCodeBlock-&gt;numCalleeRegisters;
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE JSValue* Machine::callEval(CallFrame* callFrame, RegisterFile* registerFile, Register* argv, int argc, int registerOffset, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE JSValue* BytecodeInterpreter::callEval(CallFrame* callFrame, RegisterFile* registerFile, Register* argv, int argc, int registerOffset, JSValue*&amp; exceptionValue)
</ins><span class="cx"> {
</span><span class="cx">     if (argc &lt; 2)
</span><span class="cx">         return jsUndefined();
</span><span class="lines">@@ -598,12 +598,12 @@
</span><span class="cx"> 
</span><span class="cx">     JSValue* result = jsUndefined();
</span><span class="cx">     if (evalNode)
</span><del>-        result = callFrame-&gt;globalData().machine-&gt;execute(evalNode.get(), callFrame, callFrame-&gt;thisValue()-&gt;toThisObject(callFrame), callFrame-&gt;registers() - registerFile-&gt;start() + registerOffset, scopeChain, &amp;exceptionValue);
</del><ins>+        result = callFrame-&gt;globalData().interpreter-&gt;execute(evalNode.get(), callFrame, callFrame-&gt;thisValue()-&gt;toThisObject(callFrame), callFrame-&gt;registers() - registerFile-&gt;start() + registerOffset, scopeChain, &amp;exceptionValue);
</ins><span class="cx"> 
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Machine::Machine()
</del><ins>+BytecodeInterpreter::BytecodeInterpreter()
</ins><span class="cx">     : m_sampler(0)
</span><span class="cx"> #if ENABLE(CTI)
</span><span class="cx">     , m_ctiArrayLengthTrampoline(0)
</span><span class="lines">@@ -641,7 +641,7 @@
</span><span class="cx">     fastFree(storage);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::initialize(JSGlobalData* globalData)
</del><ins>+void BytecodeInterpreter::initialize(JSGlobalData* globalData)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CTI)
</span><span class="cx">     CTI::compileCTIMachineTrampolines(globalData);
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Machine::~Machine()
</del><ins>+BytecodeInterpreter::~BytecodeInterpreter()
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(CTI)
</span><span class="cx">     CTI::freeCTIMachineTrampolines(this);
</span><span class="lines">@@ -659,13 +659,13 @@
</span><span class="cx"> 
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> 
</span><del>-void Machine::dumpCallFrame(CallFrame* callFrame)
</del><ins>+void BytecodeInterpreter::dumpCallFrame(CallFrame* callFrame)
</ins><span class="cx"> {
</span><span class="cx">     callFrame-&gt;codeBlock()-&gt;dump(callFrame);
</span><span class="cx">     dumpRegisters(callFrame);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::dumpRegisters(CallFrame* callFrame)
</del><ins>+void BytecodeInterpreter::dumpRegisters(CallFrame* callFrame)
</ins><span class="cx"> {
</span><span class="cx">     printf(&quot;Register frame: \n\n&quot;);
</span><span class="cx">     printf(&quot;----------------------------------------------------\n&quot;);
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx">     printf(&quot;----------------------------------------------------\n&quot;);
</span><span class="cx"> 
</span><span class="cx">     CodeBlock* codeBlock = callFrame-&gt;codeBlock();
</span><del>-    RegisterFile* registerFile = &amp;callFrame-&gt;scopeChain()-&gt;globalObject()-&gt;globalData()-&gt;machine-&gt;registerFile();
</del><ins>+    RegisterFile* registerFile = &amp;callFrame-&gt;scopeChain()-&gt;globalObject()-&gt;globalData()-&gt;interpreter-&gt;registerFile();
</ins><span class="cx">     const Register* it;
</span><span class="cx">     const Register* end;
</span><span class="cx"> 
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-bool Machine::isOpcode(Opcode opcode)
</del><ins>+bool BytecodeInterpreter::isOpcode(Opcode opcode)
</ins><span class="cx"> {
</span><span class="cx"> #if HAVE(COMPUTED_GOTO)
</span><span class="cx">     return opcode != HashTraits&lt;Opcode&gt;::emptyValue()
</span><span class="lines">@@ -754,7 +754,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE bool Machine::unwindCallFrame(CallFrame*&amp; callFrame, JSValue* exceptionValue, const Instruction*&amp; vPC, CodeBlock*&amp; codeBlock)
</del><ins>+NEVER_INLINE bool BytecodeInterpreter::unwindCallFrame(CallFrame*&amp; callFrame, JSValue* exceptionValue, const Instruction*&amp; vPC, CodeBlock*&amp; codeBlock)
</ins><span class="cx"> {
</span><span class="cx">     CodeBlock* oldCodeBlock = codeBlock;
</span><span class="cx">     ScopeChainNode* scopeChain = callFrame-&gt;scopeChain();
</span><span class="lines">@@ -797,7 +797,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE Instruction* Machine::throwException(CallFrame*&amp; callFrame, JSValue*&amp; exceptionValue, const Instruction* vPC, bool explicitThrow)
</del><ins>+NEVER_INLINE Instruction* BytecodeInterpreter::throwException(CallFrame*&amp; callFrame, JSValue*&amp; exceptionValue, const Instruction* vPC, bool explicitThrow)
</ins><span class="cx"> {
</span><span class="cx">     // Set up the exception object
</span><span class="cx">     
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx">     JSGlobalObject* m_savedDynamicGlobalObject;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-JSValue* Machine::execute(ProgramNode* programNode, CallFrame* callFrame, ScopeChainNode* scopeChain, JSObject* thisObj, JSValue** exception)
</del><ins>+JSValue* BytecodeInterpreter::execute(ProgramNode* programNode, CallFrame* callFrame, ScopeChainNode* scopeChain, JSObject* thisObj, JSValue** exception)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx"> 
</span><span class="lines">@@ -957,7 +957,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::execute(FunctionBodyNode* functionBodyNode, CallFrame* callFrame, JSFunction* function, JSObject* thisObj, const ArgList&amp; args, ScopeChainNode* scopeChain, JSValue** exception)
</del><ins>+JSValue* BytecodeInterpreter::execute(FunctionBodyNode* functionBodyNode, CallFrame* callFrame, JSFunction* function, JSObject* thisObj, const ArgList&amp; args, ScopeChainNode* scopeChain, JSValue** exception)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx"> 
</span><span class="lines">@@ -1019,12 +1019,12 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::execute(EvalNode* evalNode, CallFrame* callFrame, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception)
</del><ins>+JSValue* BytecodeInterpreter::execute(EvalNode* evalNode, CallFrame* callFrame, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception)
</ins><span class="cx"> {
</span><span class="cx">     return execute(evalNode, callFrame, thisObj, m_registerFile.size() + evalNode-&gt;byteCode(scopeChain).numParameters + RegisterFile::CallFrameHeaderSize, scopeChain, exception);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::execute(EvalNode* evalNode, CallFrame* callFrame, JSObject* thisObj, int globalRegisterOffset, ScopeChainNode* scopeChain, JSValue** exception)
</del><ins>+JSValue* BytecodeInterpreter::execute(EvalNode* evalNode, CallFrame* callFrame, JSObject* thisObj, int globalRegisterOffset, ScopeChainNode* scopeChain, JSValue** exception)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx"> 
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::debug(CallFrame* callFrame, DebugHookID debugHookID, int firstLine, int lastLine)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::debug(CallFrame* callFrame, DebugHookID debugHookID, int firstLine, int lastLine)
</ins><span class="cx"> {
</span><span class="cx">     Debugger* debugger = callFrame-&gt;dynamicGlobalObject()-&gt;debugger();
</span><span class="cx">     if (!debugger)
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::resetTimeoutCheck()
</del><ins>+void BytecodeInterpreter::resetTimeoutCheck()
</ins><span class="cx"> {
</span><span class="cx">     m_ticksUntilNextTimeoutCheck = initialTickCountThreshold;
</span><span class="cx">     m_timeAtLastCheckTimeout = 0;
</span><span class="lines">@@ -1188,7 +1188,7 @@
</span><span class="cx"> 
</span><span class="cx"> // We have to return a JSValue here, gcc seems to produce worse code if 
</span><span class="cx"> // we attempt to return a bool
</span><del>-ALWAYS_INLINE JSValue* Machine::checkTimeout(JSGlobalObject* globalObject)
</del><ins>+ALWAYS_INLINE JSValue* BytecodeInterpreter::checkTimeout(JSGlobalObject* globalObject)
</ins><span class="cx"> {
</span><span class="cx">     unsigned currentTime = getCPUTime();
</span><span class="cx">     
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx">     return noValue();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE ScopeChainNode* Machine::createExceptionScope(CallFrame* callFrame, const Instruction* vPC)
</del><ins>+NEVER_INLINE ScopeChainNode* BytecodeInterpreter::createExceptionScope(CallFrame* callFrame, const Instruction* vPC)
</ins><span class="cx"> {
</span><span class="cx">     int dst = (++vPC)-&gt;u.operand;
</span><span class="cx">     CodeBlock* codeBlock = callFrame-&gt;codeBlock();
</span><span class="lines">@@ -1246,7 +1246,7 @@
</span><span class="cx">     return structureID-&gt;cachedPrototypeChain();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::tryCachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, Instruction* vPC, JSValue* baseValue, const PutPropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::tryCachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, Instruction* vPC, JSValue* baseValue, const PutPropertySlot&amp; slot)
</ins><span class="cx"> {
</span><span class="cx">     // Recursive invocation may already have specialized this instruction.
</span><span class="cx">     if (vPC[0].u.opcode != getOpcode(op_put_by_id))
</span><span class="lines">@@ -1316,14 +1316,14 @@
</span><span class="cx">     codeBlock-&gt;refStructureIDs(vPC);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::uncachePutByID(CodeBlock* codeBlock, Instruction* vPC)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::uncachePutByID(CodeBlock* codeBlock, Instruction* vPC)
</ins><span class="cx"> {
</span><span class="cx">     codeBlock-&gt;derefStructureIDs(vPC);
</span><span class="cx">     vPC[0] = getOpcode(op_put_by_id);
</span><span class="cx">     vPC[4] = 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::tryCacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, Instruction* vPC, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::tryCacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, Instruction* vPC, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp; slot)
</ins><span class="cx"> {
</span><span class="cx">     // Recursive invocation may already have specialized this instruction.
</span><span class="cx">     if (vPC[0].u.opcode != getOpcode(op_get_by_id))
</span><span class="lines">@@ -1441,14 +1441,14 @@
</span><span class="cx">     codeBlock-&gt;refStructureIDs(vPC);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::uncacheGetByID(CodeBlock* codeBlock, Instruction* vPC)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::uncacheGetByID(CodeBlock* codeBlock, Instruction* vPC)
</ins><span class="cx"> {
</span><span class="cx">     codeBlock-&gt;derefStructureIDs(vPC);
</span><span class="cx">     vPC[0] = getOpcode(op_get_by_id);
</span><span class="cx">     vPC[4] = 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::privateExecute(ExecutionFlag flag, RegisterFile* registerFile, CallFrame* callFrame, JSValue** exception)
</del><ins>+JSValue* BytecodeInterpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFile, CallFrame* callFrame, JSValue** exception)
</ins><span class="cx"> {
</span><span class="cx">     // One-time initialization of our address tables. We have to put this code
</span><span class="cx">     // here because our labels are only in scope inside this function.
</span><span class="lines">@@ -1502,7 +1502,7 @@
</span><span class="cx">     
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><span class="cx">     #define SAMPLE(codeBlock, vPC) m_sampler-&gt;sample(codeBlock, vPC)
</span><del>-    #define CTI_SAMPLER ARG_globalData-&gt;machine-&gt;sampler()
</del><ins>+    #define CTI_SAMPLER ARG_globalData-&gt;interpreter-&gt;sampler()
</ins><span class="cx"> #else
</span><span class="cx">     #define SAMPLE(codeBlock, vPC)
</span><span class="cx">     #define CTI_SAMPLER 0
</span><span class="lines">@@ -3985,7 +3985,7 @@
</span><span class="cx">     #undef CHECK_FOR_TIMEOUT
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::retrieveArguments(CallFrame* callFrame, JSFunction* function) const
</del><ins>+JSValue* BytecodeInterpreter::retrieveArguments(CallFrame* callFrame, JSFunction* function) const
</ins><span class="cx"> {
</span><span class="cx">     CallFrame* functionCallFrame = findFunctionCallFrame(callFrame, function);
</span><span class="cx">     if (!functionCallFrame)
</span><span class="lines">@@ -4009,7 +4009,7 @@
</span><span class="cx">     return arguments;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::retrieveCaller(CallFrame* callFrame, InternalFunction* function) const
</del><ins>+JSValue* BytecodeInterpreter::retrieveCaller(CallFrame* callFrame, InternalFunction* function) const
</ins><span class="cx"> {
</span><span class="cx">     CallFrame* functionCallFrame = findFunctionCallFrame(callFrame, function);
</span><span class="cx">     if (!functionCallFrame)
</span><span class="lines">@@ -4026,7 +4026,7 @@
</span><span class="cx">     return caller;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::retrieveLastCaller(CallFrame* callFrame, int&amp; lineNumber, intptr_t&amp; sourceID, UString&amp; sourceURL, JSValue*&amp; function) const
</del><ins>+void BytecodeInterpreter::retrieveLastCaller(CallFrame* callFrame, int&amp; lineNumber, intptr_t&amp; sourceID, UString&amp; sourceURL, JSValue*&amp; function) const
</ins><span class="cx"> {
</span><span class="cx">     function = noValue();
</span><span class="cx">     lineNumber = -1;
</span><span class="lines">@@ -4047,7 +4047,7 @@
</span><span class="cx">     function = callerFrame-&gt;callee();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-CallFrame* Machine::findFunctionCallFrame(CallFrame* callFrame, InternalFunction* function)
</del><ins>+CallFrame* BytecodeInterpreter::findFunctionCallFrame(CallFrame* callFrame, InternalFunction* function)
</ins><span class="cx"> {
</span><span class="cx">     for (CallFrame* candidate = callFrame; candidate; candidate = candidate-&gt;callerFrame()-&gt;removeHostCallFrameFlag()) {
</span><span class="cx">         if (candidate-&gt;callee() == function)
</span><span class="lines">@@ -4058,7 +4058,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CTI)
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::tryCTICachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue* baseValue, const PutPropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::tryCTICachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue* baseValue, const PutPropertySlot&amp; slot)
</ins><span class="cx"> {
</span><span class="cx">     // The interpreter checks for recursion here; I do not believe this can occur in CTI.
</span><span class="cx"> 
</span><span class="lines">@@ -4127,7 +4127,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void Machine::tryCTICacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void BytecodeInterpreter::tryCTICacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp; slot)
</ins><span class="cx"> {
</span><span class="cx">     // FIXME: Write a test that proves we need to check for recursion here just
</span><span class="cx">     // like the interpreter does, then add a check for recursion.
</span><span class="lines">@@ -4344,7 +4344,7 @@
</span><span class="cx">         } \
</span><span class="cx">     } while (0)
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_convert_this(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_convert_this(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4356,7 +4356,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_end(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_end(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4365,7 +4365,7 @@
</span><span class="cx">     scopeChain-&gt;deref();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_add(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_add(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4410,7 +4410,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_pre_inc(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_pre_inc(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4422,17 +4422,17 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_timeout_check(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_timeout_check(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><del>-    if (ARG_globalData-&gt;machine-&gt;checkTimeout(ARG_callFrame-&gt;dynamicGlobalObject())) {
</del><ins>+    if (ARG_globalData-&gt;interpreter-&gt;checkTimeout(ARG_callFrame-&gt;dynamicGlobalObject())) {
</ins><span class="cx">         ARG_globalData-&gt;exception = createInterruptedExecutionException(ARG_globalData);
</span><span class="cx">         VM_THROW_EXCEPTION_AT_END();
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_register_file_check(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_register_file_check(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4446,7 +4446,7 @@
</span><span class="cx">     throwStackOverflowError(oldCallFrame, ARG_globalData, oldCallFrame-&gt;returnPC(), CTI_RETURN_ADDRESS);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int Machine::cti_op_loop_if_less(CTI_ARGS)
</del><ins>+int BytecodeInterpreter::cti_op_loop_if_less(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4459,7 +4459,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int Machine::cti_op_loop_if_lesseq(CTI_ARGS)
</del><ins>+int BytecodeInterpreter::cti_op_loop_if_lesseq(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4472,14 +4472,14 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_new_object(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_new_object(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return constructEmptyObject(ARG_callFrame);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_id(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_id(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4494,17 +4494,17 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_id_second(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_id_second(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     PutPropertySlot slot;
</span><span class="cx">     ARG_src1-&gt;put(ARG_callFrame, *ARG_id2, ARG_src3, slot);
</span><del>-    ARG_globalData-&gt;machine-&gt;tryCTICachePutByID(ARG_callFrame, ARG_callFrame-&gt;codeBlock(), CTI_RETURN_ADDRESS, ARG_src1, slot);
</del><ins>+    ARG_globalData-&gt;interpreter-&gt;tryCTICachePutByID(ARG_callFrame, ARG_callFrame-&gt;codeBlock(), CTI_RETURN_ADDRESS, ARG_src1, slot);
</ins><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_id_generic(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_id_generic(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4513,7 +4513,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_id_fail(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_id_fail(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4529,7 +4529,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_get_by_id(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_get_by_id(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4546,7 +4546,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_get_by_id_second(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_get_by_id_second(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4557,13 +4557,13 @@
</span><span class="cx">     PropertySlot slot(baseValue);
</span><span class="cx">     JSValue* result = baseValue-&gt;get(callFrame, ident, slot);
</span><span class="cx"> 
</span><del>-    ARG_globalData-&gt;machine-&gt;tryCTICacheGetByID(callFrame, callFrame-&gt;codeBlock(), CTI_RETURN_ADDRESS, baseValue, ident, slot);
</del><ins>+    ARG_globalData-&gt;interpreter-&gt;tryCTICacheGetByID(callFrame, callFrame-&gt;codeBlock(), CTI_RETURN_ADDRESS, baseValue, ident, slot);
</ins><span class="cx"> 
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_get_by_id_generic(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_get_by_id_generic(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4578,7 +4578,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_get_by_id_fail(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_get_by_id_fail(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4596,7 +4596,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_instanceof(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_instanceof(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4636,7 +4636,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_del_by_id(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_del_by_id(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4650,7 +4650,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_mul(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_mul(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4668,14 +4668,14 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_new_func(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_new_func(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return ARG_func1-&gt;makeFunction(ARG_callFrame, ARG_callFrame-&gt;scopeChain());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* Machine::cti_op_call_JSFunction(CTI_ARGS)
</del><ins>+void* BytecodeInterpreter::cti_op_call_JSFunction(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4693,7 +4693,7 @@
</span><span class="cx">     return newCodeBlock;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VoidPtrPair Machine::cti_op_call_arityCheck(CTI_ARGS)
</del><ins>+VoidPtrPair BytecodeInterpreter::cti_op_call_arityCheck(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4740,7 +4740,7 @@
</span><span class="cx">     return pair.i;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* Machine::cti_vm_dontLazyLinkCall(CTI_ARGS)
</del><ins>+void* BytecodeInterpreter::cti_vm_dontLazyLinkCall(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4749,12 +4749,12 @@
</span><span class="cx">     if (!codeBlock-&gt;ctiCode)
</span><span class="cx">         CTI::compile(ARG_globalData, codeBlock);
</span><span class="cx"> 
</span><del>-    ctiRepatchCallByReturnAddress(ARG_returnAddress2, ARG_globalData-&gt;machine-&gt;m_ctiVirtualCallLink);
</del><ins>+    ctiRepatchCallByReturnAddress(ARG_returnAddress2, ARG_globalData-&gt;interpreter-&gt;m_ctiVirtualCallLink);
</ins><span class="cx"> 
</span><span class="cx">     return codeBlock-&gt;ctiCode;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* Machine::cti_vm_lazyLinkCall(CTI_ARGS)
</del><ins>+void* BytecodeInterpreter::cti_vm_lazyLinkCall(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4769,7 +4769,7 @@
</span><span class="cx">     return codeBlock-&gt;ctiCode;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_push_activation(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_push_activation(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4778,7 +4778,7 @@
</span><span class="cx">     return activation;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_call_NotJSFunction(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_call_NotJSFunction(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4824,7 +4824,7 @@
</span><span class="cx">     VM_THROW_EXCEPTION();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_create_arguments(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_create_arguments(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4833,7 +4833,7 @@
</span><span class="cx">     ARG_callFrame[RegisterFile::ArgumentsRegister] = arguments;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_create_arguments_no_params(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_create_arguments_no_params(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4842,7 +4842,7 @@
</span><span class="cx">     ARG_callFrame[RegisterFile::ArgumentsRegister] = arguments;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_tear_off_activation(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_tear_off_activation(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4850,7 +4850,7 @@
</span><span class="cx">     asActivation(ARG_src1)-&gt;copyRegisters(ARG_callFrame-&gt;optionalCalleeArguments());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_tear_off_arguments(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_tear_off_arguments(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4858,7 +4858,7 @@
</span><span class="cx">     ARG_callFrame-&gt;optionalCalleeArguments()-&gt;copyRegisters();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_profile_will_call(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_profile_will_call(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4866,7 +4866,7 @@
</span><span class="cx">     (*ARG_profilerReference)-&gt;willExecute(ARG_callFrame, ARG_src1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_profile_did_call(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_profile_did_call(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4874,7 +4874,7 @@
</span><span class="cx">     (*ARG_profilerReference)-&gt;didExecute(ARG_callFrame, ARG_src1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_ret_scopeChain(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_ret_scopeChain(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4882,7 +4882,7 @@
</span><span class="cx">     ARG_callFrame-&gt;scopeChain()-&gt;deref();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_new_array(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_new_array(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4890,7 +4890,7 @@
</span><span class="cx">     return constructArray(ARG_callFrame, argList);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_resolve(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_resolve(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4919,7 +4919,7 @@
</span><span class="cx">     VM_THROW_EXCEPTION();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_construct_JSConstruct(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_construct_JSConstruct(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4936,7 +4936,7 @@
</span><span class="cx">     return new (ARG_globalData) JSObject(structure);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_construct_NotJSConstruct(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_construct_NotJSConstruct(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4968,12 +4968,12 @@
</span><span class="cx">     VM_THROW_EXCEPTION();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_get_by_val(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_get_by_val(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     CallFrame* callFrame = ARG_callFrame;
</span><del>-    Machine* machine = ARG_globalData-&gt;machine;
</del><ins>+    BytecodeInterpreter* interpreter = ARG_globalData-&gt;interpreter;
</ins><span class="cx"> 
</span><span class="cx">     JSValue* baseValue = ARG_src1;
</span><span class="cx">     JSValue* subscript = ARG_src2;
</span><span class="lines">@@ -4983,13 +4983,13 @@
</span><span class="cx"> 
</span><span class="cx">     bool isUInt32 = JSImmediate::getUInt32(subscript, i);
</span><span class="cx">     if (LIKELY(isUInt32)) {
</span><del>-        if (machine-&gt;isJSArray(baseValue)) {
</del><ins>+        if (interpreter-&gt;isJSArray(baseValue)) {
</ins><span class="cx">             JSArray* jsArray = asArray(baseValue);
</span><span class="cx">             if (jsArray-&gt;canGetIndex(i))
</span><span class="cx">                 result = jsArray-&gt;getIndex(i);
</span><span class="cx">             else
</span><span class="cx">                 result = jsArray-&gt;JSArray::get(callFrame, i);
</span><del>-        } else if (machine-&gt;isJSString(baseValue) &amp;&amp; asString(baseValue)-&gt;canGetIndex(i))
</del><ins>+        } else if (interpreter-&gt;isJSString(baseValue) &amp;&amp; asString(baseValue)-&gt;canGetIndex(i))
</ins><span class="cx">             result = asString(baseValue)-&gt;getIndex(ARG_globalData, i);
</span><span class="cx">         else
</span><span class="cx">             result = baseValue-&gt;get(callFrame, i);
</span><span class="lines">@@ -5002,7 +5002,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VoidPtrPair Machine::cti_op_resolve_func(CTI_ARGS)
</del><ins>+VoidPtrPair BytecodeInterpreter::cti_op_resolve_func(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5046,7 +5046,7 @@
</span><span class="cx">     VM_THROW_EXCEPTION_2();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_sub(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_sub(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5064,12 +5064,12 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_val(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_val(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     CallFrame* callFrame = ARG_callFrame;
</span><del>-    Machine* machine = ARG_globalData-&gt;machine;
</del><ins>+    BytecodeInterpreter* interpreter = ARG_globalData-&gt;interpreter;
</ins><span class="cx"> 
</span><span class="cx">     JSValue* baseValue = ARG_src1;
</span><span class="cx">     JSValue* subscript = ARG_src2;
</span><span class="lines">@@ -5079,7 +5079,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool isUInt32 = JSImmediate::getUInt32(subscript, i);
</span><span class="cx">     if (LIKELY(isUInt32)) {
</span><del>-        if (machine-&gt;isJSArray(baseValue)) {
</del><ins>+        if (interpreter-&gt;isJSArray(baseValue)) {
</ins><span class="cx">             JSArray* jsArray = asArray(baseValue);
</span><span class="cx">             if (jsArray-&gt;canSetIndex(i))
</span><span class="cx">                 jsArray-&gt;setIndex(i, value);
</span><span class="lines">@@ -5098,7 +5098,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_val_array(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_val_array(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5108,7 +5108,7 @@
</span><span class="cx">     int i = ARG_int2;
</span><span class="cx">     JSValue* value = ARG_src3;
</span><span class="cx"> 
</span><del>-    ASSERT(ARG_globalData-&gt;machine-&gt;isJSArray(baseValue));
</del><ins>+    ASSERT(ARG_globalData-&gt;interpreter-&gt;isJSArray(baseValue));
</ins><span class="cx"> 
</span><span class="cx">     if (LIKELY(i &gt;= 0))
</span><span class="cx">         asArray(baseValue)-&gt;JSArray::put(callFrame, i, value);
</span><span class="lines">@@ -5124,7 +5124,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_lesseq(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_lesseq(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5134,7 +5134,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int Machine::cti_op_loop_if_true(CTI_ARGS)
</del><ins>+int BytecodeInterpreter::cti_op_loop_if_true(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5147,7 +5147,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_negate(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_negate(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5163,14 +5163,14 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_resolve_base(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_resolve_base(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return inlineResolveBase(ARG_callFrame, *ARG_id1, ARG_callFrame-&gt;scopeChain());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_resolve_skip(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_resolve_skip(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5204,7 +5204,7 @@
</span><span class="cx">     VM_THROW_EXCEPTION();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_resolve_global(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_resolve_global(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5234,7 +5234,7 @@
</span><span class="cx">     VM_THROW_EXCEPTION();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_div(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_div(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5252,7 +5252,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_pre_dec(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_pre_dec(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5264,7 +5264,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int Machine::cti_op_jless(CTI_ARGS)
</del><ins>+int BytecodeInterpreter::cti_op_jless(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5277,7 +5277,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_not(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_not(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5290,7 +5290,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-int SFX_CALL Machine::cti_op_jtrue(CTI_ARGS)
</del><ins>+int SFX_CALL BytecodeInterpreter::cti_op_jtrue(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5303,7 +5303,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VoidPtrPair Machine::cti_op_post_inc(CTI_ARGS)
</del><ins>+VoidPtrPair BytecodeInterpreter::cti_op_post_inc(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5318,7 +5318,7 @@
</span><span class="cx">     return pair.i;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_eq(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_eq(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5333,7 +5333,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_lshift(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_lshift(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5353,7 +5353,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_bitand(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_bitand(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5371,7 +5371,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_rshift(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_rshift(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5391,7 +5391,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_bitnot(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_bitnot(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5407,7 +5407,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VoidPtrPair Machine::cti_op_resolve_with_base(CTI_ARGS)
</del><ins>+VoidPtrPair BytecodeInterpreter::cti_op_resolve_with_base(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5443,14 +5443,14 @@
</span><span class="cx">     VM_THROW_EXCEPTION_2();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_new_func_exp(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_new_func_exp(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return ARG_funcexp1-&gt;makeFunction(ARG_callFrame, ARG_callFrame-&gt;scopeChain());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_mod(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_mod(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5464,7 +5464,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_less(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_less(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5474,7 +5474,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_neq(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_neq(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5489,7 +5489,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VoidPtrPair Machine::cti_op_post_dec(CTI_ARGS)
</del><ins>+VoidPtrPair BytecodeInterpreter::cti_op_post_dec(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5504,7 +5504,7 @@
</span><span class="cx">     return pair.i;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_urshift(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_urshift(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5522,7 +5522,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_bitxor(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_bitxor(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5536,14 +5536,14 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_new_regexp(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_new_regexp(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return new (ARG_globalData) RegExpObject(ARG_callFrame-&gt;lexicalGlobalObject()-&gt;regExpStructure(), ARG_regexp1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_bitor(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_bitor(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5557,14 +5557,14 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_call_eval(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_call_eval(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     CallFrame* callFrame = ARG_callFrame;
</span><span class="cx">     RegisterFile* registerFile = ARG_registerFile;
</span><span class="cx"> 
</span><del>-    Machine* machine = ARG_globalData-&gt;machine;
</del><ins>+    BytecodeInterpreter* interpreter = ARG_globalData-&gt;interpreter;
</ins><span class="cx">     
</span><span class="cx">     JSValue* funcVal = ARG_src1;
</span><span class="cx">     int registerOffset = ARG_int2;
</span><span class="lines">@@ -5577,7 +5577,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (thisValue == globalObject &amp;&amp; funcVal == globalObject-&gt;evalFunction()) {
</span><span class="cx">         JSValue* exceptionValue = noValue();
</span><del>-        JSValue* result = machine-&gt;callEval(callFrame, registerFile, argv, argCount, registerOffset, exceptionValue);
</del><ins>+        JSValue* result = interpreter-&gt;callEval(callFrame, registerFile, argv, argCount, registerOffset, exceptionValue);
</ins><span class="cx">         if (UNLIKELY(exceptionValue != noValue())) {
</span><span class="cx">             ARG_globalData-&gt;exception = exceptionValue;
</span><span class="cx">             VM_THROW_EXCEPTION_AT_END();
</span><span class="lines">@@ -5588,7 +5588,7 @@
</span><span class="cx">     return JSImmediate::impossibleValue();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_throw(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_throw(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5601,7 +5601,7 @@
</span><span class="cx">     JSValue* exceptionValue = ARG_src1;
</span><span class="cx">     ASSERT(exceptionValue);
</span><span class="cx"> 
</span><del>-    Instruction* handlerVPC = ARG_globalData-&gt;machine-&gt;throwException(callFrame, exceptionValue, codeBlock-&gt;instructions.begin() + vPCIndex, true);
</del><ins>+    Instruction* handlerVPC = ARG_globalData-&gt;interpreter-&gt;throwException(callFrame, exceptionValue, codeBlock-&gt;instructions.begin() + vPCIndex, true);
</ins><span class="cx"> 
</span><span class="cx">     if (!handlerVPC) {
</span><span class="cx">         *ARG_exception = exceptionValue;
</span><span class="lines">@@ -5615,14 +5615,14 @@
</span><span class="cx">     return exceptionValue;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSPropertyNameIterator* Machine::cti_op_get_pnames(CTI_ARGS)
</del><ins>+JSPropertyNameIterator* BytecodeInterpreter::cti_op_get_pnames(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return JSPropertyNameIterator::create(ARG_callFrame, ARG_src1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_next_pname(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_next_pname(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5633,7 +5633,7 @@
</span><span class="cx">     return temp;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_push_scope(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_push_scope(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5642,21 +5642,21 @@
</span><span class="cx">     ARG_callFrame-&gt;setScopeChain(ARG_callFrame-&gt;scopeChain()-&gt;push(o));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_pop_scope(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_pop_scope(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     ARG_callFrame-&gt;setScopeChain(ARG_callFrame-&gt;scopeChain()-&gt;pop());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_typeof(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_typeof(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return jsTypeStringForValue(ARG_callFrame, ARG_src1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_is_undefined(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_is_undefined(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5664,42 +5664,42 @@
</span><span class="cx">     return jsBoolean(JSImmediate::isImmediate(v) ? v-&gt;isUndefined() : v-&gt;asCell()-&gt;structureID()-&gt;typeInfo().masqueradesAsUndefined());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_is_boolean(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_is_boolean(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return jsBoolean(ARG_src1-&gt;isBoolean());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_is_number(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_is_number(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return jsBoolean(ARG_src1-&gt;isNumber());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_is_string(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_is_string(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><del>-    return jsBoolean(ARG_globalData-&gt;machine-&gt;isJSString(ARG_src1));
</del><ins>+    return jsBoolean(ARG_globalData-&gt;interpreter-&gt;isJSString(ARG_src1));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_is_object(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_is_object(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return jsBoolean(jsIsObjectType(ARG_src1));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_is_function(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_is_function(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return jsBoolean(jsIsFunctionType(ARG_src1));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_stricteq(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_stricteq(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5713,7 +5713,7 @@
</span><span class="cx">     return jsBoolean(strictEqualSlowCaseInline(src1, src2));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_nstricteq(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_nstricteq(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5727,7 +5727,7 @@
</span><span class="cx">     return jsBoolean(!strictEqualSlowCaseInline(src1, src2));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_to_jsnumber(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_to_jsnumber(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5739,7 +5739,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_in(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_in(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5767,7 +5767,7 @@
</span><span class="cx">     return jsBoolean(baseObj-&gt;hasProperty(callFrame, property));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_push_new_scope(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_push_new_scope(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5778,7 +5778,7 @@
</span><span class="cx">     return scope;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_jmp_scopes(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_jmp_scopes(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5791,7 +5791,7 @@
</span><span class="cx">     callFrame-&gt;setScopeChain(tmp);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_by_index(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_by_index(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5801,7 +5801,7 @@
</span><span class="cx">     ARG_src1-&gt;put(callFrame, property, ARG_src3);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* Machine::cti_op_switch_imm(CTI_ARGS)
</del><ins>+void* BytecodeInterpreter::cti_op_switch_imm(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5818,7 +5818,7 @@
</span><span class="cx">     return codeBlock-&gt;immediateSwitchJumpTables[tableIndex].ctiDefault;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* Machine::cti_op_switch_char(CTI_ARGS)
</del><ins>+void* BytecodeInterpreter::cti_op_switch_char(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5838,7 +5838,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* Machine::cti_op_switch_string(CTI_ARGS)
</del><ins>+void* BytecodeInterpreter::cti_op_switch_string(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5857,7 +5857,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_op_del_by_val(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_op_del_by_val(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5882,7 +5882,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_getter(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_getter(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5895,7 +5895,7 @@
</span><span class="cx">     baseObj-&gt;defineGetter(callFrame, ident, asObject(ARG_src3));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_put_setter(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_put_setter(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5908,7 +5908,7 @@
</span><span class="cx">     baseObj-&gt;defineSetter(callFrame, ident, asObject(ARG_src3));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* Machine::cti_op_new_error(CTI_ARGS)
</del><ins>+JSObject* BytecodeInterpreter::cti_op_new_error(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5921,7 +5921,7 @@
</span><span class="cx">     return Error::create(callFrame, static_cast&lt;ErrorType&gt;(type), message-&gt;toString(callFrame), lineNumber, codeBlock-&gt;ownerNode-&gt;sourceID(), codeBlock-&gt;ownerNode-&gt;sourceURL());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Machine::cti_op_debug(CTI_ARGS)
</del><ins>+void BytecodeInterpreter::cti_op_debug(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5931,10 +5931,10 @@
</span><span class="cx">     int firstLine = ARG_int2;
</span><span class="cx">     int lastLine = ARG_int3;
</span><span class="cx"> 
</span><del>-    ARG_globalData-&gt;machine-&gt;debug(callFrame, static_cast&lt;DebugHookID&gt;(debugHookID), firstLine, lastLine);
</del><ins>+    ARG_globalData-&gt;interpreter-&gt;debug(callFrame, static_cast&lt;DebugHookID&gt;(debugHookID), firstLine, lastLine);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* Machine::cti_vm_throw(CTI_ARGS)
</del><ins>+JSValue* BytecodeInterpreter::cti_vm_throw(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5949,7 +5949,7 @@
</span><span class="cx">     ASSERT(exceptionValue);
</span><span class="cx">     globalData-&gt;exception = noValue();
</span><span class="cx"> 
</span><del>-    Instruction* handlerVPC = globalData-&gt;machine-&gt;throwException(callFrame, exceptionValue, codeBlock-&gt;instructions.begin() + vPCIndex, false);
</del><ins>+    Instruction* handlerVPC = globalData-&gt;interpreter-&gt;throwException(callFrame, exceptionValue, codeBlock-&gt;instructions.begin() + vPCIndex, false);
</ins><span class="cx"> 
</span><span class="cx">     if (!handlerVPC) {
</span><span class="cx">         *ARG_exception = exceptionValue;
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMMachineh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/Machine.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Machine.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/Machine.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -101,11 +101,11 @@
</span><span class="cx"> 
</span><span class="cx">     enum { MaxReentryDepth = 128 };
</span><span class="cx"> 
</span><del>-    class Machine {
</del><ins>+    class BytecodeInterpreter {
</ins><span class="cx">         friend class CTI;
</span><span class="cx">     public:
</span><del>-        Machine();
-        ~Machine();
</del><ins>+        BytecodeInterpreter();
+        ~BytecodeInterpreter();
</ins><span class="cx"> 
</span><span class="cx">         void initialize(JSGlobalData*);
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMRegisterh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/Register.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Register.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/Register.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx">         
</span><span class="cx">     private:
</span><span class="cx">         friend class ExecState;
</span><del>-        friend class Machine;
</del><ins>+        friend class BytecodeInterpreter;
</ins><span class="cx"> 
</span><del>-        // Only CallFrame and Machine should use these functions.
</del><ins>+        // Only CallFrame and BytecodeInterpreter should use these functions.
</ins><span class="cx"> 
</span><span class="cx">         Register(intptr_t);
</span><span class="cx"> 
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">         getJSValue()-&gt;mark();
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    // Machine functions
</del><ins>+    // BytecodeInterpreter functions
</ins><span class="cx"> 
</span><span class="cx">     ALWAYS_INLINE Register::Register(Arguments* arguments)
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMSamplingToolcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/SamplingTool.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/SamplingTool.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/SamplingTool.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">             continue;
</span><span class="cx"> 
</span><span class="cx">         if (!sample.inHostFunction()) {
</span><del>-            unsigned opcodeID = m_machine-&gt;getOpcodeID(sample.vPC()[0].u.opcode);
</del><ins>+            unsigned opcodeID = m_interpreter-&gt;getOpcodeID(sample.vPC()[0].u.opcode);
</ins><span class="cx"> 
</span><span class="cx">             ++m_opcodeSampleCount;
</span><span class="cx">             ++m_opcodeSamples[opcodeID];
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMSamplingToolh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/SamplingTool.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/SamplingTool.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/VM/SamplingTool.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> 
</span><span class="cx">     class CodeBlock;
</span><span class="cx">     class ExecState;
</span><del>-    class Machine;
</del><ins>+    class BytecodeInterpreter;
</ins><span class="cx">     class ScopeNode;
</span><span class="cx">     struct Instruction;
</span><span class="cx"> 
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx">         };
</span><span class="cx"> #endif        
</span><span class="cx"> 
</span><del>-        SamplingTool(Machine* machine)
-            : m_machine(machine)
</del><ins>+        SamplingTool(BytecodeInterpreter* interpreter)
+            : m_interpreter(interpreter)
</ins><span class="cx">             , m_running(false)
</span><span class="cx">             , m_codeBlock(0)
</span><span class="cx">             , m_sample(0)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">         static void* threadStartFunc(void*);
</span><span class="cx">         void run();
</span><span class="cx">         
</span><del>-        Machine* m_machine;
</del><ins>+        BytecodeInterpreter* m_interpreter;
</ins><span class="cx">         
</span><span class="cx">         // Sampling thread state.
</span><span class="cx">         bool m_running;
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecompilerCodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     m_scopeNode-&gt;children().shrinkCapacity(0);
</span><del>-    if (m_codeType != EvalCode) { // eval code needs to hang on to its declaration stacks to keep declaration info alive until Machine::execute time.
</del><ins>+    if (m_codeType != EvalCode) { // eval code needs to hang on to its declaration stacks to keep declaration info alive until BytecodeInterpreter::execute time.
</ins><span class="cx">         m_scopeNode-&gt;varStack().shrinkCapacity(0);
</span><span class="cx">         m_scopeNode-&gt;functionStack().shrinkCapacity(0);
</span><span class="cx">     }
</span><span class="lines">@@ -236,13 +236,13 @@
</span><span class="cx">     emitOpcode(op_enter);
</span><span class="cx">     codeBlock-&gt;globalData = m_globalData;
</span><span class="cx"> 
</span><del>-    // FIXME: Move code that modifies the global object to Machine::execute.
</del><ins>+    // FIXME: Move code that modifies the global object to BytecodeInterpreter::execute.
</ins><span class="cx">     
</span><span class="cx">     m_codeBlock-&gt;numParameters = 1; // Allocate space for &quot;this&quot;
</span><span class="cx"> 
</span><span class="cx">     JSGlobalObject* globalObject = scopeChain.globalObject();
</span><span class="cx">     ExecState* exec = globalObject-&gt;globalExec();
</span><del>-    RegisterFile* registerFile = &amp;exec-&gt;globalData().machine-&gt;registerFile();
</del><ins>+    RegisterFile* registerFile = &amp;exec-&gt;globalData().interpreter-&gt;registerFile();
</ins><span class="cx">     
</span><span class="cx">     // Shift register indexes in generated code to elide registers allocated by intermediate stack frames.
</span><span class="cx">     m_globalVarStorageOffset = -RegisterFile::CallFrameHeaderSize - m_codeBlock-&gt;numParameters - registerFile-&gt;size();
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeGenerator::emitOpcode(OpcodeID opcodeID)
</span><span class="cx"> {
</span><del>-    instructions().append(globalData()-&gt;machine-&gt;getOpcode(opcodeID));
</del><ins>+    instructions().append(globalData()-&gt;interpreter-&gt;getOpcode(opcodeID));
</ins><span class="cx">     m_lastOpcodeID = opcodeID;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     if (!evalNode)
</span><span class="cx">         return Error::create(m_callFrame, SyntaxError, errMsg, errLine, source.provider()-&gt;asID(), source.provider()-&gt;url());
</span><span class="cx"> 
</span><del>-    return m_callFrame-&gt;scopeChain()-&gt;globalData-&gt;machine-&gt;execute(evalNode.get(), m_callFrame, thisObject(), m_callFrame-&gt;scopeChain(), &amp;exception);
</del><ins>+    return m_callFrame-&gt;scopeChain()-&gt;globalData-&gt;interpreter-&gt;execute(evalNode.get(), m_callFrame, thisObject(), m_callFrame-&gt;scopeChain(), &amp;exception);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/jsc.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/jsc.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/jsc.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">     JSGlobalObject* globalObject = exec-&gt;lexicalGlobalObject();
</span><span class="cx"> 
</span><span class="cx">     stopWatch.start();
</span><del>-    Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(script.data(), fileName));
</del><ins>+    evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(script.data(), fileName));
</ins><span class="cx">     stopWatch.stop();
</span><span class="cx"> 
</span><span class="cx">     return jsNumber(globalObject-&gt;globalExec(), stopWatch.getElapsedMS());
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx">         return throwError(exec, GeneralError, &quot;Could not open file.&quot;);
</span><span class="cx"> 
</span><span class="cx">     JSGlobalObject* globalObject = exec-&gt;lexicalGlobalObject();
</span><del>-    Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(script.data(), fileName));
</del><ins>+    evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(script.data(), fileName));
</ins><span class="cx"> 
</span><span class="cx">     return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -321,8 +321,8 @@
</span><span class="cx">         CodeGenerator::setDumpsGeneratedCode(true);
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    Machine* machine = globalObject-&gt;globalData()-&gt;machine;
-    machine-&gt;setSampler(new SamplingTool(machine));
</del><ins>+    BytecodeInterpreter* interpreter = globalObject-&gt;globalData()-&gt;interpreter;
+    interpreter-&gt;setSampler(new SamplingTool(machine));
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     bool success = true;
</span><span class="lines">@@ -333,9 +333,9 @@
</span><span class="cx">             return false; // fail early so we can catch missing files
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-        machine-&gt;sampler()-&gt;start();
</del><ins>+        interpreter-&gt;sampler()-&gt;start();
</ins><span class="cx"> #endif
</span><del>-        Completion completion = Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(script.data(), fileName));
</del><ins>+        Completion completion = evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(script.data(), fileName));
</ins><span class="cx">         success = success &amp;&amp; completion.complType() != Throw;
</span><span class="cx">         if (dump) {
</span><span class="cx">             if (completion.complType() == Throw)
</span><span class="lines">@@ -347,13 +347,13 @@
</span><span class="cx">         globalObject-&gt;globalExec()-&gt;clearException();
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-        machine-&gt;sampler()-&gt;stop();
</del><ins>+        interpreter-&gt;sampler()-&gt;stop();
</ins><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    machine-&gt;sampler()-&gt;dump(globalObject-&gt;globalExec());
-    delete machine-&gt;sampler();
</del><ins>+    interpreter-&gt;sampler()-&gt;dump(globalObject-&gt;globalExec());
+    delete interpreter-&gt;sampler();
</ins><span class="cx"> #endif
</span><span class="cx">     return success;
</span><span class="cx"> }
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">             break;
</span><span class="cx">         if (line[0])
</span><span class="cx">             add_history(line);
</span><del>-        Completion completion = Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(line, interpreterName));
</del><ins>+        Completion completion = evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(line, interpreterName));
</ins><span class="cx">         free(line);
</span><span class="cx"> #else
</span><span class="cx">         puts(interactivePrompt);
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx">             line.append(c);
</span><span class="cx">         }
</span><span class="cx">         line.append('\0');
</span><del>-        Completion completion = Interpreter::evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(line.data(), interpreterName));
</del><ins>+        Completion completion = evaluate(globalObject-&gt;globalExec(), globalObject-&gt;globalScopeChain(), makeSource(line.data(), interpreterName));
</ins><span class="cx"> #endif
</span><span class="cx">         if (completion.complType() == Throw)
</span><span class="cx">             printf(&quot;Exception: %s\n&quot;, completion.value()-&gt;toString(globalObject-&gt;globalExec()).ascii());
</span></span></pre></div>
<a id="trunkJavaScriptCoreparserNodescpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/parser/Nodes.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/parser/Nodes.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/parser/Nodes.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -2390,7 +2390,7 @@
</span><span class="cx">     if (funcStack)
</span><span class="cx">         m_functionStack = *funcStack;
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    globalData-&gt;machine-&gt;sampler()-&gt;notifyOfScope(this);
</del><ins>+    globalData-&gt;interpreter-&gt;sampler()-&gt;notifyOfScope(this);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreprofilerProfileGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/profiler/ProfileGenerator.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/profiler/ProfileGenerator.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/profiler/ProfileGenerator.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">     UString sourceURL;
</span><span class="cx">     JSValue* function;
</span><span class="cx"> 
</span><del>-    exec-&gt;machine()-&gt;retrieveLastCaller(exec, lineNumber, sourceID, sourceURL, function);
</del><ins>+    exec-&gt;interpreter()-&gt;retrieveLastCaller(exec, lineNumber, sourceID, sourceURL, function);
</ins><span class="cx">     m_currentNode = ProfileNode::create(Profiler::createCallIdentifier(&amp;exec-&gt;globalData(), function ? function-&gt;toThisObject(exec) : 0, sourceURL, lineNumber), m_head.get(), m_head.get());
</span><span class="cx">     m_head-&gt;insertNode(m_currentNode.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/ArrayPrototype.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/ArrayPrototype.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/ArrayPrototype.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> 
</span><span class="cx"> JSValue* arrayProtoFuncPop(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&amp;)
</span><span class="cx"> {
</span><del>-    if (exec-&gt;machine()-&gt;isJSArray(thisValue))
</del><ins>+    if (exec-&gt;interpreter()-&gt;isJSArray(thisValue))
</ins><span class="cx">         return asArray(thisValue)-&gt;pop();
</span><span class="cx"> 
</span><span class="cx">     JSObject* thisObj = thisValue-&gt;toThisObject(exec);
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> 
</span><span class="cx"> JSValue* arrayProtoFuncPush(ExecState* exec, JSObject*, JSValue* thisValue, const ArgList&amp; args)
</span><span class="cx"> {
</span><del>-    if (exec-&gt;machine()-&gt;isJSArray(thisValue) &amp;&amp; args.size() == 1) {
</del><ins>+    if (exec-&gt;interpreter()-&gt;isJSArray(thisValue) &amp;&amp; args.size() == 1) {
</ins><span class="cx">         JSArray* array = asArray(thisValue);
</span><span class="cx">         array-&gt;push(exec, args.begin()-&gt;jsValue(exec));
</span><span class="cx">         return jsNumber(exec, array-&gt;length());
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Collector.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Collector.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/Collector.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -981,7 +981,7 @@
</span><span class="cx">         ArgList::markLists(*m_markListSet);
</span><span class="cx">     if (m_globalData-&gt;exception &amp;&amp; !m_globalData-&gt;exception-&gt;marked())
</span><span class="cx">         m_globalData-&gt;exception-&gt;mark();
</span><del>-    m_globalData-&gt;machine-&gt;registerFile().markCallFrames(this);
</del><ins>+    m_globalData-&gt;interpreter-&gt;registerFile().markCallFrames(this);
</ins><span class="cx">     m_globalData-&gt;smallStrings.mark();
</span><span class="cx"> 
</span><span class="cx">     JSGlobalObject* globalObject = m_globalData-&gt;head;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecStateh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/ExecState.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/ExecState.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/ExecState.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> 
</span><span class="cx">         const CommonIdentifiers&amp; propertyNames() const { return *globalData().propertyNames; }
</span><span class="cx">         const ArgList&amp; emptyList() const { return *globalData().emptyList; }
</span><del>-        Machine* machine() { return globalData().machine; }
</del><ins>+        BytecodeInterpreter* interpreter() { return globalData().interpreter; }
</ins><span class="cx">         Heap* heap() { return &amp;globalData().heap; }
</span><span class="cx"> 
</span><span class="cx">         static const HashTable* arrayTable(CallFrame* callFrame) { return callFrame-&gt;globalData().arrayTable; }
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">         friend class Arguments;
</span><span class="cx">         friend class JSActivation;
</span><span class="cx">         friend class JSGlobalObject;
</span><del>-        friend class Machine;
</del><ins>+        friend class BytecodeInterpreter;
</ins><span class="cx"> 
</span><span class="cx">         static CallFrame* create(Register* callFrameBase) { return static_cast&lt;CallFrame*&gt;(callFrameBase); }
</span><span class="cx">         Register* registers() { return this; }
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeFunctionPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/FunctionPrototype.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/FunctionPrototype.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/FunctionPrototype.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">             return throwError(exec, TypeError);
</span><span class="cx">         if (asObject(argArray)-&gt;classInfo() == &amp;Arguments::info)
</span><span class="cx">             asArguments(argArray)-&gt;fillArgList(exec, applyArgs);
</span><del>-        else if (exec-&gt;machine()-&gt;isJSArray(argArray))
</del><ins>+        else if (exec-&gt;interpreter()-&gt;isJSArray(argArray))
</ins><span class="cx">             asArray(argArray)-&gt;fillArgList(exec, applyArgs);
</span><span class="cx">         else if (asObject(argArray)-&gt;inherits(&amp;JSArray::info)) {
</span><span class="cx">             unsigned length = asArray(argArray)-&gt;get(exec, exec-&gt;propertyNames().length)-&gt;toUInt32(exec);
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Interpreter.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Interpreter.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/Interpreter.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><del>-Completion Interpreter::checkSyntax(ExecState* exec, const SourceCode&amp; source)
</del><ins>+Completion checkSyntax(ExecState* exec, const SourceCode&amp; source)
</ins><span class="cx"> {
</span><span class="cx">     JSLock lock(exec);
</span><span class="cx"> 
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">     return Completion(Normal);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Completion Interpreter::evaluate(ExecState* exec, ScopeChain&amp; scopeChain, const SourceCode&amp; source, JSValue* thisValue)
</del><ins>+Completion evaluate(ExecState* exec, ScopeChain&amp; scopeChain, const SourceCode&amp; source, JSValue* thisValue)
</ins><span class="cx"> {
</span><span class="cx">     JSLock lock(exec);
</span><span class="cx">     
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     JSObject* thisObj = (!thisValue || thisValue-&gt;isUndefinedOrNull()) ? exec-&gt;dynamicGlobalObject() : thisValue-&gt;toObject(exec);
</span><span class="cx"> 
</span><span class="cx">     JSValue* exception = noValue();
</span><del>-    JSValue* result = exec-&gt;machine()-&gt;execute(programNode.get(), exec, scopeChain.node(), thisObj, &amp;exception);
</del><ins>+    JSValue* result = exec-&gt;interpreter()-&gt;execute(programNode.get(), exec, scopeChain.node(), thisObj, &amp;exception);
</ins><span class="cx"> 
</span><span class="cx">     if (exception) {
</span><span class="cx">         if (exception-&gt;isObject() &amp;&amp; asObject(exception)-&gt;isWatchdogException())
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Interpreter.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Interpreter.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/Interpreter.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -29,39 +29,13 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><del>-  class Completion;
-  class ExecState;
-  class ScopeChain;
-  class SourceCode;
-  
-  class Interpreter {
-  public:
-    /**
-     * Parses the supplied ECMAScript code and checks for syntax errors.
-     *
-     * @param code The code to check
-     * @return A normal completion if there were no syntax errors in the code, 
-     * otherwise a throw completion with the syntax error as its value.
-     */
-    static Completion checkSyntax(ExecState*, const SourceCode&amp;);
</del><ins>+    class Completion;
+    class ExecState;
+    class ScopeChain;
+    class SourceCode;
</ins><span class="cx"> 
</span><del>-    /**
-     * Evaluates the supplied ECMAScript code.
-     *
-     * Since this method returns a Completion, you should check the type of
-     * completion to detect an error or before attempting to access the returned
-     * value. For example, if an error occurs during script execution and is not
-     * caught by the script, the completion type will be Throw.
-     *
-     * If the supplied code is invalid, a SyntaxError will be thrown.
-     *
-     * @param code The code to evaluate
-     * @param thisValue The value to pass in as the &quot;this&quot; value for the script
-     * execution. This should either be jsNull() or an Object.
-     * @return A completion object representing the result of the execution.
-     */
-    static Completion evaluate(ExecState*, ScopeChain&amp;, const SourceCode&amp;, JSValue* thisValue = noValue());
-  };
</del><ins>+    Completion checkSyntax(ExecState*, const SourceCode&amp;);
+    Completion evaluate(ExecState*, ScopeChain&amp;, const SourceCode&amp;, JSValue* thisValue = noValue());
</ins><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSCell.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSCell.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSCell.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">         friend class JSPropertyNameIterator;
</span><span class="cx">         friend class JSString;
</span><span class="cx">         friend class JSValue;
</span><del>-        friend class Machine;
</del><ins>+        friend class BytecodeInterpreter;
</ins><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         explicit JSCell(StructureID*);
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSFunction.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSFunction.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSFunction.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -79,19 +79,19 @@
</span><span class="cx"> 
</span><span class="cx"> JSValue* JSFunction::call(ExecState* exec, JSValue* thisValue, const ArgList&amp; args)
</span><span class="cx"> {
</span><del>-    return exec-&gt;machine()-&gt;execute(m_body.get(), exec, this, thisValue-&gt;toThisObject(exec), args, m_scopeChain.node(), exec-&gt;exceptionSlot());
</del><ins>+    return exec-&gt;interpreter()-&gt;execute(m_body.get(), exec, this, thisValue-&gt;toThisObject(exec), args, m_scopeChain.node(), exec-&gt;exceptionSlot());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSValue* JSFunction::argumentsGetter(ExecState* exec, const Identifier&amp;, const PropertySlot&amp; slot)
</span><span class="cx"> {
</span><span class="cx">     JSFunction* thisObj = asFunction(slot.slotBase());
</span><del>-    return exec-&gt;machine()-&gt;retrieveArguments(exec, thisObj);
</del><ins>+    return exec-&gt;interpreter()-&gt;retrieveArguments(exec, thisObj);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSValue* JSFunction::callerGetter(ExecState* exec, const Identifier&amp;, const PropertySlot&amp; slot)
</span><span class="cx"> {
</span><span class="cx">     JSFunction* thisObj = asFunction(slot.slotBase());
</span><del>-    return exec-&gt;machine()-&gt;retrieveCaller(exec, thisObj);
</del><ins>+    return exec-&gt;interpreter()-&gt;retrieveCaller(exec, thisObj);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSValue* JSFunction::lengthGetter(ExecState* exec, const Identifier&amp;, const PropertySlot&amp; slot)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">         structure = exec-&gt;lexicalGlobalObject()-&gt;emptyObjectStructure();
</span><span class="cx">     JSObject* thisObj = new (exec) JSObject(structure);
</span><span class="cx"> 
</span><del>-    JSValue* result = exec-&gt;machine()-&gt;execute(m_body.get(), exec, this, thisObj, args, m_scopeChain.node(), exec-&gt;exceptionSlot());
</del><ins>+    JSValue* result = exec-&gt;interpreter()-&gt;execute(m_body.get(), exec, this, thisObj, args, m_scopeChain.node(), exec-&gt;exceptionSlot());
</ins><span class="cx">     if (exec-&gt;hadException() || !result-&gt;isObject())
</span><span class="cx">         return thisObj;
</span><span class="cx">     return asObject(result);
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSFunction.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSFunction.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSFunction.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx">     class JSFunction : public InternalFunction {
</span><span class="cx">         friend class CTI;
</span><del>-        friend class Machine;
</del><ins>+        friend class BytecodeInterpreter;
</ins><span class="cx"> 
</span><span class="cx">         typedef InternalFunction Base;
</span><span class="cx">         JSFunction(PassRefPtr&lt;JSC::StructureID&gt; st) : InternalFunction(st), m_scopeChain(NoScopeChain()) {}
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalData.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> extern const HashTable stringTable;
</span><span class="cx"> 
</span><span class="cx"> JSGlobalData::JSGlobalData(bool isShared)
</span><del>-    : machine(new Machine)
</del><ins>+    : interpreter(new BytecodeInterpreter)
</ins><span class="cx">     , exception(noValue())
</span><span class="cx">     , arrayTable(new HashTable(JSC::arrayTable))
</span><span class="cx">     , dateTable(new HashTable(JSC::dateTable))
</span><span class="lines">@@ -96,17 +96,17 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     startProfilerServerIfNeeded();
</span><span class="cx"> #endif
</span><del>-    machine-&gt;initialize(this);
</del><ins>+    interpreter-&gt;initialize(this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSGlobalData::~JSGlobalData()
</span><span class="cx"> {
</span><span class="cx">     // By the time this is destroyed, heap.destroy() must already have been called.
</span><span class="cx"> 
</span><del>-    delete machine;
</del><ins>+    delete interpreter;
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     // Zeroing out to make the behavior more predictable when someone attempts to use a deleted instance.
</span><del>-    machine = 0;
</del><ins>+    interpreter = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     arrayTable-&gt;deleteTable();
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalData.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">     class JSGlobalObject;
</span><span class="cx">     class JSObject;
</span><span class="cx">     class Lexer;
</span><del>-    class Machine;
</del><ins>+    class BytecodeInterpreter;
</ins><span class="cx">     class Parser;
</span><span class="cx">     class ParserRefCounted;
</span><span class="cx">     class StructureID;
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">         static PassRefPtr&lt;JSGlobalData&gt; createLeaked();
</span><span class="cx">         ~JSGlobalData();
</span><span class="cx"> 
</span><del>-        Machine* machine;
</del><ins>+        BytecodeInterpreter* interpreter;
</ins><span class="cx"> 
</span><span class="cx">         JSValue* exception;
</span><span class="cx"> #if ENABLE(CTI)
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalObject.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalObject.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSGlobalObject.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">     for (HashSet&lt;ProgramCodeBlock*&gt;::const_iterator it = codeBlocks().begin(); it != end; ++it)
</span><span class="cx">         (*it)-&gt;globalObject = 0;
</span><span class="cx">         
</span><del>-    RegisterFile&amp; registerFile = globalData()-&gt;machine-&gt;registerFile();
</del><ins>+    RegisterFile&amp; registerFile = globalData()-&gt;interpreter-&gt;registerFile();
</ins><span class="cx">     if (registerFile.globalObject() == this) {
</span><span class="cx">         registerFile.setGlobalObject(0);
</span><span class="cx">         registerFile.setNumGlobals(0);
</span><span class="lines">@@ -345,17 +345,17 @@
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObject::setTimeoutTime(unsigned timeoutTime)
</span><span class="cx"> {
</span><del>-    globalData()-&gt;machine-&gt;setTimeoutTime(timeoutTime);
</del><ins>+    globalData()-&gt;interpreter-&gt;setTimeoutTime(timeoutTime);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObject::startTimeoutCheck()
</span><span class="cx"> {
</span><del>-    globalData()-&gt;machine-&gt;startTimeoutCheck();
</del><ins>+    globalData()-&gt;interpreter-&gt;startTimeoutCheck();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObject::stopTimeoutCheck()
</span><span class="cx"> {
</span><del>-    globalData()-&gt;machine-&gt;stopTimeoutCheck();
</del><ins>+    globalData()-&gt;interpreter-&gt;stopTimeoutCheck();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObject::mark()
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx">     for (HashSet&lt;ProgramCodeBlock*&gt;::const_iterator it = codeBlocks().begin(); it != end; ++it)
</span><span class="cx">         (*it)-&gt;mark();
</span><span class="cx"> 
</span><del>-    RegisterFile&amp; registerFile = globalData()-&gt;machine-&gt;registerFile();
</del><ins>+    RegisterFile&amp; registerFile = globalData()-&gt;interpreter-&gt;registerFile();
</ins><span class="cx">     if (registerFile.globalObject() == this)
</span><span class="cx">         registerFile.markGlobals(&amp;globalData()-&gt;heap);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">     if (!evalNode)
</span><span class="cx">         return throwError(exec, SyntaxError, errMsg, errLine, source.provider()-&gt;asID(), NULL);
</span><span class="cx"> 
</span><del>-    return exec-&gt;machine()-&gt;execute(evalNode.get(), exec, thisObject, globalObject-&gt;globalScopeChain().node(), exec-&gt;exceptionSlot());
</del><ins>+    return exec-&gt;interpreter()-&gt;execute(evalNode.get(), exec, thisObject, globalObject-&gt;globalScopeChain().node(), exec-&gt;exceptionSlot());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSValue* globalFuncParseInt(ExecState* exec, JSObject*, JSValue*, const ArgList&amp; args)
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSString.h (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSString.h        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/JSString.h        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx">     class JSString : public JSCell {
</span><span class="cx">         friend class CTI;
</span><del>-        friend class Machine;
</del><ins>+        friend class BytecodeInterpreter;
</ins><span class="cx"> 
</span><span class="cx">     public:
</span><span class="cx">         JSString(JSGlobalData* globalData, const UString&amp; value)
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/RegExp.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/RegExp.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptCore/runtime/RegExp.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">     , m_numSubpatterns(0)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WREC)
</span><del>-    m_wrecFunction = CTI::compileRegExp(globalData-&gt;machine, pattern, &amp;m_numSubpatterns, &amp;m_constructionError);
</del><ins>+    m_wrecFunction = CTI::compileRegExp(globalData-&gt;interpreter, pattern, &amp;m_numSubpatterns, &amp;m_constructionError);
</ins><span class="cx">     if (m_wrecFunction)
</span><span class="cx">         return;
</span><span class="cx">     // Fall through to non-WREC case.
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WREC)
</span><del>-    m_wrecFunction = CTI::compileRegExp(globalData-&gt;machine, pattern, &amp;m_numSubpatterns, &amp;m_constructionError, (m_flagBits &amp; IgnoreCase), (m_flagBits &amp; Multiline));
</del><ins>+    m_wrecFunction = CTI::compileRegExp(globalData-&gt;interpreter, pattern, &amp;m_numSubpatterns, &amp;m_constructionError, (m_flagBits &amp; IgnoreCase), (m_flagBits &amp; Multiline));
</ins><span class="cx">     if (m_wrecFunction)
</span><span class="cx">         return;
</span><span class="cx">     // Fall through to non-WREC case.
</span></span></pre></div>
<a id="trunkJavaScriptGlueChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptGlue/ChangeLog (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptGlue/ChangeLog        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptGlue/ChangeLog        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+        
+        Updated for JavaScriptCore renames.
+
+        * JSRun.cpp:
+        (JSRun::Evaluate):
+        (JSRun::CheckSyntax):
+
</ins><span class="cx"> 2008-11-05  Cameron Zwarich  &lt;zwarich@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Not reviewed.
</span></span></pre></div>
<a id="trunkJavaScriptGlueJSRuncpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptGlue/JSRun.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptGlue/JSRun.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/JavaScriptGlue/JSRun.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> 
</span><span class="cx"> Completion JSRun::Evaluate()
</span><span class="cx"> {
</span><del>-    return Interpreter::evaluate(fGlobalObject-&gt;globalExec(), fGlobalObject-&gt;globalScopeChain(), makeSource(fSource));
</del><ins>+    return JSC::evaluate(fGlobalObject-&gt;globalExec(), fGlobalObject-&gt;globalScopeChain(), makeSource(fSource));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool JSRun::CheckSyntax()
</span><span class="cx"> {
</span><del>-    return Interpreter::checkSyntax(fGlobalObject-&gt;globalExec(), makeSource(fSource)).complType() != Throw;
</del><ins>+    return JSC::checkSyntax(fGlobalObject-&gt;globalExec(), makeSource(fSource)).complType() != Throw;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/ChangeLog        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+        
+        Updated for JavaScriptCore renames.
+
+        * bindings/js/JSNodeCustom.cpp:
+        (WebCore::JSNode::mark):
+        * bindings/js/JSXMLHttpRequestCustom.cpp:
+        (WebCore::JSXMLHttpRequest::send):
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::evaluate):
+        * bindings/js/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::evaluate):
+        * bindings/objc/WebScriptObject.mm:
+        (-[WebScriptObject evaluateWebScript:]):
+        * bridge/NP_jsobject.cpp:
+        (_NPN_Evaluate):
+        * bridge/jni/jni_jsobject.mm:
+        (JavaJSObject::eval):
+        * page/Console.cpp:
+        (WebCore::retrieveLastCaller):
+        (WebCore::Console::trace):
+
</ins><span class="cx"> 2008-11-14  Greg Bolsinga  &lt;bolsinga@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSNodeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSNodeCustom.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSNodeCustom.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bindings/js/JSNodeCustom.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> 
</span><span class="cx">     Node* node = m_impl.get();
</span><span class="cx"> 
</span><del>-    // Nodes in the document are kept alive by ScriptInterpreter::mark,
</del><ins>+    // Nodes in the document are kept alive by JSDocument::mark,
</ins><span class="cx">     // so we have no special responsibilities and can just call the base class here.
</span><span class="cx">     if (node-&gt;inDocument()) {
</span><span class="cx">         // But if the document isn't marked we have to mark it to ensure that
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSXMLHttpRequestCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">     intptr_t sourceID;
</span><span class="cx">     UString sourceURL;
</span><span class="cx">     JSValue* function;
</span><del>-    exec-&gt;machine()-&gt;retrieveLastCaller(exec, signedLineNumber, sourceID, sourceURL, function);
</del><ins>+    exec-&gt;interpreter()-&gt;retrieveLastCaller(exec, signedLineNumber, sourceID, sourceURL, function);
</ins><span class="cx">     impl()-&gt;setLastSendLineNumber(signedLineNumber &gt;= 0 ? signedLineNumber : 0);
</span><span class="cx">     impl()-&gt;setLastSendURL(sourceURL);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/ScriptController.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/ScriptController.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bindings/js/ScriptController.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">     m_frame-&gt;keepAlive();
</span><span class="cx"> 
</span><span class="cx">     m_windowShell-&gt;window()-&gt;startTimeoutCheck();
</span><del>-    Completion comp = Interpreter::evaluate(exec, exec-&gt;dynamicGlobalObject()-&gt;globalScopeChain(), makeSource(str, sourceURL, baseLine), m_windowShell);
</del><ins>+    Completion comp = JSC::evaluate(exec, exec-&gt;dynamicGlobalObject()-&gt;globalScopeChain(), makeSource(str, sourceURL, baseLine), m_windowShell);
</ins><span class="cx">     m_windowShell-&gt;window()-&gt;stopTimeoutCheck();
</span><span class="cx"> 
</span><span class="cx">     if (comp.complType() == Normal || comp.complType() == ReturnValue) {
</span></span></pre></div>
<a id="trunkWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/WorkerScriptController.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/WorkerScriptController.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bindings/js/WorkerScriptController.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> 
</span><span class="cx">     ExecState* exec = m_workerContextWrapper-&gt;globalExec();
</span><span class="cx">     m_workerContextWrapper-&gt;startTimeoutCheck();
</span><del>-    Completion comp = Interpreter::evaluate(exec, exec-&gt;dynamicGlobalObject()-&gt;globalScopeChain(), makeSource(code, sourceURL, baseLine), m_workerContextWrapper);
</del><ins>+    Completion comp = JSC::evaluate(exec, exec-&gt;dynamicGlobalObject()-&gt;globalScopeChain(), makeSource(code, sourceURL, baseLine), m_workerContextWrapper);
</ins><span class="cx">     m_workerContextWrapper-&gt;stopTimeoutCheck();
</span><span class="cx"> 
</span><span class="cx">     if (comp.complType() == Normal || comp.complType() == ReturnValue)
</span></span></pre></div>
<a id="trunkWebCorebindingsobjcWebScriptObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/objc/WebScriptObject.mm (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/objc/WebScriptObject.mm        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bindings/objc/WebScriptObject.mm        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx">     JSLock lock(false);
</span><span class="cx">     
</span><span class="cx">     [self _rootObject]-&gt;globalObject()-&gt;startTimeoutCheck();
</span><del>-    Completion completion = Interpreter::evaluate([self _rootObject]-&gt;globalObject()-&gt;globalExec(), [self _rootObject]-&gt;globalObject()-&gt;globalScopeChain(), makeSource(String(script)));
</del><ins>+    Completion completion = JSC::evaluate([self _rootObject]-&gt;globalObject()-&gt;globalExec(), [self _rootObject]-&gt;globalObject()-&gt;globalScopeChain(), makeSource(String(script)));
</ins><span class="cx">     [self _rootObject]-&gt;globalObject()-&gt;stopTimeoutCheck();
</span><span class="cx">     ComplType type = completion.complType();
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkWebCorebridgeNP_jsobjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bridge/NP_jsobject.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bridge/NP_jsobject.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bridge/NP_jsobject.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">         JSLock lock(false);
</span><span class="cx">         String scriptString = convertNPStringToUTF16(s);
</span><span class="cx">         rootObject-&gt;globalObject()-&gt;startTimeoutCheck();
</span><del>-        Completion completion = Interpreter::evaluate(rootObject-&gt;globalObject()-&gt;globalExec(), rootObject-&gt;globalObject()-&gt;globalScopeChain(), makeSource(scriptString));
</del><ins>+        Completion completion = JSC::evaluate(rootObject-&gt;globalObject()-&gt;globalExec(), rootObject-&gt;globalObject()-&gt;globalScopeChain(), makeSource(scriptString));
</ins><span class="cx">         rootObject-&gt;globalObject()-&gt;stopTimeoutCheck();
</span><span class="cx">         ComplType type = completion.complType();
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkWebCorebridgejnijni_jsobjectmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bridge/jni/jni_jsobject.mm (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bridge/jni/jni_jsobject.mm        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/bridge/jni/jni_jsobject.mm        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx">         return 0;
</span><span class="cx"> 
</span><span class="cx">     rootObject-&gt;globalObject()-&gt;startTimeoutCheck();
</span><del>-    Completion completion = Interpreter::evaluate(rootObject-&gt;globalObject()-&gt;globalExec(), rootObject-&gt;globalObject()-&gt;globalScopeChain(), makeSource(JavaString(script)));
</del><ins>+    Completion completion = JSC::evaluate(rootObject-&gt;globalObject()-&gt;globalExec(), rootObject-&gt;globalObject()-&gt;globalScopeChain(), makeSource(JavaString(script)));
</ins><span class="cx">     rootObject-&gt;globalObject()-&gt;stopTimeoutCheck();
</span><span class="cx">     ComplType type = completion.complType();
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkWebCorepageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Console.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Console.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebCore/page/Console.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">     UString urlString;
</span><span class="cx">     JSValue* function;
</span><span class="cx"> 
</span><del>-    exec-&gt;machine()-&gt;retrieveLastCaller(exec, signedLineNumber, sourceID, urlString, function);
</del><ins>+    exec-&gt;interpreter()-&gt;retrieveLastCaller(exec, signedLineNumber, sourceID, urlString, function);
</ins><span class="cx"> 
</span><span class="cx">     url = KURL(urlString);
</span><span class="cx">     lineNumber = (signedLineNumber &gt;= 0 ? signedLineNumber : 0);
</span><span class="lines">@@ -274,12 +274,12 @@
</span><span class="cx">     UString urlString;
</span><span class="cx">     JSValue* func;
</span><span class="cx"> 
</span><del>-    exec-&gt;machine()-&gt;retrieveLastCaller(exec, signedLineNumber, sourceID, urlString, func);
</del><ins>+    exec-&gt;interpreter()-&gt;retrieveLastCaller(exec, signedLineNumber, sourceID, urlString, func);
</ins><span class="cx"> 
</span><span class="cx">     ArgList args;
</span><span class="cx">     while (!func-&gt;isNull()) {
</span><span class="cx">         args.append(func);
</span><del>-        func = exec-&gt;machine()-&gt;retrieveCaller(exec, asInternalFunction(func));
</del><ins>+        func = exec-&gt;interpreter()-&gt;retrieveCaller(exec, asInternalFunction(func));
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     page-&gt;inspectorController()-&gt;addMessageToConsole(JSMessageSource, TraceMessageLevel, exec, args, 0, String());
</span></span></pre></div>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebKit/win/ChangeLog        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2008-11-15  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+        
+        Updated for JavaScriptCore renames.
+
+        * WebScriptCallFrame.cpp:
+        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):
+
</ins><span class="cx"> 2008-11-14  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         - try to fix the Windows build
</span></span></pre></div>
<a id="trunkWebKitwinWebScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebScriptCallFrame.cpp (38422 => 38423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebScriptCallFrame.cpp        2008-11-15 18:19:45 UTC (rev 38422)
+++ trunk/WebKit/win/WebScriptCallFrame.cpp        2008-11-15 19:55:20 UTC (rev 38423)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">         scriptExecutionResult = eval-&gt;call(state, 0, args);
</span><span class="cx">     } else
</span><span class="cx">         // no &quot;eval&quot;, or no context (i.e. global scope) - use global fallback
</span><del>-        scriptExecutionResult = Interpreter::evaluate(state, UString(), 0, code.data(), code.size(), globObj).value();
</del><ins>+        scriptExecutionResult = JSC::evaluate(state, UString(), 0, code.data(), code.size(), globObj).value();
</ins><span class="cx"> 
</span><span class="cx">     if (state-&gt;hadException())
</span><span class="cx">         scriptExecutionResult = state-&gt;exception();    // (may be redundant depending on which eval path was used)
</span></span></pre>
</div>
</div>

</body>
</html>