<!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>[38464] trunk/JavaScriptCore</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/38464">38464</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2008-11-16 18:21:16 -0800 (Sun, 16 Nov 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-11-16  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Reviewed by Sam Weinig.
        
        Renamed BytecodeInterpreter =&gt; Interpreter.

        * JavaScriptCore.exp:
        * VM/CTI.cpp:
        (JSC::):
        (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):
        * VM/CTI.h:
        * VM/CodeBlock.cpp:
        (JSC::CodeBlock::printStructures):
        (JSC::CodeBlock::derefStructures):
        (JSC::CodeBlock::refStructures):
        * VM/Machine.cpp:
        (JSC::jsLess):
        (JSC::jsLessEq):
        (JSC::Interpreter::resolve):
        (JSC::Interpreter::resolveSkip):
        (JSC::Interpreter::resolveGlobal):
        (JSC::Interpreter::resolveBase):
        (JSC::Interpreter::resolveBaseAndProperty):
        (JSC::Interpreter::resolveBaseAndFunc):
        (JSC::Interpreter::slideRegisterWindowForCall):
        (JSC::Interpreter::callEval):
        (JSC::Interpreter::Interpreter):
        (JSC::Interpreter::initialize):
        (JSC::Interpreter::~Interpreter):
        (JSC::Interpreter::dumpCallFrame):
        (JSC::Interpreter::dumpRegisters):
        (JSC::Interpreter::isOpcode):
        (JSC::Interpreter::unwindCallFrame):
        (JSC::Interpreter::throwException):
        (JSC::Interpreter::execute):
        (JSC::Interpreter::debug):
        (JSC::Interpreter::resetTimeoutCheck):
        (JSC::Interpreter::checkTimeout):
        (JSC::Interpreter::createExceptionScope):
        (JSC::Interpreter::tryCachePutByID):
        (JSC::Interpreter::uncachePutByID):
        (JSC::Interpreter::tryCacheGetByID):
        (JSC::Interpreter::uncacheGetByID):
        (JSC::Interpreter::privateExecute):
        (JSC::Interpreter::retrieveArguments):
        (JSC::Interpreter::retrieveCaller):
        (JSC::Interpreter::retrieveLastCaller):
        (JSC::Interpreter::findFunctionCallFrame):
        (JSC::Interpreter::tryCTICachePutByID):
        (JSC::Interpreter::tryCTICacheGetByID):
        (JSC::Interpreter::cti_op_convert_this):
        (JSC::Interpreter::cti_op_end):
        (JSC::Interpreter::cti_op_add):
        (JSC::Interpreter::cti_op_pre_inc):
        (JSC::Interpreter::cti_timeout_check):
        (JSC::Interpreter::cti_register_file_check):
        (JSC::Interpreter::cti_op_loop_if_less):
        (JSC::Interpreter::cti_op_loop_if_lesseq):
        (JSC::Interpreter::cti_op_new_object):
        (JSC::Interpreter::cti_op_put_by_id):
        (JSC::Interpreter::cti_op_put_by_id_second):
        (JSC::Interpreter::cti_op_put_by_id_generic):
        (JSC::Interpreter::cti_op_put_by_id_fail):
        (JSC::Interpreter::cti_op_get_by_id):
        (JSC::Interpreter::cti_op_get_by_id_second):
        (JSC::Interpreter::cti_op_get_by_id_generic):
        (JSC::Interpreter::cti_op_get_by_id_fail):
        (JSC::Interpreter::cti_op_instanceof):
        (JSC::Interpreter::cti_op_del_by_id):
        (JSC::Interpreter::cti_op_mul):
        (JSC::Interpreter::cti_op_new_func):
        (JSC::Interpreter::cti_op_call_JSFunction):
        (JSC::Interpreter::cti_op_call_arityCheck):
        (JSC::Interpreter::cti_vm_dontLazyLinkCall):
        (JSC::Interpreter::cti_vm_lazyLinkCall):
        (JSC::Interpreter::cti_op_push_activation):
        (JSC::Interpreter::cti_op_call_NotJSFunction):
        (JSC::Interpreter::cti_op_create_arguments):
        (JSC::Interpreter::cti_op_create_arguments_no_params):
        (JSC::Interpreter::cti_op_tear_off_activation):
        (JSC::Interpreter::cti_op_tear_off_arguments):
        (JSC::Interpreter::cti_op_profile_will_call):
        (JSC::Interpreter::cti_op_profile_did_call):
        (JSC::Interpreter::cti_op_ret_scopeChain):
        (JSC::Interpreter::cti_op_new_array):
        (JSC::Interpreter::cti_op_resolve):
        (JSC::Interpreter::cti_op_construct_JSConstruct):
        (JSC::Interpreter::cti_op_construct_NotJSConstruct):
        (JSC::Interpreter::cti_op_get_by_val):
        (JSC::Interpreter::cti_op_resolve_func):
        (JSC::Interpreter::cti_op_sub):
        (JSC::Interpreter::cti_op_put_by_val):
        (JSC::Interpreter::cti_op_put_by_val_array):
        (JSC::Interpreter::cti_op_lesseq):
        (JSC::Interpreter::cti_op_loop_if_true):
        (JSC::Interpreter::cti_op_negate):
        (JSC::Interpreter::cti_op_resolve_base):
        (JSC::Interpreter::cti_op_resolve_skip):
        (JSC::Interpreter::cti_op_resolve_global):
        (JSC::Interpreter::cti_op_div):
        (JSC::Interpreter::cti_op_pre_dec):
        (JSC::Interpreter::cti_op_jless):
        (JSC::Interpreter::cti_op_not):
        (JSC::Interpreter::cti_op_jtrue):
        (JSC::Interpreter::cti_op_post_inc):
        (JSC::Interpreter::cti_op_eq):
        (JSC::Interpreter::cti_op_lshift):
        (JSC::Interpreter::cti_op_bitand):
        (JSC::Interpreter::cti_op_rshift):
        (JSC::Interpreter::cti_op_bitnot):
        (JSC::Interpreter::cti_op_resolve_with_base):
        (JSC::Interpreter::cti_op_new_func_exp):
        (JSC::Interpreter::cti_op_mod):
        (JSC::Interpreter::cti_op_less):
        (JSC::Interpreter::cti_op_neq):
        (JSC::Interpreter::cti_op_post_dec):
        (JSC::Interpreter::cti_op_urshift):
        (JSC::Interpreter::cti_op_bitxor):
        (JSC::Interpreter::cti_op_new_regexp):
        (JSC::Interpreter::cti_op_bitor):
        (JSC::Interpreter::cti_op_call_eval):
        (JSC::Interpreter::cti_op_throw):
        (JSC::Interpreter::cti_op_get_pnames):
        (JSC::Interpreter::cti_op_next_pname):
        (JSC::Interpreter::cti_op_push_scope):
        (JSC::Interpreter::cti_op_pop_scope):
        (JSC::Interpreter::cti_op_typeof):
        (JSC::Interpreter::cti_op_is_undefined):
        (JSC::Interpreter::cti_op_is_boolean):
        (JSC::Interpreter::cti_op_is_number):
        (JSC::Interpreter::cti_op_is_string):
        (JSC::Interpreter::cti_op_is_object):
        (JSC::Interpreter::cti_op_is_function):
        (JSC::Interpreter::cti_op_stricteq):
        (JSC::Interpreter::cti_op_nstricteq):
        (JSC::Interpreter::cti_op_to_jsnumber):
        (JSC::Interpreter::cti_op_in):
        (JSC::Interpreter::cti_op_push_new_scope):
        (JSC::Interpreter::cti_op_jmp_scopes):
        (JSC::Interpreter::cti_op_put_by_index):
        (JSC::Interpreter::cti_op_switch_imm):
        (JSC::Interpreter::cti_op_switch_char):
        (JSC::Interpreter::cti_op_switch_string):
        (JSC::Interpreter::cti_op_del_by_val):
        (JSC::Interpreter::cti_op_put_getter):
        (JSC::Interpreter::cti_op_put_setter):
        (JSC::Interpreter::cti_op_new_error):
        (JSC::Interpreter::cti_op_debug):
        (JSC::Interpreter::cti_vm_throw):
        * VM/Machine.h:
        * VM/Register.h:
        * VM/SamplingTool.h:
        (JSC::SamplingTool::SamplingTool):
        * bytecompiler/CodeGenerator.cpp:
        (JSC::BytecodeGenerator::generate):
        (JSC::BytecodeGenerator::BytecodeGenerator):
        * jsc.cpp:
        (runWithScripts):
        * runtime/ExecState.h:
        (JSC::ExecState::interpreter):
        * runtime/JSCell.h:
        * runtime/JSFunction.h:
        * runtime/JSGlobalData.cpp:
        (JSC::JSGlobalData::JSGlobalData):
        * runtime/JSGlobalData.h:
        * runtime/JSString.h:
        * wrec/WREC.cpp:
        (WREC::compileRegExp):
        * wrec/WREC.h:</pre>

<h3>Modified Paths</h3>
<ul>
<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="#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="#trunkJavaScriptCoreVMSamplingToolh">trunk/JavaScriptCore/VM/SamplingTool.h</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerCodeGeneratorcpp">trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCorejsccpp">trunk/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecStateh">trunk/JavaScriptCore/runtime/ExecState.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSCellh">trunk/JavaScriptCore/runtime/JSCell.h</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="#trunkJavaScriptCoreruntimeJSStringh">trunk/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#trunkJavaScriptCorewrecWRECcpp">trunk/JavaScriptCore/wrec/WREC.cpp</a></li>
<li><a href="#trunkJavaScriptCorewrecWRECh">trunk/JavaScriptCore/wrec/WREC.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/ChangeLog        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -1,5 +1,190 @@
</span><span class="cx"> 2008-11-16  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Sam Weinig.
+        
+        Renamed BytecodeInterpreter =&gt; Interpreter.
+
+        * JavaScriptCore.exp:
+        * VM/CTI.cpp:
+        (JSC::):
+        (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):
+        * VM/CTI.h:
+        * VM/CodeBlock.cpp:
+        (JSC::CodeBlock::printStructures):
+        (JSC::CodeBlock::derefStructures):
+        (JSC::CodeBlock::refStructures):
+        * VM/Machine.cpp:
+        (JSC::jsLess):
+        (JSC::jsLessEq):
+        (JSC::Interpreter::resolve):
+        (JSC::Interpreter::resolveSkip):
+        (JSC::Interpreter::resolveGlobal):
+        (JSC::Interpreter::resolveBase):
+        (JSC::Interpreter::resolveBaseAndProperty):
+        (JSC::Interpreter::resolveBaseAndFunc):
+        (JSC::Interpreter::slideRegisterWindowForCall):
+        (JSC::Interpreter::callEval):
+        (JSC::Interpreter::Interpreter):
+        (JSC::Interpreter::initialize):
+        (JSC::Interpreter::~Interpreter):
+        (JSC::Interpreter::dumpCallFrame):
+        (JSC::Interpreter::dumpRegisters):
+        (JSC::Interpreter::isOpcode):
+        (JSC::Interpreter::unwindCallFrame):
+        (JSC::Interpreter::throwException):
+        (JSC::Interpreter::execute):
+        (JSC::Interpreter::debug):
+        (JSC::Interpreter::resetTimeoutCheck):
+        (JSC::Interpreter::checkTimeout):
+        (JSC::Interpreter::createExceptionScope):
+        (JSC::Interpreter::tryCachePutByID):
+        (JSC::Interpreter::uncachePutByID):
+        (JSC::Interpreter::tryCacheGetByID):
+        (JSC::Interpreter::uncacheGetByID):
+        (JSC::Interpreter::privateExecute):
+        (JSC::Interpreter::retrieveArguments):
+        (JSC::Interpreter::retrieveCaller):
+        (JSC::Interpreter::retrieveLastCaller):
+        (JSC::Interpreter::findFunctionCallFrame):
+        (JSC::Interpreter::tryCTICachePutByID):
+        (JSC::Interpreter::tryCTICacheGetByID):
+        (JSC::Interpreter::cti_op_convert_this):
+        (JSC::Interpreter::cti_op_end):
+        (JSC::Interpreter::cti_op_add):
+        (JSC::Interpreter::cti_op_pre_inc):
+        (JSC::Interpreter::cti_timeout_check):
+        (JSC::Interpreter::cti_register_file_check):
+        (JSC::Interpreter::cti_op_loop_if_less):
+        (JSC::Interpreter::cti_op_loop_if_lesseq):
+        (JSC::Interpreter::cti_op_new_object):
+        (JSC::Interpreter::cti_op_put_by_id):
+        (JSC::Interpreter::cti_op_put_by_id_second):
+        (JSC::Interpreter::cti_op_put_by_id_generic):
+        (JSC::Interpreter::cti_op_put_by_id_fail):
+        (JSC::Interpreter::cti_op_get_by_id):
+        (JSC::Interpreter::cti_op_get_by_id_second):
+        (JSC::Interpreter::cti_op_get_by_id_generic):
+        (JSC::Interpreter::cti_op_get_by_id_fail):
+        (JSC::Interpreter::cti_op_instanceof):
+        (JSC::Interpreter::cti_op_del_by_id):
+        (JSC::Interpreter::cti_op_mul):
+        (JSC::Interpreter::cti_op_new_func):
+        (JSC::Interpreter::cti_op_call_JSFunction):
+        (JSC::Interpreter::cti_op_call_arityCheck):
+        (JSC::Interpreter::cti_vm_dontLazyLinkCall):
+        (JSC::Interpreter::cti_vm_lazyLinkCall):
+        (JSC::Interpreter::cti_op_push_activation):
+        (JSC::Interpreter::cti_op_call_NotJSFunction):
+        (JSC::Interpreter::cti_op_create_arguments):
+        (JSC::Interpreter::cti_op_create_arguments_no_params):
+        (JSC::Interpreter::cti_op_tear_off_activation):
+        (JSC::Interpreter::cti_op_tear_off_arguments):
+        (JSC::Interpreter::cti_op_profile_will_call):
+        (JSC::Interpreter::cti_op_profile_did_call):
+        (JSC::Interpreter::cti_op_ret_scopeChain):
+        (JSC::Interpreter::cti_op_new_array):
+        (JSC::Interpreter::cti_op_resolve):
+        (JSC::Interpreter::cti_op_construct_JSConstruct):
+        (JSC::Interpreter::cti_op_construct_NotJSConstruct):
+        (JSC::Interpreter::cti_op_get_by_val):
+        (JSC::Interpreter::cti_op_resolve_func):
+        (JSC::Interpreter::cti_op_sub):
+        (JSC::Interpreter::cti_op_put_by_val):
+        (JSC::Interpreter::cti_op_put_by_val_array):
+        (JSC::Interpreter::cti_op_lesseq):
+        (JSC::Interpreter::cti_op_loop_if_true):
+        (JSC::Interpreter::cti_op_negate):
+        (JSC::Interpreter::cti_op_resolve_base):
+        (JSC::Interpreter::cti_op_resolve_skip):
+        (JSC::Interpreter::cti_op_resolve_global):
+        (JSC::Interpreter::cti_op_div):
+        (JSC::Interpreter::cti_op_pre_dec):
+        (JSC::Interpreter::cti_op_jless):
+        (JSC::Interpreter::cti_op_not):
+        (JSC::Interpreter::cti_op_jtrue):
+        (JSC::Interpreter::cti_op_post_inc):
+        (JSC::Interpreter::cti_op_eq):
+        (JSC::Interpreter::cti_op_lshift):
+        (JSC::Interpreter::cti_op_bitand):
+        (JSC::Interpreter::cti_op_rshift):
+        (JSC::Interpreter::cti_op_bitnot):
+        (JSC::Interpreter::cti_op_resolve_with_base):
+        (JSC::Interpreter::cti_op_new_func_exp):
+        (JSC::Interpreter::cti_op_mod):
+        (JSC::Interpreter::cti_op_less):
+        (JSC::Interpreter::cti_op_neq):
+        (JSC::Interpreter::cti_op_post_dec):
+        (JSC::Interpreter::cti_op_urshift):
+        (JSC::Interpreter::cti_op_bitxor):
+        (JSC::Interpreter::cti_op_new_regexp):
+        (JSC::Interpreter::cti_op_bitor):
+        (JSC::Interpreter::cti_op_call_eval):
+        (JSC::Interpreter::cti_op_throw):
+        (JSC::Interpreter::cti_op_get_pnames):
+        (JSC::Interpreter::cti_op_next_pname):
+        (JSC::Interpreter::cti_op_push_scope):
+        (JSC::Interpreter::cti_op_pop_scope):
+        (JSC::Interpreter::cti_op_typeof):
+        (JSC::Interpreter::cti_op_is_undefined):
+        (JSC::Interpreter::cti_op_is_boolean):
+        (JSC::Interpreter::cti_op_is_number):
+        (JSC::Interpreter::cti_op_is_string):
+        (JSC::Interpreter::cti_op_is_object):
+        (JSC::Interpreter::cti_op_is_function):
+        (JSC::Interpreter::cti_op_stricteq):
+        (JSC::Interpreter::cti_op_nstricteq):
+        (JSC::Interpreter::cti_op_to_jsnumber):
+        (JSC::Interpreter::cti_op_in):
+        (JSC::Interpreter::cti_op_push_new_scope):
+        (JSC::Interpreter::cti_op_jmp_scopes):
+        (JSC::Interpreter::cti_op_put_by_index):
+        (JSC::Interpreter::cti_op_switch_imm):
+        (JSC::Interpreter::cti_op_switch_char):
+        (JSC::Interpreter::cti_op_switch_string):
+        (JSC::Interpreter::cti_op_del_by_val):
+        (JSC::Interpreter::cti_op_put_getter):
+        (JSC::Interpreter::cti_op_put_setter):
+        (JSC::Interpreter::cti_op_new_error):
+        (JSC::Interpreter::cti_op_debug):
+        (JSC::Interpreter::cti_vm_throw):
+        * VM/Machine.h:
+        * VM/Register.h:
+        * VM/SamplingTool.h:
+        (JSC::SamplingTool::SamplingTool):
+        * bytecompiler/CodeGenerator.cpp:
+        (JSC::BytecodeGenerator::generate):
+        (JSC::BytecodeGenerator::BytecodeGenerator):
+        * jsc.cpp:
+        (runWithScripts):
+        * runtime/ExecState.h:
+        (JSC::ExecState::interpreter):
+        * runtime/JSCell.h:
+        * runtime/JSFunction.h:
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData):
+        * runtime/JSGlobalData.h:
+        * runtime/JSString.h:
+        * wrec/WREC.cpp:
+        (WREC::compileRegExp):
+        * wrec/WREC.h:
+
+2008-11-16  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
</ins><span class="cx">         Roll out r38461 (my last patch) because it broke the world.
</span><span class="cx"> 
</span><span class="cx"> 2008-11-16  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span></span></pre></div>
<a id="trunkJavaScriptCoreJavaScriptCoreexp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/JavaScriptCore.exp (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/JavaScriptCore.exp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/JavaScriptCore.exp        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -299,6 +299,8 @@
</span><span class="cx"> __ZN3WTF8CollatorC1EPKc
</span><span class="cx"> __ZN3WTF8CollatorD1Ev
</span><span class="cx"> __ZN3WTF8fastFreeEPv
</span><ins>+__ZNK3JSC11Interpreter14retrieveCallerEPNS_9ExecStateEPNS_16InternalFunctionE
+__ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRNS_7UStringERPNS_7JSValueE
</ins><span class="cx"> __ZNK3JSC12DateInstance7getTimeERdRi
</span><span class="cx"> __ZNK3JSC12StringObject12toThisStringEPNS_9ExecStateE
</span><span class="cx"> __ZNK3JSC12StringObject8toStringEPNS_9ExecStateE
</span><span class="lines">@@ -311,8 +313,6 @@
</span><span class="cx"> __ZNK3JSC17DebuggerCallFrame12functionNameEv
</span><span class="cx"> __ZNK3JSC17DebuggerCallFrame4typeEv
</span><span class="cx"> __ZNK3JSC17DebuggerCallFrame8evaluateERKNS_7UStringERPNS_7JSValueE
</span><del>-__ZNK3JSC19BytecodeInterpreter14retrieveCallerEPNS_9ExecStateEPNS_16InternalFunctionE
-__ZNK3JSC19BytecodeInterpreter18retrieveLastCallerEPNS_9ExecStateERiRlRNS_7UStringERPNS_7JSValueE
</del><span class="cx"> __ZNK3JSC6JSCell12toThisObjectEPNS_9ExecStateE
</span><span class="cx"> __ZNK3JSC6JSCell12toThisStringEPNS_9ExecStateE
</span><span class="cx"> __ZNK3JSC6JSCell14isGetterSetterEv
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCTIcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CTI.cpp (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CTI.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/CTI.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -119,9 +119,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(_ZN3JSC19BytecodeInterpreter12cti_vm_throwEPPv) &quot;\n&quot;
</del><ins>+    &quot;call &quot; SYMBOL_STRING(_ZN3JSC11Interpreter12cti_vm_throwEPPv) &quot;\n&quot;
</ins><span class="cx"> #else
</span><del>-    &quot;call &quot; SYMBOL_STRING(_ZN3JSC19BytecodeInterpreter12cti_vm_throwEPvz) &quot;\n&quot;
</del><ins>+    &quot;call &quot; SYMBOL_STRING(_ZN3JSC11Interpreter12cti_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">@@ -157,7 +157,7 @@
</span><span class="cx">     {
</span><span class="cx">         __asm {
</span><span class="cx">             mov ecx, esp;
</span><del>-            call JSC::BytecodeInterpreter::cti_vm_throw;
</del><ins>+            call JSC::Interpreter::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">@@ -632,7 +632,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, BytecodeInterpreter::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, Interpreter::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">@@ -641,7 +641,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, BytecodeInterpreter::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, Interpreter::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">@@ -717,7 +717,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, BytecodeInterpreter::cti_op_call_eval);
</del><ins>+        emitCTICall(instruction, i, Interpreter::cti_op_call_eval);
</ins><span class="cx">         __ cmpl_i32r(asInteger(JSImmediate::impossibleValue()), X86::eax);
</span><span class="cx">         wasEval = __ emitUnlinkedJne();
</span><span class="cx">     }
</span><span class="lines">@@ -740,7 +740,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, BytecodeInterpreter::cti_op_construct_JSConstruct);
</del><ins>+        emitCTICall(instruction, i, Interpreter::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">@@ -828,11 +828,11 @@
</span><span class="cx"> {
</span><span class="cx">     __ subl_i8r(1, X86::esi);
</span><span class="cx">     X86Assembler::JmpSrc skipTimeout = __ emitUnlinkedJne();
</span><del>-    emitCTICall(vPC, bytecodeIndex, BytecodeInterpreter::cti_timeout_check);
</del><ins>+    emitCTICall(vPC, bytecodeIndex, Interpreter::cti_timeout_check);
</ins><span class="cx"> 
</span><span class="cx">     emitGetCTIParam(CTI_ARGS_globalData, X86::ecx);
</span><span class="cx">     __ movl_mr(OBJECT_OFFSET(JSGlobalData, interpreter), X86::ecx, X86::ecx);
</span><del>-    __ movl_mr(OBJECT_OFFSET(BytecodeInterpreter, m_ticksUntilNextTimeoutCheck), X86::ecx, X86::esi);
</del><ins>+    __ movl_mr(OBJECT_OFFSET(Interpreter, m_ticksUntilNextTimeoutCheck), X86::ecx, X86::esi);
</ins><span class="cx">     __ link(skipTimeout, __ label());
</span><span class="cx"> 
</span><span class="cx">     killLastResultRegister();
</span><span class="lines">@@ -1067,12 +1067,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, BytecodeInterpreter::cti_op_add);
</del><ins>+        emitCTICall(vPC, i, Interpreter::cti_op_add);
</ins><span class="cx">     else if (opcodeID == op_sub)
</span><del>-        emitCTICall(vPC, i, BytecodeInterpreter::cti_op_sub);
</del><ins>+        emitCTICall(vPC, i, Interpreter::cti_op_sub);
</ins><span class="cx">     else {
</span><span class="cx">         ASSERT(opcodeID == op_mul);
</span><del>-        emitCTICall(vPC, i, BytecodeInterpreter::cti_op_mul);
</del><ins>+        emitCTICall(vPC, i, Interpreter::cti_op_mul);
</ins><span class="cx">     }
</span><span class="cx">     emitPutVirtualRegister(dst);
</span><span class="cx"> }
</span><span class="lines">@@ -1130,7 +1130,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, BytecodeInterpreter::cti_op_add);
</del><ins>+                    emitCTICall(instruction + i, i, Interpreter::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">@@ -1140,7 +1140,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, BytecodeInterpreter::cti_op_end);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_end);
</ins><span class="cx">             emitGetVirtualRegister(instruction[i + 1].u.operand, X86::eax, i);
</span><span class="cx">             __ pushl_m(RegisterFile::ReturnPC * static_cast&lt;int&gt;(sizeof(Register)), X86::edi);
</span><span class="cx">             __ ret();
</span><span class="lines">@@ -1212,7 +1212,7 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         case op_new_object: {
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_new_object);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1342,7 +1342,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, BytecodeInterpreter::cti_op_del_by_id);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1381,7 +1381,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, BytecodeInterpreter::cti_op_new_func);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1437,19 +1437,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, BytecodeInterpreter::cti_op_tear_off_activation);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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, BytecodeInterpreter::cti_op_tear_off_arguments);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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, BytecodeInterpreter::cti_op_ret_scopeChain);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::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">@@ -1471,7 +1471,7 @@
</span><span class="cx">             __ 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, BytecodeInterpreter::cti_op_new_array);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1479,7 +1479,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, BytecodeInterpreter::cti_op_resolve);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1524,7 +1524,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, BytecodeInterpreter::cti_op_resolve_func);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1588,7 +1588,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, BytecodeInterpreter::cti_op_resolve_base);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1613,7 +1613,7 @@
</span><span class="cx">                 __ link(overflow, __ label());
</span><span class="cx">                 __ link(notImmediate, __ label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(instruction[i + 2].u.operand, 0, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_negate);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::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">@@ -1647,7 +1647,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, BytecodeInterpreter::cti_op_resolve_skip);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1677,7 +1677,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, BytecodeInterpreter::cti_op_resolve_global);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_resolve_global);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             __ link(end, __ label());
</span><span class="cx">             i += 6;
</span><span class="lines">@@ -1903,7 +1903,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, BytecodeInterpreter::cti_op_resolve_with_base);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1912,7 +1912,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, BytecodeInterpreter::cti_op_new_func_exp);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -1989,7 +1989,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, BytecodeInterpreter::cti_op_new_regexp);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2004,7 +2004,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, BytecodeInterpreter::cti_op_throw);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_throw);
</ins><span class="cx">             __ addl_i8r(0x20, X86::esp);
</span><span class="cx">             __ popl_r(X86::ebx);
</span><span class="cx">             __ popl_r(X86::edi);
</span><span class="lines">@@ -2015,7 +2015,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, BytecodeInterpreter::cti_op_get_pnames);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2023,7 +2023,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, BytecodeInterpreter::cti_op_next_pname);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_next_pname);
</ins><span class="cx">             __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">             X86Assembler::JmpSrc endOfIter = __ emitUnlinkedJe();
</span><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="lines">@@ -2034,12 +2034,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, BytecodeInterpreter::cti_op_push_scope);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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, BytecodeInterpreter::cti_op_pop_scope);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_pop_scope);
</ins><span class="cx">             i += 1;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2083,7 +2083,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, BytecodeInterpreter::cti_op_in);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2092,7 +2092,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, BytecodeInterpreter::cti_op_push_new_scope);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2106,7 +2106,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, BytecodeInterpreter::cti_op_jmp_scopes);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_jmp_scopes);
</ins><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             m_jmpTable.append(JmpTable(__ emitUnlinkedJmp(), i + 2 + target));
</span><span class="cx">             i += 3;
</span><span class="lines">@@ -2116,7 +2116,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, BytecodeInterpreter::cti_op_put_by_index);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_put_by_index);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2132,7 +2132,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, BytecodeInterpreter::cti_op_switch_imm);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_switch_imm);
</ins><span class="cx">             __ jmp_r(X86::eax);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2149,7 +2149,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, BytecodeInterpreter::cti_op_switch_char);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_switch_char);
</ins><span class="cx">             __ jmp_r(X86::eax);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2165,7 +2165,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, BytecodeInterpreter::cti_op_switch_string);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_switch_string);
</ins><span class="cx">             __ jmp_r(X86::eax);
</span><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="lines">@@ -2173,7 +2173,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, BytecodeInterpreter::cti_op_del_by_val);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2183,7 +2183,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, BytecodeInterpreter::cti_op_put_getter);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_put_getter);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2192,7 +2192,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, BytecodeInterpreter::cti_op_put_setter);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_put_setter);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2201,7 +2201,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, BytecodeInterpreter::cti_op_new_error);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2210,7 +2210,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, BytecodeInterpreter::cti_op_debug);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_debug);
</ins><span class="cx">             i += 4;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2293,14 +2293,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, BytecodeInterpreter::cti_op_push_activation);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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) ? BytecodeInterpreter::cti_op_create_arguments_no_params : BytecodeInterpreter::cti_op_create_arguments);
</del><ins>+            emitCTICall(instruction + i, i, (m_codeBlock-&gt;numParameters == 1) ? Interpreter::cti_op_create_arguments_no_params : Interpreter::cti_op_create_arguments);
</ins><span class="cx">             i += 1;
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="lines">@@ -2320,7 +2320,7 @@
</span><span class="cx">             __ cmpl_i32m(0, X86::eax);
</span><span class="cx">             X86Assembler::JmpSrc noProfiler = __ emitUnlinkedJe();
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::eax);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_profile_will_call);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_profile_will_call);
</ins><span class="cx">             __ link(noProfiler, __ label());
</span><span class="cx"> 
</span><span class="cx">             i += 2;
</span><span class="lines">@@ -2331,7 +2331,7 @@
</span><span class="cx">             __ cmpl_i32m(0, X86::eax);
</span><span class="cx">             X86Assembler::JmpSrc noProfiler = __ emitUnlinkedJe();
</span><span class="cx">             emitPutCTIArgFromVirtualRegister(instruction[i + 1].u.operand, 0, X86::eax);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_profile_did_call);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_profile_did_call);
</ins><span class="cx">             __ link(noProfiler, __ label());
</span><span class="cx"> 
</span><span class="cx">             i += 2;
</span><span class="lines">@@ -2368,7 +2368,7 @@
</span><span class="cx">         __ link(iter-&gt;from, __ 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, BytecodeInterpreter::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, Interpreter::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">@@ -2380,7 +2380,7 @@
</span><span class="cx">         __ link((++iter)-&gt;from, __ 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, BytecodeInterpreter::cti_##name); \
</del><ins>+        emitCTICall(instruction + i, i, Interpreter::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">@@ -2406,7 +2406,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             __ link((++iter)-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_convert_this);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2422,7 +2422,7 @@
</span><span class="cx">                 __ link(notImm, __ label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArg(X86::eax, 4);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_add);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::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">@@ -2431,7 +2431,7 @@
</span><span class="cx">                 __ link(notImm, __ label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_add);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::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">@@ -2455,7 +2455,7 @@
</span><span class="cx">             __ link(notImm, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_get_by_val);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_get_by_val);
</ins><span class="cx">             emitPutVirtualRegister(instruction[i + 1].u.operand);
</span><span class="cx">             __ link(__ emitUnlinkedJmp(), m_labels[i + 4]);
</span><span class="cx"> 
</span><span class="lines">@@ -2492,7 +2492,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, BytecodeInterpreter::cti_op_negate);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2502,7 +2502,7 @@
</span><span class="cx">             __ link((++iter)-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_rshift);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2516,7 +2516,7 @@
</span><span class="cx">             __ link(notImm2, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_lshift);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2530,7 +2530,7 @@
</span><span class="cx">                 __ link(iter-&gt;from, __ 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, BytecodeInterpreter::cti_op_loop_if_less);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_loop_if_less);
</ins><span class="cx">                 __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 __ link(__ emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             } else {
</span><span class="lines">@@ -2538,7 +2538,7 @@
</span><span class="cx">                 __ link((++iter)-&gt;from, __ label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_loop_if_less);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_loop_if_less);
</ins><span class="cx">                 __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 __ link(__ emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             }
</span><span class="lines">@@ -2554,7 +2554,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, BytecodeInterpreter::cti_op_put_by_id);
</del><ins>+            X86Assembler::JmpSrc call = emitCTICall(instruction + i, i, Interpreter::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].bytecodeIndex == i);
</span><span class="lines">@@ -2581,7 +2581,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, BytecodeInterpreter::cti_op_get_by_id);
</del><ins>+            X86Assembler::JmpSrc call = emitCTICall(instruction + i, i, Interpreter::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">@@ -2602,7 +2602,7 @@
</span><span class="cx">                 __ link(iter-&gt;from, __ 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, BytecodeInterpreter::cti_op_loop_if_lesseq);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_loop_if_lesseq);
</ins><span class="cx">                 __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 __ link(__ emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             } else {
</span><span class="lines">@@ -2610,7 +2610,7 @@
</span><span class="cx">                 __ link((++iter)-&gt;from, __ label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_loop_if_lesseq);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_loop_if_lesseq);
</ins><span class="cx">                 __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 __ link(__ emitUnlinkedJne(), m_labels[i + 3 + target]);
</span><span class="cx">             }
</span><span class="lines">@@ -2624,7 +2624,7 @@
</span><span class="cx">             __ subl_i8r(getDeTaggedConstantImmediate(JSImmediate::oneImmediate()), X86::eax);
</span><span class="cx">             __ link(notImm, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_pre_inc);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2640,7 +2640,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, BytecodeInterpreter::cti_op_put_by_val);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_put_by_val);
</ins><span class="cx">             __ link(__ 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">@@ -2650,7 +2650,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, BytecodeInterpreter::cti_op_put_by_val_array);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2660,7 +2660,7 @@
</span><span class="cx"> 
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jtrue);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_jtrue);
</ins><span class="cx">             __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             __ link(__ emitUnlinkedJne(), m_labels[i + 2 + target]);
</span><span class="lines">@@ -2674,7 +2674,7 @@
</span><span class="cx">             __ addl_i8r(getDeTaggedConstantImmediate(JSImmediate::oneImmediate()), X86::eax);
</span><span class="cx">             __ link(notImm, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_pre_dec);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2686,7 +2686,7 @@
</span><span class="cx">                 __ link(iter-&gt;from, __ 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, BytecodeInterpreter::cti_op_jless);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_jless);
</ins><span class="cx">                 __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 __ link(__ emitUnlinkedJe(), m_labels[i + 3 + target]);
</span><span class="cx">             } else {
</span><span class="lines">@@ -2694,7 +2694,7 @@
</span><span class="cx">                 __ link((++iter)-&gt;from, __ label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jless);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_jless);
</ins><span class="cx">                 __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">                 __ link(__ emitUnlinkedJe(), m_labels[i + 3 + target]);
</span><span class="cx">             }
</span><span class="lines">@@ -2705,7 +2705,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             __ xorl_i8r(JSImmediate::FullTagTypeBool, X86::eax);
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_not);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2713,7 +2713,7 @@
</span><span class="cx">         case op_jfalse: {
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jtrue);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_jtrue);
</ins><span class="cx">             __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             __ link(__ emitUnlinkedJe(), m_labels[i + 2 + target]); // inverted!
</span><span class="lines">@@ -2725,7 +2725,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             __ link((++iter)-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_post_inc);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2734,7 +2734,7 @@
</span><span class="cx">         case op_bitnot: {
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitnot);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2747,19 +2747,19 @@
</span><span class="cx">                 __ link(iter-&gt;from, __ label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArg(X86::eax, 4);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitand);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_bitand);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else if (getConstantImmediateNumericArg(src2)) {
</span><span class="cx">                 __ link(iter-&gt;from, __ label());
</span><span class="cx">                 emitPutCTIArg(X86::eax, 0);
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src2, 4, X86::ecx);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitand);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_bitand);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             } else {
</span><span class="cx">                 __ link(iter-&gt;from, __ label());
</span><span class="cx">                 emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);
</span><span class="cx">                 emitPutCTIArg(X86::edx, 4);
</span><del>-                emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitand);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::cti_op_bitand);
</ins><span class="cx">                 emitPutVirtualRegister(dst);
</span><span class="cx">             }
</span><span class="cx">             i += 5;
</span><span class="lines">@@ -2768,7 +2768,7 @@
</span><span class="cx">         case op_jtrue: {
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_jtrue);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::cti_op_jtrue);
</ins><span class="cx">             __ testl_rr(X86::eax, X86::eax);
</span><span class="cx">             unsigned target = instruction[i + 2].u.operand;
</span><span class="cx">             __ link(__ emitUnlinkedJne(), m_labels[i + 2 + target]);
</span><span class="lines">@@ -2780,7 +2780,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             __ link((++iter)-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_post_dec);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2790,7 +2790,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitxor);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2799,7 +2799,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_bitor);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2808,7 +2808,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_eq);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2817,7 +2817,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::edx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_neq);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2831,7 +2831,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, BytecodeInterpreter::cti_op_instanceof);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2846,7 +2846,7 @@
</span><span class="cx">             __ link(notImm2, __ label());
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><span class="cx">             emitPutCTIArg(X86::ecx, 4);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_mod);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -2864,7 +2864,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, BytecodeInterpreter::cti_op_mul);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::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">                 __ link(iter-&gt;from, __ label());
</span><span class="lines">@@ -2872,7 +2872,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, BytecodeInterpreter::cti_op_mul);
</del><ins>+                emitCTICall(instruction + i, i, Interpreter::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">@@ -2904,7 +2904,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, BytecodeInterpreter::cti_op_construct_JSConstruct);
</del><ins>+                emitCTICall(instruction, i, Interpreter::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">@@ -2940,7 +2940,7 @@
</span><span class="cx">             __ link(isNotObject, notJSFunctionlabel);
</span><span class="cx">             __ link(callLinkFailNotObject, notJSFunctionlabel);
</span><span class="cx">             __ link(callLinkFailNotJSFunction, notJSFunctionlabel);
</span><del>-            emitCTICall(instruction + i, i, ((opcodeID == op_construct) ? BytecodeInterpreter::cti_op_construct_NotJSConstruct : BytecodeInterpreter::cti_op_call_NotJSFunction));
</del><ins>+            emitCTICall(instruction + i, i, ((opcodeID == op_construct) ? Interpreter::cti_op_construct_NotJSConstruct : Interpreter::cti_op_call_NotJSFunction));
</ins><span class="cx">             X86Assembler::JmpSrc wasNotJSFunction = __ emitUnlinkedJmp();
</span><span class="cx"> 
</span><span class="cx">             // Next, handle JSFunctions...
</span><span class="lines">@@ -2948,7 +2948,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, BytecodeInterpreter::cti_op_construct_JSConstruct);
</del><ins>+                emitCTICall(instruction, i, Interpreter::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">@@ -2980,7 +2980,7 @@
</span><span class="cx">             __ link(iter-&gt;from, __ label());
</span><span class="cx"> 
</span><span class="cx">             emitPutCTIArg(X86::eax, 0);
</span><del>-            emitCTICall(instruction + i, i, BytecodeInterpreter::cti_op_to_jsnumber);
</del><ins>+            emitCTICall(instruction + i, i, Interpreter::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">@@ -3034,7 +3034,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_codeBlock-&gt;codeType == FunctionCode) {
</span><span class="cx">         __ link(slowRegisterFileCheck, __ label());
</span><del>-        emitCTICall(m_codeBlock-&gt;instructions.begin(), 0, BytecodeInterpreter::cti_register_file_check);
</del><ins>+        emitCTICall(m_codeBlock-&gt;instructions.begin(), 0, Interpreter::cti_register_file_check);
</ins><span class="cx">         X86Assembler::JmpSrc backToBody = __ emitUnlinkedJmp();
</span><span class="cx">         __ link(backToBody, afterRegisterFileCheck);
</span><span class="cx">     }
</span><span class="lines">@@ -3117,8 +3117,8 @@
</span><span class="cx">     void* code = __ copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><del>-    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));
</del><ins>+    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(Interpreter::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">@@ -3131,7 +3131,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;(BytecodeInterpreter::cti_op_get_by_id_fail));
</del><ins>+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Interpreter::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 Structure that is
</span><span class="cx">     // referencing the prototype object - let's speculatively load it's table nice and early!)
</span><span class="lines">@@ -3201,9 +3201,9 @@
</span><span class="cx">     void* code = __ copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><del>-    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));
</del><ins>+    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, failureCases3, reinterpret_cast&lt;void*&gt;(Interpreter::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">@@ -3248,7 +3248,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;(BytecodeInterpreter::cti_op_get_by_id_fail));
</del><ins>+        X86Assembler::link(code, bucketsOfFail[i], reinterpret_cast&lt;void*&gt;(Interpreter::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">@@ -3271,8 +3271,8 @@
</span><span class="cx">     void* code = __ copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx">     
</span><del>-    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));
</del><ins>+    X86Assembler::link(code, failureCases1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_put_by_id_fail));
+    X86Assembler::link(code, failureCases2, reinterpret_cast&lt;void*&gt;(Interpreter::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">@@ -3368,7 +3368,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;(BytecodeInterpreter::cti_op_put_by_id_fail));
</del><ins>+        X86Assembler::link(code, failureJump, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_put_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     if (transitionWillNeedStorageRealloc(oldStructure, newStructure))
</span><span class="cx">         X86Assembler::link(code, callTarget, reinterpret_cast&lt;void*&gt;(resizePropertyStorage));
</span><span class="lines">@@ -3572,20 +3572,20 @@
</span><span class="cx">     void* code = __ copy();
</span><span class="cx">     ASSERT(code);
</span><span class="cx"> 
</span><del>-    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));
</del><ins>+    X86Assembler::link(code, array_failureCases1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, array_failureCases2, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, array_failureCases3, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases2, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, string_failureCases3, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
+    X86Assembler::link(code, callArityCheck1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_call_arityCheck));
+    X86Assembler::link(code, callArityCheck2, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_call_arityCheck));
+    X86Assembler::link(code, callArityCheck3, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_call_arityCheck));
+    X86Assembler::link(code, callJSFunction1, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_call_JSFunction));
+    X86Assembler::link(code, callJSFunction2, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_call_JSFunction));
+    X86Assembler::link(code, callJSFunction3, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_call_JSFunction));
+    X86Assembler::link(code, callDontLazyLinkCall, reinterpret_cast&lt;void*&gt;(Interpreter::cti_vm_dontLazyLinkCall));
+    X86Assembler::link(code, callLazyLinkCall, reinterpret_cast&lt;void*&gt;(Interpreter::cti_vm_lazyLinkCall));
</ins><span class="cx"> 
</span><span class="cx">     m_interpreter-&gt;m_ctiArrayLengthTrampoline = code;
</span><span class="cx">     m_interpreter-&gt;m_ctiStringLengthTrampoline = X86Assembler::getRelocatedAddress(code, stringLengthBegin);
</span><span class="lines">@@ -3594,7 +3594,7 @@
</span><span class="cx">     m_interpreter-&gt;m_ctiVirtualCall = X86Assembler::getRelocatedAddress(code, virtualCallBegin);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CTI::freeCTIMachineTrampolines(BytecodeInterpreter* interpreter)
</del><ins>+void CTI::freeCTIMachineTrampolines(Interpreter* interpreter)
</ins><span class="cx"> {
</span><span class="cx">     WTF::fastFreeExecutable(interpreter-&gt;m_ctiArrayLengthTrampoline);
</span><span class="cx"> }
</span><span class="lines">@@ -3604,8 +3604,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 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));
</del><ins>+    // Should probably go to Interpreter::cti_op_get_by_id_fail, but that doesn't do anything interesting right now.
+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Interpreter::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 Structure 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">@@ -3617,8 +3617,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 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));
</del><ins>+    // Should probably go to Interpreter::cti_op_put_by_id_fail, but that doesn't do anything interesting right now.
+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Interpreter::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 Structure 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">@@ -3630,7 +3630,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;(BytecodeInterpreter::cti_op_get_by_id_fail));
</del><ins>+    ctiRepatchCallByReturnAddress(returnAddress, reinterpret_cast&lt;void*&gt;(Interpreter::cti_op_get_by_id_fail));
</ins><span class="cx"> 
</span><span class="cx">     // Check eax is an array
</span><span class="cx">     __ testl_i32r(JSImmediate::TagMask, X86::eax);
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCTIh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CTI.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CTI.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/CTI.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+    class Interpreter;
</ins><span class="cx">     class Register;
</span><span class="cx">     class RegisterFile;
</span><span class="cx">     class ScopeChainNode;
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx">             CTI cti(globalData);
</span><span class="cx">             cti.privateCompileCTIMachineTrampolines();
</span><span class="cx">         }
</span><del>-        static void freeCTIMachineTrampolines(BytecodeInterpreter*);
</del><ins>+        static void freeCTIMachineTrampolines(Interpreter*);
</ins><span class="cx"> 
</span><span class="cx">         static void patchGetByIdSelf(CodeBlock* codeBlock, Structure* structure, size_t cachedOffset, void* returnAddress);
</span><span class="cx">         static void patchPutByIdReplace(CodeBlock* codeBlock, Structure* structure, size_t cachedOffset, void* returnAddress);
</span><span class="lines">@@ -433,7 +433,7 @@
</span><span class="cx">         void killLastResultRegister();
</span><span class="cx"> 
</span><span class="cx">         X86Assembler m_assembler;
</span><del>-        BytecodeInterpreter* m_interpreter;
</del><ins>+        Interpreter* 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 (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CodeBlock.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/CodeBlock.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::printStructures(const Instruction* vPC) const
</span><span class="cx"> {
</span><del>-    BytecodeInterpreter* interpreter = globalData-&gt;interpreter;
</del><ins>+    Interpreter* interpreter = globalData-&gt;interpreter;
</ins><span class="cx">     unsigned instructionOffset = vPC - instructions.begin();
</span><span class="cx"> 
</span><span class="cx">     if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id)) {
</span><span class="lines">@@ -988,7 +988,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::derefStructures(Instruction* vPC) const
</span><span class="cx"> {
</span><del>-    BytecodeInterpreter* interpreter = globalData-&gt;interpreter;
</del><ins>+    Interpreter* interpreter = globalData-&gt;interpreter;
</ins><span class="cx"> 
</span><span class="cx">     if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_self)) {
</span><span class="cx">         vPC[4].u.structure-&gt;deref();
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeBlock::refStructures(Instruction* vPC) const
</span><span class="cx"> {
</span><del>-    BytecodeInterpreter* interpreter = globalData-&gt;interpreter;
</del><ins>+    Interpreter* interpreter = globalData-&gt;interpreter;
</ins><span class="cx"> 
</span><span class="cx">     if (vPC[0].u.opcode == interpreter-&gt;getOpcode(op_get_by_id_self)) {
</span><span class="cx">         vPC[4].u.structure-&gt;ref();
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMMachinecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/Machine.cpp (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Machine.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/Machine.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -177,7 +177,7 @@
</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>-    BytecodeInterpreter* interpreter = callFrame-&gt;interpreter();
</del><ins>+    Interpreter* interpreter = callFrame-&gt;interpreter();
</ins><span class="cx">     if (interpreter-&gt;isJSString(v1) &amp;&amp; interpreter-&gt;isJSString(v2))
</span><span class="cx">         return asString(v1)-&gt;value() &lt; asString(v2)-&gt;value();
</span><span class="cx"> 
</span><span class="lines">@@ -202,7 +202,7 @@
</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>-    BytecodeInterpreter* interpreter = callFrame-&gt;interpreter();
</del><ins>+    Interpreter* interpreter = callFrame-&gt;interpreter();
</ins><span class="cx">     if (interpreter-&gt;isJSString(v1) &amp;&amp; interpreter-&gt;isJSString(v2))
</span><span class="cx">         return !(asString(v2)-&gt;value() &lt; asString(v1)-&gt;value());
</span><span class="cx"> 
</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 BytecodeInterpreter::resolve(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool Interpreter::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 BytecodeInterpreter::resolveSkip(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool Interpreter::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 BytecodeInterpreter::resolveGlobal(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool Interpreter::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 BytecodeInterpreter::resolveBase(CallFrame* callFrame, Instruction* vPC)
</del><ins>+NEVER_INLINE void Interpreter::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 BytecodeInterpreter::resolveBaseAndProperty(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool Interpreter::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 BytecodeInterpreter::resolveBaseAndFunc(CallFrame* callFrame, Instruction* vPC, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE bool Interpreter::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* BytecodeInterpreter::slideRegisterWindowForCall(CodeBlock* newCodeBlock, RegisterFile* registerFile, CallFrame* callFrame, size_t registerOffset, int argc)
</del><ins>+ALWAYS_INLINE CallFrame* Interpreter::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* BytecodeInterpreter::callEval(CallFrame* callFrame, RegisterFile* registerFile, Register* argv, int argc, int registerOffset, JSValue*&amp; exceptionValue)
</del><ins>+NEVER_INLINE JSValue* Interpreter::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">@@ -603,7 +603,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-BytecodeInterpreter::BytecodeInterpreter()
</del><ins>+Interpreter::Interpreter()
</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 BytecodeInterpreter::initialize(JSGlobalData* globalData)
</del><ins>+void Interpreter::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>-BytecodeInterpreter::~BytecodeInterpreter()
</del><ins>+Interpreter::~Interpreter()
</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 BytecodeInterpreter::dumpCallFrame(CallFrame* callFrame)
</del><ins>+void Interpreter::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 BytecodeInterpreter::dumpRegisters(CallFrame* callFrame)
</del><ins>+void Interpreter::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">@@ -743,7 +743,7 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-bool BytecodeInterpreter::isOpcode(Opcode opcode)
</del><ins>+bool Interpreter::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 BytecodeInterpreter::unwindCallFrame(CallFrame*&amp; callFrame, JSValue* exceptionValue, const Instruction*&amp; vPC, CodeBlock*&amp; codeBlock)
</del><ins>+NEVER_INLINE bool Interpreter::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* BytecodeInterpreter::throwException(CallFrame*&amp; callFrame, JSValue*&amp; exceptionValue, const Instruction* vPC, bool explicitThrow)
</del><ins>+NEVER_INLINE Instruction* Interpreter::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* BytecodeInterpreter::execute(ProgramNode* programNode, CallFrame* callFrame, ScopeChainNode* scopeChain, JSObject* thisObj, JSValue** exception)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::execute(FunctionBodyNode* functionBodyNode, CallFrame* callFrame, JSFunction* function, JSObject* thisObj, const ArgList&amp; args, ScopeChainNode* scopeChain, JSValue** exception)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::execute(EvalNode* evalNode, CallFrame* callFrame, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::execute(EvalNode* evalNode, CallFrame* callFrame, JSObject* thisObj, int globalRegisterOffset, ScopeChainNode* scopeChain, JSValue** exception)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::debug(CallFrame* callFrame, DebugHookID debugHookID, int firstLine, int lastLine)
</del><ins>+NEVER_INLINE void Interpreter::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 BytecodeInterpreter::resetTimeoutCheck()
</del><ins>+void Interpreter::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* BytecodeInterpreter::checkTimeout(JSGlobalObject* globalObject)
</del><ins>+ALWAYS_INLINE JSValue* Interpreter::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* BytecodeInterpreter::createExceptionScope(CallFrame* callFrame, const Instruction* vPC)
</del><ins>+NEVER_INLINE ScopeChainNode* Interpreter::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 structure-&gt;cachedPrototypeChain();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void BytecodeInterpreter::tryCachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, Instruction* vPC, JSValue* baseValue, const PutPropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void Interpreter::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;refStructures(vPC);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void BytecodeInterpreter::uncachePutByID(CodeBlock* codeBlock, Instruction* vPC)
</del><ins>+NEVER_INLINE void Interpreter::uncachePutByID(CodeBlock* codeBlock, Instruction* vPC)
</ins><span class="cx"> {
</span><span class="cx">     codeBlock-&gt;derefStructures(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 BytecodeInterpreter::tryCacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, Instruction* vPC, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void Interpreter::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;refStructures(vPC);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-NEVER_INLINE void BytecodeInterpreter::uncacheGetByID(CodeBlock* codeBlock, Instruction* vPC)
</del><ins>+NEVER_INLINE void Interpreter::uncacheGetByID(CodeBlock* codeBlock, Instruction* vPC)
</ins><span class="cx"> {
</span><span class="cx">     codeBlock-&gt;derefStructures(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* BytecodeInterpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFile, CallFrame* callFrame, JSValue** exception)
</del><ins>+JSValue* Interpreter::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">@@ -3985,7 +3985,7 @@
</span><span class="cx">     #undef CHECK_FOR_TIMEOUT
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::retrieveArguments(CallFrame* callFrame, JSFunction* function) const
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::retrieveCaller(CallFrame* callFrame, InternalFunction* function) const
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::retrieveLastCaller(CallFrame* callFrame, int&amp; lineNumber, intptr_t&amp; sourceID, UString&amp; sourceURL, JSValue*&amp; function) const
</del><ins>+void Interpreter::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* BytecodeInterpreter::findFunctionCallFrame(CallFrame* callFrame, InternalFunction* function)
</del><ins>+CallFrame* Interpreter::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 BytecodeInterpreter::tryCTICachePutByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue* baseValue, const PutPropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void Interpreter::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 BytecodeInterpreter::tryCTICacheGetByID(CallFrame* callFrame, CodeBlock* codeBlock, void* returnAddress, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp; slot)
</del><ins>+NEVER_INLINE void Interpreter::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* BytecodeInterpreter::cti_op_convert_this(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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 BytecodeInterpreter::cti_op_end(CTI_ARGS)
</del><ins>+void Interpreter::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* BytecodeInterpreter::cti_op_add(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_pre_inc(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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,7 +4422,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BytecodeInterpreter::cti_timeout_check(CTI_ARGS)
</del><ins>+void Interpreter::cti_timeout_check(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4432,7 +4432,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BytecodeInterpreter::cti_register_file_check(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_loop_if_less(CTI_ARGS)
</del><ins>+int Interpreter::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 BytecodeInterpreter::cti_op_loop_if_lesseq(CTI_ARGS)
</del><ins>+int Interpreter::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* BytecodeInterpreter::cti_op_new_object(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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 BytecodeInterpreter::cti_op_put_by_id(CTI_ARGS)
</del><ins>+void Interpreter::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,7 +4494,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BytecodeInterpreter::cti_op_put_by_id_second(CTI_ARGS)
</del><ins>+void Interpreter::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="lines">@@ -4504,7 +4504,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BytecodeInterpreter::cti_op_put_by_id_generic(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_put_by_id_fail(CTI_ARGS)
</del><ins>+void Interpreter::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* BytecodeInterpreter::cti_op_get_by_id(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_get_by_id_second(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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">@@ -4563,7 +4563,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::cti_op_get_by_id_generic(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_get_by_id_fail(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_instanceof(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_del_by_id(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_mul(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_new_func(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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* BytecodeInterpreter::cti_op_call_JSFunction(CTI_ARGS)
</del><ins>+void* Interpreter::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 BytecodeInterpreter::cti_op_call_arityCheck(CTI_ARGS)
</del><ins>+VoidPtrPair Interpreter::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* BytecodeInterpreter::cti_vm_dontLazyLinkCall(CTI_ARGS)
</del><ins>+void* Interpreter::cti_vm_dontLazyLinkCall(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -4754,7 +4754,7 @@
</span><span class="cx">     return codeBlock-&gt;ctiCode;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void* BytecodeInterpreter::cti_vm_lazyLinkCall(CTI_ARGS)
</del><ins>+void* Interpreter::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* BytecodeInterpreter::cti_op_push_activation(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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* BytecodeInterpreter::cti_op_call_NotJSFunction(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_create_arguments(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_create_arguments_no_params(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_tear_off_activation(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_tear_off_arguments(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_profile_will_call(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_profile_did_call(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_ret_scopeChain(CTI_ARGS)
</del><ins>+void Interpreter::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* BytecodeInterpreter::cti_op_new_array(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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* BytecodeInterpreter::cti_op_resolve(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_construct_JSConstruct(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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* BytecodeInterpreter::cti_op_construct_NotJSConstruct(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_get_by_val(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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>-    BytecodeInterpreter* interpreter = ARG_globalData-&gt;interpreter;
</del><ins>+    Interpreter* 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">@@ -5002,7 +5002,7 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VoidPtrPair BytecodeInterpreter::cti_op_resolve_func(CTI_ARGS)
</del><ins>+VoidPtrPair Interpreter::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* BytecodeInterpreter::cti_op_sub(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_put_by_val(CTI_ARGS)
</del><ins>+void Interpreter::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>-    BytecodeInterpreter* interpreter = ARG_globalData-&gt;interpreter;
</del><ins>+    Interpreter* 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">@@ -5098,7 +5098,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BytecodeInterpreter::cti_op_put_by_val_array(CTI_ARGS)
</del><ins>+void Interpreter::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">@@ -5124,7 +5124,7 @@
</span><span class="cx">     VM_CHECK_EXCEPTION_AT_END();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::cti_op_lesseq(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_loop_if_true(CTI_ARGS)
</del><ins>+int Interpreter::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* BytecodeInterpreter::cti_op_negate(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_resolve_base(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_resolve_skip(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_resolve_global(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_div(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_pre_dec(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_jless(CTI_ARGS)
</del><ins>+int Interpreter::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* BytecodeInterpreter::cti_op_not(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_jtrue(CTI_ARGS)
</del><ins>+int SFX_CALL Interpreter::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 BytecodeInterpreter::cti_op_post_inc(CTI_ARGS)
</del><ins>+VoidPtrPair Interpreter::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* BytecodeInterpreter::cti_op_eq(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_lshift(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_bitand(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_rshift(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_bitnot(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_resolve_with_base(CTI_ARGS)
</del><ins>+VoidPtrPair Interpreter::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* BytecodeInterpreter::cti_op_new_func_exp(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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* BytecodeInterpreter::cti_op_mod(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_less(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_neq(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_post_dec(CTI_ARGS)
</del><ins>+VoidPtrPair Interpreter::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* BytecodeInterpreter::cti_op_urshift(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_bitxor(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_new_regexp(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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* BytecodeInterpreter::cti_op_bitor(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_call_eval(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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>-    BytecodeInterpreter* interpreter = ARG_globalData-&gt;interpreter;
</del><ins>+    Interpreter* 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">@@ -5588,7 +5588,7 @@
</span><span class="cx">     return JSImmediate::impossibleValue();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::cti_op_throw(CTI_ARGS)
</del><ins>+JSValue* Interpreter::cti_op_throw(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</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* BytecodeInterpreter::cti_op_get_pnames(CTI_ARGS)
</del><ins>+JSPropertyNameIterator* Interpreter::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* BytecodeInterpreter::cti_op_next_pname(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_push_scope(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_pop_scope(CTI_ARGS)
</del><ins>+void Interpreter::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* BytecodeInterpreter::cti_op_typeof(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_is_undefined(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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;structure()-&gt;typeInfo().masqueradesAsUndefined());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::cti_op_is_boolean(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_is_number(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_is_string(CTI_ARGS)
</del><ins>+JSValue* Interpreter::cti_op_is_string(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="cx">     return jsBoolean(ARG_globalData-&gt;interpreter-&gt;isJSString(ARG_src1));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::cti_op_is_object(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_is_function(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_stricteq(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_nstricteq(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_to_jsnumber(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_in(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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* BytecodeInterpreter::cti_op_push_new_scope(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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 BytecodeInterpreter::cti_op_jmp_scopes(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_put_by_index(CTI_ARGS)
</del><ins>+void Interpreter::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* BytecodeInterpreter::cti_op_switch_imm(CTI_ARGS)
</del><ins>+void* Interpreter::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* BytecodeInterpreter::cti_op_switch_char(CTI_ARGS)
</del><ins>+void* Interpreter::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* BytecodeInterpreter::cti_op_switch_string(CTI_ARGS)
</del><ins>+void* Interpreter::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* BytecodeInterpreter::cti_op_del_by_val(CTI_ARGS)
</del><ins>+JSValue* Interpreter::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 BytecodeInterpreter::cti_op_put_getter(CTI_ARGS)
</del><ins>+void Interpreter::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 BytecodeInterpreter::cti_op_put_setter(CTI_ARGS)
</del><ins>+void Interpreter::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* BytecodeInterpreter::cti_op_new_error(CTI_ARGS)
</del><ins>+JSObject* Interpreter::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 BytecodeInterpreter::cti_op_debug(CTI_ARGS)
</del><ins>+void Interpreter::cti_op_debug(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span><span class="lines">@@ -5934,7 +5934,7 @@
</span><span class="cx">     ARG_globalData-&gt;interpreter-&gt;debug(callFrame, static_cast&lt;DebugHookID&gt;(debugHookID), firstLine, lastLine);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue* BytecodeInterpreter::cti_vm_throw(CTI_ARGS)
</del><ins>+JSValue* Interpreter::cti_vm_throw(CTI_ARGS)
</ins><span class="cx"> {
</span><span class="cx">     CTI_STACK_HACK();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMMachineh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/Machine.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Machine.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/Machine.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter {
</del><ins>+    class Interpreter {
</ins><span class="cx">         friend class CTI;
</span><span class="cx">     public:
</span><del>-        BytecodeInterpreter();
-        ~BytecodeInterpreter();
</del><ins>+        Interpreter();
+        ~Interpreter();
</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 (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Register.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/Register.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+        friend class Interpreter;
</ins><span class="cx"> 
</span><del>-        // Only CallFrame and BytecodeInterpreter should use these functions.
</del><ins>+        // Only CallFrame and Interpreter 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>-    // BytecodeInterpreter functions
</del><ins>+    // Interpreter 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="trunkJavaScriptCoreVMSamplingToolh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/SamplingTool.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/SamplingTool.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/VM/SamplingTool.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+    class Interpreter;
</ins><span class="cx">     class ScopeNode;
</span><span class="cx">     struct Instruction;
</span><span class="cx"> 
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">         };
</span><span class="cx"> #endif        
</span><span class="cx"> 
</span><del>-        SamplingTool(BytecodeInterpreter* interpreter)
</del><ins>+        SamplingTool(Interpreter* interpreter)
</ins><span class="cx">             : m_interpreter(interpreter)
</span><span class="cx">             , m_running(false)
</span><span class="cx">             , m_codeBlock(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>-        BytecodeInterpreter* m_interpreter;
</del><ins>+        Interpreter* 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 (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter::execute time.
</del><ins>+    if (m_codeType != EvalCode) { // eval code needs to hang on to its declaration stacks to keep declaration info alive until Interpreter::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,7 +236,7 @@
</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 BytecodeInterpreter::execute.
</del><ins>+    // FIXME: Move code that modifies the global object to Interpreter::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></pre></div>
<a id="trunkJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/jsc.cpp (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/jsc.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/jsc.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx">         BytecodeGenerator::setDumpsGeneratedCode(true);
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(OPCODE_SAMPLING)
</span><del>-    BytecodeInterpreter* interpreter = globalObject-&gt;globalData()-&gt;interpreter;
</del><ins>+    Interpreter* interpreter = globalObject-&gt;globalData()-&gt;interpreter;
</ins><span class="cx">     interpreter-&gt;setSampler(new SamplingTool(machine));
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecStateh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/ExecState.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/ExecState.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/runtime/ExecState.h        2008-11-17 02:21:16 UTC (rev 38464)
</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>-        BytecodeInterpreter* interpreter() { return globalData().interpreter; }
</del><ins>+        Interpreter* 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 BytecodeInterpreter;
</del><ins>+        friend class Interpreter;
</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="trunkJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSCell.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSCell.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/runtime/JSCell.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+        friend class Interpreter;
</ins><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         explicit JSCell(Structure*);
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSFunction.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSFunction.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/runtime/JSFunction.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+        friend class Interpreter;
</ins><span class="cx"> 
</span><span class="cx">         typedef InternalFunction Base;
</span><span class="cx">         JSFunction(PassRefPtr&lt;JSC::Structure&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 (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</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>-    : interpreter(new BytecodeInterpreter)
</del><ins>+    : interpreter(new Interpreter)
</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></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalDatah"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalData.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+    class Interpreter;
</ins><span class="cx">     class Parser;
</span><span class="cx">     class ParserRefCounted;
</span><span class="cx">     class Structure;
</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>-        BytecodeInterpreter* interpreter;
</del><ins>+        Interpreter* interpreter;
</ins><span class="cx"> 
</span><span class="cx">         JSValue* exception;
</span><span class="cx"> #if ENABLE(CTI)
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSString.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSString.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/runtime/JSString.h        2008-11-17 02:21:16 UTC (rev 38464)
</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 BytecodeInterpreter;
</del><ins>+        friend class Interpreter;
</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="trunkJavaScriptCorewrecWRECcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wrec/WREC.cpp (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wrec/WREC.cpp        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/wrec/WREC.cpp        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -1328,7 +1328,7 @@
</span><span class="cx"> // This limit comes from the limit set in PCRE
</span><span class="cx"> static const int MaxPatternSize = (1 &lt;&lt; 16);
</span><span class="cx"> 
</span><del>-void* compileRegExp(BytecodeInterpreter* interpreter, const UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase, bool multiline)
</del><ins>+void* compileRegExp(Interpreter* 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></pre></div>
<a id="trunkJavaScriptCorewrecWRECh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wrec/WREC.h (38463 => 38464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wrec/WREC.h        2008-11-17 02:08:54 UTC (rev 38463)
+++ trunk/JavaScriptCore/wrec/WREC.h        2008-11-17 02:21:16 UTC (rev 38464)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><del>-    class BytecodeInterpreter;
</del><ins>+    class Interpreter;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> namespace WREC {
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> 
</span><span class="cx">     typedef int (*WRECFunction)(const UChar* input, unsigned start, unsigned length, int* output) WREC_CALL;
</span><span class="cx"> 
</span><del>-    void* compileRegExp(JSC::BytecodeInterpreter*, const JSC::UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase = false, bool multiline = false);
</del><ins>+    void* compileRegExp(JSC::Interpreter*, const JSC::UString&amp; pattern, unsigned* numSubpatterns_ptr, const char** error_ptr, bool ignoreCase = false, bool multiline = false);
</ins><span class="cx"> 
</span><span class="cx">     struct Quantifier {
</span><span class="cx">         enum Type {
</span></span></pre>
</div>
</div>

</body>
</html>