<!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>[38511] trunk</title>
</head>
<body>

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

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

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

        Reviewed by Sam Weinig.
        
        Moved VM/Machine.h =&gt; interpreter/Interpreter.h

        * GNUmakefile.am:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * VM/CTI.cpp:
        * VM/CTI.h:
        * VM/ExceptionHelpers.cpp:
        * VM/Machine.cpp:
        * VM/Machine.h: Removed.
        * VM/SamplingTool.cpp:
        * bytecode/CodeBlock.cpp:
        * bytecompiler/BytecodeGenerator.cpp:
        * bytecompiler/BytecodeGenerator.h:
        * debugger/DebuggerCallFrame.cpp:
        * interpreter: Added.
        * interpreter/Interpreter.h: Copied from VM/Machine.h.
        * profiler/ProfileGenerator.cpp:
        * runtime/Arguments.h:
        * runtime/ArrayPrototype.cpp:
        * runtime/Collector.cpp:
        * runtime/Completion.cpp:
        * runtime/ExecState.h:
        * runtime/FunctionPrototype.cpp:
        * runtime/JSActivation.cpp:
        * runtime/JSFunction.cpp:
        * runtime/JSGlobalData.cpp:
        * runtime/JSGlobalObject.cpp:
        * runtime/JSGlobalObjectFunctions.cpp:
        * wrec/WREC.cpp:

WebCore:

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

        Reviewed by Sam Weinig.
        
        Updated for JavaScriptCore renames.

        * ForwardingHeaders/VM: Removed.
        * ForwardingHeaders/VM/Machine.h: Removed.
        * ForwardingHeaders/interpreter: Added.
        * ForwardingHeaders/interpreter/Interpreter.h: Copied from ForwardingHeaders/VM/Machine.h.
        * WebCore.pro:
        * bindings/js/JSXMLHttpRequestCustom.cpp:
        * page/Console.cpp:
        * webcore-base.bkl:

WebKit/wx:

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

        Reviewed by Sam Weinig.
        
        Updated for JavaScriptCore renames.

        * presets/wxwebkit.bkl:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCoreGNUmakefileam">trunk/JavaScriptCore/GNUmakefile.am</a></li>
<li><a href="#trunkJavaScriptCoreJavaScriptCorevcprojJavaScriptCoreJavaScriptCorevcproj">trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj</a></li>
<li><a href="#trunkJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</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="#trunkJavaScriptCoreVMExceptionHelperscpp">trunk/JavaScriptCore/VM/ExceptionHelpers.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMMachinecpp">trunk/JavaScriptCore/VM/Machine.cpp</a></li>
<li><a href="#trunkJavaScriptCoreVMSamplingToolcpp">trunk/JavaScriptCore/VM/SamplingTool.cpp</a></li>
<li><a href="#trunkJavaScriptCorebytecodeCodeBlockcpp">trunk/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkJavaScriptCorejscorebkl">trunk/JavaScriptCore/jscore.bkl</a></li>
<li><a href="#trunkJavaScriptCoreprofilerProfileGeneratorcpp">trunk/JavaScriptCore/profiler/ProfileGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeArgumentsh">trunk/JavaScriptCore/runtime/Arguments.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeArrayPrototypecpp">trunk/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeCollectorcpp">trunk/JavaScriptCore/runtime/Collector.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeCompletioncpp">trunk/JavaScriptCore/runtime/Completion.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecStateh">trunk/JavaScriptCore/runtime/ExecState.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeFunctionPrototypecpp">trunk/JavaScriptCore/runtime/FunctionPrototype.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSActivationcpp">trunk/JavaScriptCore/runtime/JSActivation.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSFunctioncpp">trunk/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalDatacpp">trunk/JavaScriptCore/runtime/JSGlobalData.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkJavaScriptCorewrecWRECcpp">trunk/JavaScriptCore/wrec/WREC.cpp</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCorepro">trunk/WebCore/WebCore.pro</a></li>
<li><a href="#trunkWebCorebindingsjsJSXMLHttpRequestCustomcpp">trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp</a></li>
<li><a href="#trunkWebCorepageConsolecpp">trunk/WebCore/page/Console.cpp</a></li>
<li><a href="#trunkWebCorewebcorebasebkl">trunk/WebCore/webcore-base.bkl</a></li>
<li><a href="#trunkWebKitwxChangeLog">trunk/WebKit/wx/ChangeLog</a></li>
<li><a href="#trunkWebKitwxpresetswxwebkitbkl">trunk/WebKit/wx/presets/wxwebkit.bkl</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/JavaScriptCore/interpreter/</li>
<li><a href="#trunkJavaScriptCoreinterpreterInterpreterh">trunk/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li>trunk/WebCore/ForwardingHeaders/interpreter/</li>
<li><a href="#trunkWebCoreForwardingHeadersinterpreterInterpreterh">trunk/WebCore/ForwardingHeaders/interpreter/Interpreter.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreVMMachineh">trunk/JavaScriptCore/VM/Machine.h</a></li>
<li>trunk/WebCore/ForwardingHeaders/VM/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/ChangeLog        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -2,6 +2,41 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><span class="cx">         
</span><ins>+        Moved VM/Machine.h =&gt; interpreter/Interpreter.h
+
+        * GNUmakefile.am:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * VM/CTI.cpp:
+        * VM/CTI.h:
+        * VM/ExceptionHelpers.cpp:
+        * VM/Machine.cpp:
+        * VM/Machine.h: Removed.
+        * VM/SamplingTool.cpp:
+        * bytecode/CodeBlock.cpp:
+        * bytecompiler/BytecodeGenerator.cpp:
+        * bytecompiler/BytecodeGenerator.h:
+        * debugger/DebuggerCallFrame.cpp:
+        * interpreter: Added.
+        * interpreter/Interpreter.h: Copied from VM/Machine.h.
+        * profiler/ProfileGenerator.cpp:
+        * runtime/Arguments.h:
+        * runtime/ArrayPrototype.cpp:
+        * runtime/Collector.cpp:
+        * runtime/Completion.cpp:
+        * runtime/ExecState.h:
+        * runtime/FunctionPrototype.cpp:
+        * runtime/JSActivation.cpp:
+        * runtime/JSFunction.cpp:
+        * runtime/JSGlobalData.cpp:
+        * runtime/JSGlobalObject.cpp:
+        * runtime/JSGlobalObjectFunctions.cpp:
+        * wrec/WREC.cpp:
+
+2008-11-17  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+        
</ins><span class="cx">         Moved runtime/Interpreter.cpp =&gt; runtime/Completion.cpp.
</span><span class="cx"> 
</span><span class="cx">         Moved functions from Interpreter.h to Completion.h, and removed
</span></span></pre></div>
<a id="trunkJavaScriptCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/GNUmakefile.am (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/GNUmakefile.am        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/GNUmakefile.am        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">         -I$(srcdir)/JavaScriptCore/API \
</span><span class="cx">         -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
</span><span class="cx">         -I$(srcdir)/JavaScriptCore/VM \
</span><ins>+        -I$(srcdir)/JavaScriptCore/interpreter \
</ins><span class="cx">         -I$(srcdir)/JavaScriptCore/bytecode \
</span><span class="cx">         -I$(srcdir)/JavaScriptCore/bytecompiler \
</span><span class="cx">         -I$(srcdir)/JavaScriptCore/debugger \
</span><span class="lines">@@ -81,7 +82,7 @@
</span><span class="cx">         JavaScriptCore/bytecode/Instruction.h \
</span><span class="cx">         JavaScriptCore/bytecompiler/Label.h \
</span><span class="cx">         JavaScriptCore/VM/Machine.cpp \
</span><del>-        JavaScriptCore/VM/Machine.h \
</del><ins>+        JavaScriptCore/interpreter/Interpreter.h \
</ins><span class="cx">         JavaScriptCore/bytecode/Opcode.cpp \
</span><span class="cx">         JavaScriptCore/bytecode/Opcode.h \
</span><span class="cx">         JavaScriptCore/VM/Register.h \
</span></span></pre></div>
<a id="trunkJavaScriptCoreJavaScriptCorevcprojJavaScriptCoreJavaScriptCorevcproj"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -1286,7 +1286,7 @@
</span><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span><del>-                                RelativePath=&quot;..\..\VM\Machine.h&quot;
</del><ins>+                                RelativePath=&quot;..\..\interpreter\Interpreter.h&quot;
</ins><span class="cx">                                 &gt;
</span><span class="cx">                         &lt;/File&gt;
</span><span class="cx">                         &lt;File
</span></span></pre></div>
<a id="trunkJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">                 141211310A48794D00480255 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
</span><span class="cx">                 141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBXBuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; };
</span><span class="cx">                 1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; };
</span><ins>+                1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1429D77B0ED20D7300B89619 /* Interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx">                 143A97E60A4A06E200456B66 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
</span><span class="cx">                 1440057F0A5335640005F061 /* JSNode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1440F6420A4F8B6A0005F061 /* JSNode.c */; };
</span><span class="cx">                 144005CB0A5338D10005F061 /* JSNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1440F6410A4F8B6A0005F061 /* JSNode.h */; };
</span><span class="lines">@@ -213,7 +214,6 @@
</span><span class="cx">                 BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 148A1626095D16BB00666D0D /* ListRefPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 BC18C4360E16F5CD00B34460 /* Locker.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE79270D6C964500FEA3BA /* Locker.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 BC18C4370E16F5CD00B34460 /* Lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8690255597D01FF60F7 /* Lookup.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-                BC18C4380E16F5CD00B34460 /* Machine.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B15E60D81F986009CB8C7 /* Machine.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">                 BC18C4390E16F5CD00B34460 /* MainThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D358A30DAAD9C4003B174E /* MainThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 BC18C43A0E16F5CD00B34460 /* MallocZoneSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */; };
</span><span class="cx">                 BC18C43B0E16F5CD00B34460 /* MathExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF6553B0A2048DE0038A194 /* MathExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -393,6 +393,7 @@
</span><span class="cx">                 1419D32C0CEA7CDE00FF507A /* RefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounted.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBase.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                1429D77B0ED20D7300B89619 /* Interpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 1440051F0A531D3B0005F061 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = tests/Node.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 144005200A531D3B0005F061 /* Node.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Node.c; path = tests/Node.c; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 144007480A536CC20005F061 /* NodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeList.h; path = tests/NodeList.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -424,7 +425,6 @@
</span><span class="cx">                 148A1626095D16BB00666D0D /* ListRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ListRefPtr.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 148A1ECD0D10C23B0069A47C /* RefPtrHashMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefPtrHashMap.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 149559ED0DDCDDF700648087 /* DebuggerCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerCallFrame.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                149B15E60D81F986009CB8C7 /* Machine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Machine.h; path = VM/Machine.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 149B15E70D81F986009CB8C7 /* Machine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Machine.cpp; path = VM/Machine.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 149B24FF0D8AF6D1009CB8C7 /* Register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Register.h; path = VM/Register.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolTable.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -828,6 +828,7 @@
</span><span class="cx">                                 969A078F0ED1D3AE00F1F681 /* bytecode */,
</span><span class="cx">                                 7E39D81D0EC38EFA003AF11A /* bytecompiler */,
</span><span class="cx">                                 1480DB9A0DDC2231003CFDF2 /* debugger */,
</span><ins>+                                1429D77A0ED20D7300B89619 /* interpreter */,
</ins><span class="cx">                                 7E39D8370EC3A388003AF11A /* parser */,
</span><span class="cx">                                 65417203039E01F90058BFEB /* pcre */,
</span><span class="cx">                                 95AB831A0DA42C6900BC83F3 /* profiler */,
</span><span class="lines">@@ -872,6 +873,14 @@
</span><span class="cx">                         tabWidth = 4;
</span><span class="cx">                         usesTabs = 0;
</span><span class="cx">                 };
</span><ins>+                1429D77A0ED20D7300B89619 /* interpreter */ = {
+                        isa = PBXGroup;
+                        children = (
+                                1429D77B0ED20D7300B89619 /* Interpreter.h */,
+                        );
+                        path = interpreter;
+                        sourceTree = &quot;&lt;group&gt;&quot;;
+                };
</ins><span class="cx">                 1432EBD70A34CAD400717B9F /* API */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><span class="lines">@@ -949,7 +958,6 @@
</span><span class="cx">                                 A72701B40DADE94900E548D7 /* ExceptionHelpers.cpp */,
</span><span class="cx">                                 A72701B30DADE94900E548D7 /* ExceptionHelpers.h */,
</span><span class="cx">                                 149B15E70D81F986009CB8C7 /* Machine.cpp */,
</span><del>-                                149B15E60D81F986009CB8C7 /* Machine.h */,
</del><span class="cx">                                 149B24FF0D8AF6D1009CB8C7 /* Register.h */,
</span><span class="cx">                                 14D792650DAA03FB001A9F05 /* RegisterFile.cpp */,
</span><span class="cx">                                 14D792640DAA03FB001A9F05 /* RegisterFile.h */,
</span><span class="lines">@@ -1450,7 +1458,6 @@
</span><span class="cx">                                 BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */,
</span><span class="cx">                                 BC18C4360E16F5CD00B34460 /* Locker.h in Headers */,
</span><span class="cx">                                 BC18C4370E16F5CD00B34460 /* Lookup.h in Headers */,
</span><del>-                                BC18C4380E16F5CD00B34460 /* Machine.h in Headers */,
</del><span class="cx">                                 BC18C4390E16F5CD00B34460 /* MainThread.h in Headers */,
</span><span class="cx">                                 BC18C43A0E16F5CD00B34460 /* MallocZoneSupport.h in Headers */,
</span><span class="cx">                                 BC18C43B0E16F5CD00B34460 /* MathExtras.h in Headers */,
</span><span class="lines">@@ -1576,6 +1583,7 @@
</span><span class="cx">                                 969A07980ED1D3AE00F1F681 /* EvalCodeCache.h in Headers */,
</span><span class="cx">                                 969A07990ED1D3AE00F1F681 /* Instruction.h in Headers */,
</span><span class="cx">                                 969A079B0ED1D3AE00F1F681 /* Opcode.h in Headers */,
</span><ins>+                                1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */,
</ins><span class="cx">                         );
</span><span class="cx">                         runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx">                 };
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCTIcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CTI.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CTI.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/VM/CTI.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><span class="cx"> #include &quot;JSArray.h&quot;
</span><span class="cx"> #include &quot;JSFunction.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;ResultType.h&quot;
</span><span class="cx"> #include &quot;SamplingTool.h&quot;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCTIh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CTI.h (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CTI.h        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/VM/CTI.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> #define WTF_USE_CTI_REPATCH_PIC 1
</span><span class="cx"> 
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Opcode.h&quot;
</span><span class="cx"> #include &quot;RegisterFile.h&quot;
</span><span class="cx"> #include &quot;X86Assembler.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMExceptionHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/ExceptionHelpers.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/ExceptionHelpers.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/VM/ExceptionHelpers.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include &quot;ExecState.h&quot;
</span><span class="cx"> #include &quot;JSObject.h&quot;
</span><span class="cx"> #include &quot;JSNotAnObject.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Nodes.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMMachinecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/Machine.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Machine.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/VM/Machine.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> #include &quot;Arguments.h&quot;
</span><span class="cx"> #include &quot;BatchedTransitionOptimizer.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMMachineh"></a>
<div class="delfile"><h4>Deleted: trunk/JavaScriptCore/VM/Machine.h (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/Machine.h        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/VM/Machine.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -1,365 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. (&quot;Apple&quot;) nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS &quot;AS IS&quot; AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef Machine_h
-#define Machine_h
-
-#include &quot;ArgList.h&quot;
-#include &quot;JSCell.h&quot;
-#include &quot;JSValue.h&quot;
-#include &quot;Opcode.h&quot;
-#include &quot;RegisterFile.h&quot;
-#include &lt;wtf/HashMap.h&gt;
-
-namespace JSC {
-
-    class CodeBlock;
-    class EvalNode;
-    class FunctionBodyNode;
-    class Instruction;
-    class InternalFunction;
-    class AssemblerBuffer;
-    class JSFunction;
-    class JSGlobalObject;
-    class ProgramNode;
-    class Register;
-    class ScopeChainNode;
-    class SamplingTool;
-
-#if ENABLE(JIT)
-
-#if USE(CTI_ARGUMENT)
-#define CTI_ARGS void** args
-#define ARGS (args)
-#else
-#define CTI_ARGS void* args, ...
-#define ARGS (&amp;args)
-#endif
-
-#if USE(FAST_CALL_CTI_ARGUMENT)
-
-#if COMPILER(MSVC)
-#define SFX_CALL __fastcall
-#elif COMPILER(GCC)
-#define SFX_CALL  __attribute__ ((fastcall))
-#else
-#error Need to support fastcall calling convention in this compiler
-#endif
-
-#else
-
-#if COMPILER(MSVC)
-#define SFX_CALL __cdecl
-#else
-#define SFX_CALL
-#endif
-
-#endif
-
-    typedef uint64_t VoidPtrPair;
-
-    typedef union
-    {
-        struct { void* first; void* second; } s;
-        VoidPtrPair i;
-    } VoidPtrPairValue;
-#endif
-
-    enum DebugHookID {
-        WillExecuteProgram,
-        DidExecuteProgram,
-        DidEnterCallFrame,
-        DidReachBreakpoint,
-        WillLeaveCallFrame,
-        WillExecuteStatement
-    };
-
-    enum { MaxReentryDepth = 128 };
-
-    class Interpreter {
-        friend class JIT;
-    public:
-        Interpreter();
-        ~Interpreter();
-
-        void initialize(JSGlobalData*);
-        
-        RegisterFile&amp; registerFile() { return m_registerFile; }
-        
-        Opcode getOpcode(OpcodeID id)
-        {
-            #if HAVE(COMPUTED_GOTO)
-                return m_opcodeTable[id];
-            #else
-                return id;
-            #endif
-        }
-
-        OpcodeID getOpcodeID(Opcode opcode)
-        {
-            #if HAVE(COMPUTED_GOTO)
-                ASSERT(isOpcode(opcode));
-                return m_opcodeIDTable.get(opcode);
-            #else
-                return opcode;
-            #endif
-        }
-
-        bool isOpcode(Opcode);
-        
-        JSValue* execute(ProgramNode*, CallFrame*, ScopeChainNode*, JSObject* thisObj, JSValue** exception);
-        JSValue* execute(FunctionBodyNode*, CallFrame*, JSFunction*, JSObject* thisObj, const ArgList&amp; args, ScopeChainNode*, JSValue** exception);
-        JSValue* execute(EvalNode* evalNode, CallFrame* exec, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception);
-
-        JSValue* retrieveArguments(CallFrame*, JSFunction*) const;
-        JSValue* retrieveCaller(CallFrame*, InternalFunction*) const;
-        void retrieveLastCaller(CallFrame*, int&amp; lineNumber, intptr_t&amp; sourceID, UString&amp; sourceURL, JSValue*&amp; function) const;
-        
-        void getArgumentsData(CallFrame*, JSFunction*&amp;, ptrdiff_t&amp; firstParameterIndex, Register*&amp; argv, int&amp; argc);
-        void setTimeoutTime(unsigned timeoutTime) { m_timeoutTime = timeoutTime; }
-        
-        void startTimeoutCheck()
-        {
-            if (!m_timeoutCheckCount)
-                resetTimeoutCheck();
-            
-            ++m_timeoutCheckCount;
-        }
-        
-        void stopTimeoutCheck()
-        {
-            ASSERT(m_timeoutCheckCount);
-            --m_timeoutCheckCount;
-        }
-
-        inline void initTimeout()
-        {
-            ASSERT(!m_timeoutCheckCount);
-            resetTimeoutCheck();
-            m_timeoutTime = 0;
-            m_timeoutCheckCount = 0;
-        }
-
-        void setSampler(SamplingTool* sampler) { m_sampler = sampler; }
-        SamplingTool* sampler() { return m_sampler; }
-
-#if ENABLE(JIT)
-
-        static void SFX_CALL cti_timeout_check(CTI_ARGS);
-        static void SFX_CALL cti_register_file_check(CTI_ARGS);
-
-        static JSObject* SFX_CALL cti_op_convert_this(CTI_ARGS);
-        static void SFX_CALL cti_op_end(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_add(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_pre_inc(CTI_ARGS);
-        static int SFX_CALL cti_op_loop_if_less(CTI_ARGS);
-        static int SFX_CALL cti_op_loop_if_lesseq(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_new_object(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_id(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_id_second(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_id_generic(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_id_fail(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_get_by_id(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_get_by_id_second(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_get_by_id_generic(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_get_by_id_fail(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_del_by_id(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_instanceof(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_mul(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_new_func(CTI_ARGS);
-        static void* SFX_CALL cti_op_call_JSFunction(CTI_ARGS);
-        static VoidPtrPair SFX_CALL cti_op_call_arityCheck(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_call_NotJSFunction(CTI_ARGS);
-        static void SFX_CALL cti_op_create_arguments(CTI_ARGS);
-        static void SFX_CALL cti_op_create_arguments_no_params(CTI_ARGS);
-        static void SFX_CALL cti_op_tear_off_activation(CTI_ARGS);
-        static void SFX_CALL cti_op_tear_off_arguments(CTI_ARGS);
-        static void SFX_CALL cti_op_profile_will_call(CTI_ARGS);
-        static void SFX_CALL cti_op_profile_did_call(CTI_ARGS);
-        static void SFX_CALL cti_op_ret_scopeChain(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_new_array(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_resolve(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_resolve_global(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_construct_JSConstruct(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_construct_NotJSConstruct(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_get_by_val(CTI_ARGS);
-        static VoidPtrPair SFX_CALL cti_op_resolve_func(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_sub(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_val(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_val_array(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_lesseq(CTI_ARGS);
-        static int SFX_CALL cti_op_loop_if_true(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_resolve_base(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_negate(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_resolve_skip(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_div(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_pre_dec(CTI_ARGS);
-        static int SFX_CALL cti_op_jless(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_not(CTI_ARGS);
-        static int SFX_CALL cti_op_jtrue(CTI_ARGS);
-        static VoidPtrPair SFX_CALL cti_op_post_inc(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_eq(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_lshift(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_bitand(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_rshift(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_bitnot(CTI_ARGS);
-        static VoidPtrPair SFX_CALL cti_op_resolve_with_base(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_new_func_exp(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_mod(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_less(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_neq(CTI_ARGS);
-        static VoidPtrPair SFX_CALL cti_op_post_dec(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_urshift(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_bitxor(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_new_regexp(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_bitor(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_call_eval(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_throw(CTI_ARGS);
-        static JSPropertyNameIterator* SFX_CALL cti_op_get_pnames(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_next_pname(CTI_ARGS);
-        static void SFX_CALL cti_op_push_scope(CTI_ARGS);
-        static void SFX_CALL cti_op_pop_scope(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_typeof(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_is_undefined(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_is_boolean(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_is_number(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_is_string(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_is_object(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_is_function(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_stricteq(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_nstricteq(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_to_jsnumber(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_in(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_push_new_scope(CTI_ARGS);
-        static void SFX_CALL cti_op_jmp_scopes(CTI_ARGS);
-        static void SFX_CALL cti_op_put_by_index(CTI_ARGS);
-        static void* SFX_CALL cti_op_switch_imm(CTI_ARGS);
-        static void* SFX_CALL cti_op_switch_char(CTI_ARGS);
-        static void* SFX_CALL cti_op_switch_string(CTI_ARGS);
-        static JSValue* SFX_CALL cti_op_del_by_val(CTI_ARGS);
-        static void SFX_CALL cti_op_put_getter(CTI_ARGS);
-        static void SFX_CALL cti_op_put_setter(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_new_error(CTI_ARGS);
-        static void SFX_CALL cti_op_debug(CTI_ARGS);
-
-        static JSValue* SFX_CALL cti_allocate_number(CTI_ARGS);
-
-        static JSValue* SFX_CALL cti_vm_throw(CTI_ARGS);
-        static void* SFX_CALL cti_vm_dontLazyLinkCall(CTI_ARGS);
-        static void* SFX_CALL cti_vm_lazyLinkCall(CTI_ARGS);
-        static JSObject* SFX_CALL cti_op_push_activation(CTI_ARGS);
-        
-        AssemblerBuffer* assemblerBuffer() const { return m_assemblerBuffer.get(); }
-
-#endif // ENABLE(JIT)
-
-        // Default number of ticks before a timeout check should be done.
-        static const int initialTickCountThreshold = 1024;
-
-        bool isJSArray(JSValue* v) { return !JSImmediate::isImmediate(v) &amp;&amp; v-&gt;asCell()-&gt;vptr() == m_jsArrayVptr; }
-        bool isJSString(JSValue* v) { return !JSImmediate::isImmediate(v) &amp;&amp; v-&gt;asCell()-&gt;vptr() == m_jsStringVptr; }
-
-    private:
-        enum ExecutionFlag { Normal, InitializeAndReturn };
-
-        NEVER_INLINE JSValue* callEval(CallFrame*, RegisterFile*, Register* argv, int argc, int registerOffset, JSValue*&amp; exceptionValue);
-        JSValue* execute(EvalNode*, CallFrame*, JSObject* thisObject, int globalRegisterOffset, ScopeChainNode*, JSValue** exception);
-
-        NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
-
-        NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
-        NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
-        NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
-        NEVER_INLINE void resolveBase(CallFrame*, Instruction* vPC);
-        NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
-        NEVER_INLINE ScopeChainNode* createExceptionScope(CallFrame*, const Instruction* vPC);
-
-        NEVER_INLINE bool unwindCallFrame(CallFrame*&amp;, JSValue*, const Instruction*&amp;, CodeBlock*&amp;);
-        NEVER_INLINE Instruction* throwException(CallFrame*&amp;, JSValue*&amp;, const Instruction*, bool);
-        NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
-
-        static ALWAYS_INLINE CallFrame* slideRegisterWindowForCall(CodeBlock*, RegisterFile*, CallFrame*, size_t registerOffset, int argc);
-
-        static CallFrame* findFunctionCallFrame(CallFrame*, InternalFunction*);
-
-        JSValue* privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValue** exception);
-
-        void dumpCallFrame(CallFrame*);
-        void dumpRegisters(CallFrame*);
-
-        JSValue* checkTimeout(JSGlobalObject*);
-        void resetTimeoutCheck();
-
-        void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp;);
-        void uncacheGetByID(CodeBlock*, Instruction* vPC);
-        void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const PutPropertySlot&amp;);
-        void uncachePutByID(CodeBlock*, Instruction* vPC);
-        
-        bool isCallBytecode(Opcode opcode) { return opcode == getOpcode(op_call) || opcode == getOpcode(op_construct) || opcode == getOpcode(op_call_eval); }
-
-#if ENABLE(JIT)
-        static void throwStackOverflowPreviousFrame(CallFrame**, JSGlobalData*, void*&amp; returnAddress);
-
-        void tryCTICacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp;);
-        void tryCTICachePutByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const PutPropertySlot&amp;);
-#endif
-
-        SamplingTool* m_sampler;
-
-#if ENABLE(JIT)
-        void* m_ctiArrayLengthTrampoline;
-        void* m_ctiStringLengthTrampoline;
-        void* m_ctiVirtualCallPreLink;
-        void* m_ctiVirtualCallLink;
-        void* m_ctiVirtualCall;
-
-        OwnPtr&lt;AssemblerBuffer&gt; m_assemblerBuffer;
-#endif
-
-        int m_reentryDepth;
-        unsigned m_timeoutTime;
-        unsigned m_timeAtLastCheckTimeout;
-        unsigned m_timeExecuting;
-        unsigned m_timeoutCheckCount;
-        unsigned m_ticksUntilNextTimeoutCheck;
-
-        RegisterFile m_registerFile;
-        
-        void* m_jsArrayVptr;
-        void* m_jsStringVptr;
-        void* m_jsFunctionVptr;
-
-#if HAVE(COMPUTED_GOTO)
-        Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID =&gt; Opcode for compiling
-        HashMap&lt;Opcode, OpcodeID&gt; m_opcodeIDTable; // Maps Opcode =&gt; OpcodeID for decompiling
-#endif
-    };
-
-} // namespace JSC
-
-#endif // Machine_h
</del></span></pre></div>
<a id="trunkJavaScriptCoreVMSamplingToolcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/SamplingTool.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/SamplingTool.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/VM/SamplingTool.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include &quot;SamplingTool.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Opcode.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(WIN_OS)
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bytecode/CodeBlock.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecode/CodeBlock.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/bytecode/CodeBlock.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CTI.h&quot;
</span><span class="cx"> #include &quot;JSValue.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Debugger.h&quot;
</span><span class="cx"> #include &lt;stdio.h&gt;
</span><span class="cx"> #include &lt;wtf/StringExtras.h&gt;
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;BatchedTransitionOptimizer.h&quot;
</span><span class="cx"> #include &quot;JSFunction.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;UString.h&quot;
</span><span class="cx"> 
</span><span class="cx"> using namespace std;
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include &quot;Instruction.h&quot;
</span><span class="cx"> #include &quot;Label.h&quot;
</span><span class="cx"> #include &quot;LabelScope.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;RegisterID.h&quot;
</span><span class="cx"> #include &quot;SegmentedVector.h&quot;
</span><span class="cx"> #include &quot;SymbolTable.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/debugger/DebuggerCallFrame.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;JSFunction.h&quot;
</span><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkJavaScriptCoreinterpreterInterpreterhfromrev38510trunkJavaScriptCoreVMMachineh"></a>
<div class="copfile"><h4>Copied: trunk/JavaScriptCore/interpreter/Interpreter.h (from rev 38510, trunk/JavaScriptCore/VM/Machine.h) (0 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/interpreter/Interpreter.h                                (rev 0)
+++ trunk/JavaScriptCore/interpreter/Interpreter.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -0,0 +1,365 @@
</span><ins>+/*
+ * Copyright (C) 2008 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. (&quot;Apple&quot;) nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS &quot;AS IS&quot; AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef Interpreter_h
+#define Interpreter_h
+
+#include &quot;ArgList.h&quot;
+#include &quot;JSCell.h&quot;
+#include &quot;JSValue.h&quot;
+#include &quot;Opcode.h&quot;
+#include &quot;RegisterFile.h&quot;
+#include &lt;wtf/HashMap.h&gt;
+
+namespace JSC {
+
+    class CodeBlock;
+    class EvalNode;
+    class FunctionBodyNode;
+    class Instruction;
+    class InternalFunction;
+    class AssemblerBuffer;
+    class JSFunction;
+    class JSGlobalObject;
+    class ProgramNode;
+    class Register;
+    class ScopeChainNode;
+    class SamplingTool;
+
+#if ENABLE(JIT)
+
+#if USE(CTI_ARGUMENT)
+#define CTI_ARGS void** args
+#define ARGS (args)
+#else
+#define CTI_ARGS void* args, ...
+#define ARGS (&amp;args)
+#endif
+
+#if USE(FAST_CALL_CTI_ARGUMENT)
+
+#if COMPILER(MSVC)
+#define SFX_CALL __fastcall
+#elif COMPILER(GCC)
+#define SFX_CALL  __attribute__ ((fastcall))
+#else
+#error Need to support fastcall calling convention in this compiler
+#endif
+
+#else
+
+#if COMPILER(MSVC)
+#define SFX_CALL __cdecl
+#else
+#define SFX_CALL
+#endif
+
+#endif
+
+    typedef uint64_t VoidPtrPair;
+
+    typedef union
+    {
+        struct { void* first; void* second; } s;
+        VoidPtrPair i;
+    } VoidPtrPairValue;
+#endif
+
+    enum DebugHookID {
+        WillExecuteProgram,
+        DidExecuteProgram,
+        DidEnterCallFrame,
+        DidReachBreakpoint,
+        WillLeaveCallFrame,
+        WillExecuteStatement
+    };
+
+    enum { MaxReentryDepth = 128 };
+
+    class Interpreter {
+        friend class JIT;
+    public:
+        Interpreter();
+        ~Interpreter();
+
+        void initialize(JSGlobalData*);
+        
+        RegisterFile&amp; registerFile() { return m_registerFile; }
+        
+        Opcode getOpcode(OpcodeID id)
+        {
+            #if HAVE(COMPUTED_GOTO)
+                return m_opcodeTable[id];
+            #else
+                return id;
+            #endif
+        }
+
+        OpcodeID getOpcodeID(Opcode opcode)
+        {
+            #if HAVE(COMPUTED_GOTO)
+                ASSERT(isOpcode(opcode));
+                return m_opcodeIDTable.get(opcode);
+            #else
+                return opcode;
+            #endif
+        }
+
+        bool isOpcode(Opcode);
+        
+        JSValue* execute(ProgramNode*, CallFrame*, ScopeChainNode*, JSObject* thisObj, JSValue** exception);
+        JSValue* execute(FunctionBodyNode*, CallFrame*, JSFunction*, JSObject* thisObj, const ArgList&amp; args, ScopeChainNode*, JSValue** exception);
+        JSValue* execute(EvalNode* evalNode, CallFrame* exec, JSObject* thisObj, ScopeChainNode* scopeChain, JSValue** exception);
+
+        JSValue* retrieveArguments(CallFrame*, JSFunction*) const;
+        JSValue* retrieveCaller(CallFrame*, InternalFunction*) const;
+        void retrieveLastCaller(CallFrame*, int&amp; lineNumber, intptr_t&amp; sourceID, UString&amp; sourceURL, JSValue*&amp; function) const;
+        
+        void getArgumentsData(CallFrame*, JSFunction*&amp;, ptrdiff_t&amp; firstParameterIndex, Register*&amp; argv, int&amp; argc);
+        void setTimeoutTime(unsigned timeoutTime) { m_timeoutTime = timeoutTime; }
+        
+        void startTimeoutCheck()
+        {
+            if (!m_timeoutCheckCount)
+                resetTimeoutCheck();
+            
+            ++m_timeoutCheckCount;
+        }
+        
+        void stopTimeoutCheck()
+        {
+            ASSERT(m_timeoutCheckCount);
+            --m_timeoutCheckCount;
+        }
+
+        inline void initTimeout()
+        {
+            ASSERT(!m_timeoutCheckCount);
+            resetTimeoutCheck();
+            m_timeoutTime = 0;
+            m_timeoutCheckCount = 0;
+        }
+
+        void setSampler(SamplingTool* sampler) { m_sampler = sampler; }
+        SamplingTool* sampler() { return m_sampler; }
+
+#if ENABLE(JIT)
+
+        static void SFX_CALL cti_timeout_check(CTI_ARGS);
+        static void SFX_CALL cti_register_file_check(CTI_ARGS);
+
+        static JSObject* SFX_CALL cti_op_convert_this(CTI_ARGS);
+        static void SFX_CALL cti_op_end(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_add(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_pre_inc(CTI_ARGS);
+        static int SFX_CALL cti_op_loop_if_less(CTI_ARGS);
+        static int SFX_CALL cti_op_loop_if_lesseq(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_new_object(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_id(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_id_second(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_id_generic(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_id_fail(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_get_by_id(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_get_by_id_second(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_get_by_id_generic(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_get_by_id_fail(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_del_by_id(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_instanceof(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_mul(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_new_func(CTI_ARGS);
+        static void* SFX_CALL cti_op_call_JSFunction(CTI_ARGS);
+        static VoidPtrPair SFX_CALL cti_op_call_arityCheck(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_call_NotJSFunction(CTI_ARGS);
+        static void SFX_CALL cti_op_create_arguments(CTI_ARGS);
+        static void SFX_CALL cti_op_create_arguments_no_params(CTI_ARGS);
+        static void SFX_CALL cti_op_tear_off_activation(CTI_ARGS);
+        static void SFX_CALL cti_op_tear_off_arguments(CTI_ARGS);
+        static void SFX_CALL cti_op_profile_will_call(CTI_ARGS);
+        static void SFX_CALL cti_op_profile_did_call(CTI_ARGS);
+        static void SFX_CALL cti_op_ret_scopeChain(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_new_array(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_resolve(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_resolve_global(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_construct_JSConstruct(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_construct_NotJSConstruct(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_get_by_val(CTI_ARGS);
+        static VoidPtrPair SFX_CALL cti_op_resolve_func(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_sub(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_val(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_val_array(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_lesseq(CTI_ARGS);
+        static int SFX_CALL cti_op_loop_if_true(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_resolve_base(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_negate(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_resolve_skip(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_div(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_pre_dec(CTI_ARGS);
+        static int SFX_CALL cti_op_jless(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_not(CTI_ARGS);
+        static int SFX_CALL cti_op_jtrue(CTI_ARGS);
+        static VoidPtrPair SFX_CALL cti_op_post_inc(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_eq(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_lshift(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_bitand(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_rshift(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_bitnot(CTI_ARGS);
+        static VoidPtrPair SFX_CALL cti_op_resolve_with_base(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_new_func_exp(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_mod(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_less(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_neq(CTI_ARGS);
+        static VoidPtrPair SFX_CALL cti_op_post_dec(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_urshift(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_bitxor(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_new_regexp(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_bitor(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_call_eval(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_throw(CTI_ARGS);
+        static JSPropertyNameIterator* SFX_CALL cti_op_get_pnames(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_next_pname(CTI_ARGS);
+        static void SFX_CALL cti_op_push_scope(CTI_ARGS);
+        static void SFX_CALL cti_op_pop_scope(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_typeof(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_is_undefined(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_is_boolean(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_is_number(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_is_string(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_is_object(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_is_function(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_stricteq(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_nstricteq(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_to_jsnumber(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_in(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_push_new_scope(CTI_ARGS);
+        static void SFX_CALL cti_op_jmp_scopes(CTI_ARGS);
+        static void SFX_CALL cti_op_put_by_index(CTI_ARGS);
+        static void* SFX_CALL cti_op_switch_imm(CTI_ARGS);
+        static void* SFX_CALL cti_op_switch_char(CTI_ARGS);
+        static void* SFX_CALL cti_op_switch_string(CTI_ARGS);
+        static JSValue* SFX_CALL cti_op_del_by_val(CTI_ARGS);
+        static void SFX_CALL cti_op_put_getter(CTI_ARGS);
+        static void SFX_CALL cti_op_put_setter(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_new_error(CTI_ARGS);
+        static void SFX_CALL cti_op_debug(CTI_ARGS);
+
+        static JSValue* SFX_CALL cti_allocate_number(CTI_ARGS);
+
+        static JSValue* SFX_CALL cti_vm_throw(CTI_ARGS);
+        static void* SFX_CALL cti_vm_dontLazyLinkCall(CTI_ARGS);
+        static void* SFX_CALL cti_vm_lazyLinkCall(CTI_ARGS);
+        static JSObject* SFX_CALL cti_op_push_activation(CTI_ARGS);
+        
+        AssemblerBuffer* assemblerBuffer() const { return m_assemblerBuffer.get(); }
+
+#endif // ENABLE(JIT)
+
+        // Default number of ticks before a timeout check should be done.
+        static const int initialTickCountThreshold = 1024;
+
+        bool isJSArray(JSValue* v) { return !JSImmediate::isImmediate(v) &amp;&amp; v-&gt;asCell()-&gt;vptr() == m_jsArrayVptr; }
+        bool isJSString(JSValue* v) { return !JSImmediate::isImmediate(v) &amp;&amp; v-&gt;asCell()-&gt;vptr() == m_jsStringVptr; }
+
+    private:
+        enum ExecutionFlag { Normal, InitializeAndReturn };
+
+        NEVER_INLINE JSValue* callEval(CallFrame*, RegisterFile*, Register* argv, int argc, int registerOffset, JSValue*&amp; exceptionValue);
+        JSValue* execute(EvalNode*, CallFrame*, JSObject* thisObject, int globalRegisterOffset, ScopeChainNode*, JSValue** exception);
+
+        NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
+
+        NEVER_INLINE bool resolve(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
+        NEVER_INLINE bool resolveSkip(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
+        NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
+        NEVER_INLINE void resolveBase(CallFrame*, Instruction* vPC);
+        NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
+        NEVER_INLINE ScopeChainNode* createExceptionScope(CallFrame*, const Instruction* vPC);
+
+        NEVER_INLINE bool unwindCallFrame(CallFrame*&amp;, JSValue*, const Instruction*&amp;, CodeBlock*&amp;);
+        NEVER_INLINE Instruction* throwException(CallFrame*&amp;, JSValue*&amp;, const Instruction*, bool);
+        NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValue*&amp; exceptionValue);
+
+        static ALWAYS_INLINE CallFrame* slideRegisterWindowForCall(CodeBlock*, RegisterFile*, CallFrame*, size_t registerOffset, int argc);
+
+        static CallFrame* findFunctionCallFrame(CallFrame*, InternalFunction*);
+
+        JSValue* privateExecute(ExecutionFlag, RegisterFile*, CallFrame*, JSValue** exception);
+
+        void dumpCallFrame(CallFrame*);
+        void dumpRegisters(CallFrame*);
+
+        JSValue* checkTimeout(JSGlobalObject*);
+        void resetTimeoutCheck();
+
+        void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp;);
+        void uncacheGetByID(CodeBlock*, Instruction* vPC);
+        void tryCachePutByID(CallFrame*, CodeBlock*, Instruction*, JSValue* baseValue, const PutPropertySlot&amp;);
+        void uncachePutByID(CodeBlock*, Instruction* vPC);
+        
+        bool isCallBytecode(Opcode opcode) { return opcode == getOpcode(op_call) || opcode == getOpcode(op_construct) || opcode == getOpcode(op_call_eval); }
+
+#if ENABLE(JIT)
+        static void throwStackOverflowPreviousFrame(CallFrame**, JSGlobalData*, void*&amp; returnAddress);
+
+        void tryCTICacheGetByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const Identifier&amp; propertyName, const PropertySlot&amp;);
+        void tryCTICachePutByID(CallFrame*, CodeBlock*, void* returnAddress, JSValue* baseValue, const PutPropertySlot&amp;);
+#endif
+
+        SamplingTool* m_sampler;
+
+#if ENABLE(JIT)
+        void* m_ctiArrayLengthTrampoline;
+        void* m_ctiStringLengthTrampoline;
+        void* m_ctiVirtualCallPreLink;
+        void* m_ctiVirtualCallLink;
+        void* m_ctiVirtualCall;
+
+        OwnPtr&lt;AssemblerBuffer&gt; m_assemblerBuffer;
+#endif
+
+        int m_reentryDepth;
+        unsigned m_timeoutTime;
+        unsigned m_timeAtLastCheckTimeout;
+        unsigned m_timeExecuting;
+        unsigned m_timeoutCheckCount;
+        unsigned m_ticksUntilNextTimeoutCheck;
+
+        RegisterFile m_registerFile;
+        
+        void* m_jsArrayVptr;
+        void* m_jsStringVptr;
+        void* m_jsFunctionVptr;
+
+#if HAVE(COMPUTED_GOTO)
+        Opcode m_opcodeTable[numOpcodeIDs]; // Maps OpcodeID =&gt; Opcode for compiling
+        HashMap&lt;Opcode, OpcodeID&gt; m_opcodeIDTable; // Maps Opcode =&gt; OpcodeID for decompiling
+#endif
+    };
+
+} // namespace JSC
+
+#endif // Interpreter_h
</ins></span></pre></div>
<a id="trunkJavaScriptCorejscorebkl"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/jscore.bkl (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/jscore.bkl        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/jscore.bkl        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx">         &lt;include&gt;$(SRCDIR)/profiler&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(SRCDIR)/runtime&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(SRCDIR)/VM&lt;/include&gt;
</span><ins>+        &lt;include&gt;$(SRCDIR)/interpreter&lt;/include&gt;
</ins><span class="cx">         &lt;include&gt;$(SRCDIR)/bytecode&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(SRCDIR)/wrec&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(SRCDIR)/wtf&lt;/include&gt;
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/profiler&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/runtime&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/VM&lt;/include&gt;
</span><ins>+        &lt;include&gt;$(WK_ROOT)/JavaScriptCore/interpreter&lt;/include&gt;
</ins><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/bytecode&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/wrec&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/wtf&lt;/include&gt;
</span></span></pre></div>
<a id="trunkJavaScriptCoreprofilerProfileGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/profiler/ProfileGenerator.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/profiler/ProfileGenerator.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/profiler/ProfileGenerator.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include &quot;JSGlobalObject.h&quot;
</span><span class="cx"> #include &quot;JSStringRef.h&quot;
</span><span class="cx"> #include &quot;JSFunction.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Profile.h&quot;
</span><span class="cx"> #include &quot;Profiler.h&quot;
</span><span class="cx"> #include &quot;Tracing.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Arguments.h (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Arguments.h        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/Arguments.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include &quot;JSActivation.h&quot;
</span><span class="cx"> #include &quot;JSFunction.h&quot;
</span><span class="cx"> #include &quot;JSGlobalObject.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/ArrayPrototype.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/ArrayPrototype.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/ArrayPrototype.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;ArrayPrototype.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;ObjectPrototype.h&quot;
</span><span class="cx"> #include &quot;Lookup.h&quot;
</span><span class="cx"> #include &quot;Operations.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Collector.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Collector.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/Collector.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include &quot;JSLock.h&quot;
</span><span class="cx"> #include &quot;JSString.h&quot;
</span><span class="cx"> #include &quot;JSValue.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Tracing.h&quot;
</span><span class="cx"> #include &lt;algorithm&gt;
</span><span class="cx"> #include &lt;setjmp.h&gt;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeCompletioncpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Completion.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Completion.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/Completion.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include &quot;ExecState.h&quot;
</span><span class="cx"> #include &quot;JSGlobalObject.h&quot;
</span><span class="cx"> #include &quot;JSLock.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> #include &quot;Debugger.h&quot;
</span><span class="cx"> #include &lt;stdio.h&gt;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecStateh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/ExecState.h (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/ExecState.h        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/ExecState.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> // FIXME: Rename this file to CallFrame.h.
</span><span class="cx"> 
</span><span class="cx"> #include &quot;JSGlobalData.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;ScopeChain.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC  {
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeFunctionPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/FunctionPrototype.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/FunctionPrototype.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/FunctionPrototype.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include &quot;JSArray.h&quot;
</span><span class="cx"> #include &quot;JSFunction.h&quot;
</span><span class="cx"> #include &quot;JSString.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;PrototypeFunction.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSActivationcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSActivation.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSActivation.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/JSActivation.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include &quot;JSActivation.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Arguments.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;JSFunction.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSFunction.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSFunction.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/JSFunction.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include &quot;ExecState.h&quot;
</span><span class="cx"> #include &quot;FunctionPrototype.h&quot;
</span><span class="cx"> #include &quot;JSGlobalObject.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;ObjectPrototype.h&quot;
</span><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> #include &quot;PropertyNameArray.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalData.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalData.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/JSGlobalData.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include &quot;JSLock.h&quot;
</span><span class="cx"> #include &quot;JSNotAnObject.h&quot;
</span><span class="cx"> #include &quot;JSStaticScopeObject.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> #include &quot;Collector.h&quot;
</span><span class="cx"> #include &quot;Lexer.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalObject.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalObject.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/JSGlobalObject.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #include &quot;GlobalEvalFunction.h&quot;
</span><span class="cx"> #include &quot;JSGlobalObjectFunctions.h&quot;
</span><span class="cx"> #include &quot;JSLock.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;MathObject.h&quot;
</span><span class="cx"> #include &quot;NativeErrorConstructor.h&quot;
</span><span class="cx"> #include &quot;NativeErrorPrototype.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include &quot;GlobalEvalFunction.h&quot;
</span><span class="cx"> #include &quot;JSGlobalObject.h&quot;
</span><span class="cx"> #include &quot;JSString.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> #include &quot;dtoa.h&quot;
</span><span class="cx"> #include &quot;Lexer.h&quot;
</span></span></pre></div>
<a id="trunkJavaScriptCorewrecWRECcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wrec/WREC.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wrec/WREC.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/JavaScriptCore/wrec/WREC.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(WREC)
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CharacterClassConstructor.h&quot;
</span><del>-#include &quot;Machine.h&quot;
</del><ins>+#include &quot;Interpreter.h&quot;
</ins><span class="cx"> #include &quot;pcre_internal.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #define __ m_assembler.
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebCore/ChangeLog        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -1,7 +1,22 @@
</span><span class="cx"> 2008-11-17  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><ins>+        
+        Updated for JavaScriptCore renames.
</ins><span class="cx"> 
</span><ins>+        * ForwardingHeaders/VM: Removed.
+        * ForwardingHeaders/VM/Machine.h: Removed.
+        * ForwardingHeaders/interpreter: Added.
+        * ForwardingHeaders/interpreter/Interpreter.h: Copied from ForwardingHeaders/VM/Machine.h.
+        * WebCore.pro:
+        * bindings/js/JSXMLHttpRequestCustom.cpp:
+        * page/Console.cpp:
+        * webcore-base.bkl:
+
+2008-11-17  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+
</ins><span class="cx">         Updated for JavaScriptCore renames.
</span><span class="cx"> 
</span><span class="cx">         * ForwardingHeaders/runtime/Interpreter.h: Removed.
</span></span></pre></div>
<a id="trunkWebCoreForwardingHeadersinterpreterInterpreterhfromrev38510trunkWebCoreForwardingHeadersVMMachineh"></a>
<div class="copfile"><h4>Copied: trunk/WebCore/ForwardingHeaders/interpreter/Interpreter.h (from rev 38510, trunk/WebCore/ForwardingHeaders/VM/Machine.h) (0 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ForwardingHeaders/interpreter/Interpreter.h                                (rev 0)
+++ trunk/WebCore/ForwardingHeaders/interpreter/Interpreter.h        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#include &lt;JavaScriptCore/Interpreter.h&gt;
</ins></span></pre></div>
<a id="trunkWebCoreWebCorepro"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.pro (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.pro        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebCore/WebCore.pro        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> 
</span><span class="cx"> INCLUDEPATH += $$PWD $$PWD/../JavaScriptCore $$PWD/../JavaScriptCore/ForwardingHeaders \
</span><span class="cx">                $$PWD/../JavaScriptCore/VM \
</span><ins>+               $$PWD/../JavaScriptCore/interpreter \
</ins><span class="cx">                $$PWD/../JavaScriptCore/bytecode \
</span><span class="cx">                $$PWD/../JavaScriptCore/debugger \
</span><span class="cx">                $$PWD/../JavaScriptCore/parser \
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSXMLHttpRequestCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include &quot;JSFile.h&quot;
</span><span class="cx"> #include &quot;XMLHttpRequest.h&quot;
</span><span class="cx"> #include &lt;runtime/Error.h&gt;
</span><del>-#include &lt;VM/Machine.h&gt;
</del><ins>+#include &lt;interpreter/Interpreter.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> using namespace JSC;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorepageConsolecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Console.cpp (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Console.cpp        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebCore/page/Console.cpp        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include &lt;runtime/ArgList.h&gt;
</span><span class="cx"> #include &lt;runtime/Completion.h&gt;
</span><span class="cx"> #include &lt;runtime/JSObject.h&gt;
</span><del>-#include &lt;VM/Machine.h&gt;
</del><ins>+#include &lt;interpreter/Interpreter.h&gt;
</ins><span class="cx"> #include &lt;profiler/Profiler.h&gt;
</span><span class="cx"> #include &lt;stdio.h&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorewebcorebasebkl"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/webcore-base.bkl (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/webcore-base.bkl        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebCore/webcore-base.bkl        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/profiler&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/runtime&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/VM&lt;/include&gt;
</span><ins>+        &lt;include&gt;$(WK_ROOT)/JavaScriptCore/interpreter&lt;/include&gt;
</ins><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/wtf&lt;/include&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;sources&gt;$(WEBCORE_BASE_SOURCES)&lt;/sources&gt;
</span></span></pre></div>
<a id="trunkWebKitwxChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/ChangeLog (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/ChangeLog        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebKit/wx/ChangeLog        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2008-11-17  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Sam Weinig.
+        
+        Updated for JavaScriptCore renames.
+
+        * presets/wxwebkit.bkl:
+
+2008-11-17  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
</ins><span class="cx">         Not reviewed.
</span><span class="cx">         
</span><span class="cx">         Try to fix wx build.
</span></span></pre></div>
<a id="trunkWebKitwxpresetswxwebkitbkl"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/wx/presets/wxwebkit.bkl (38510 => 38511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/wx/presets/wxwebkit.bkl        2008-11-17 18:32:15 UTC (rev 38510)
+++ trunk/WebKit/wx/presets/wxwebkit.bkl        2008-11-17 20:57:18 UTC (rev 38511)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/profiler&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/runtime&lt;/include&gt;
</span><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/VM&lt;/include&gt;
</span><ins>+        &lt;include&gt;$(WK_ROOT)/JavaScriptCore/interpreter&lt;/include&gt;
</ins><span class="cx">         &lt;include&gt;$(WK_ROOT)/JavaScriptCore/wtf&lt;/include&gt;
</span><span class="cx">     &lt;/template&gt;
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>