JavaScriptCore:

2008-11-17  Geoffrey Garen  <ggaren@apple.com>

        Reviewed by Sam Weinig.

        Moved VM/Machine.h => 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  <ggaren@apple.com>

        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  <ggaren@apple.com>

        Reviewed by Sam Weinig.

        Updated for JavaScriptCore renames.

        * presets/wxwebkit.bkl:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@38511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e616f1c..4a62e9b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,41 @@
 
         Reviewed by Sam Weinig.
         
+        Moved VM/Machine.h => 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  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+        
         Moved runtime/Interpreter.cpp => runtime/Completion.cpp.
 
         Moved functions from Interpreter.h to Completion.h, and removed

diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 37b8a8a..49debd3 100644 (file)
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -2,6 +2,7 @@ javascriptcore_cppflags += \
        -I$(srcdir)/JavaScriptCore/API \
        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
        -I$(srcdir)/JavaScriptCore/VM \
+       -I$(srcdir)/JavaScriptCore/interpreter \
        -I$(srcdir)/JavaScriptCore/bytecode \
        -I$(srcdir)/JavaScriptCore/bytecompiler \
        -I$(srcdir)/JavaScriptCore/debugger \
@@ -81,7 +82,7 @@ javascriptcore_sources += \
        JavaScriptCore/bytecode/Instruction.h \
        JavaScriptCore/bytecompiler/Label.h \
        JavaScriptCore/VM/Machine.cpp \
-       JavaScriptCore/VM/Machine.h \
+       JavaScriptCore/interpreter/Interpreter.h \
        JavaScriptCore/bytecode/Opcode.cpp \
        JavaScriptCore/bytecode/Opcode.h \
        JavaScriptCore/VM/Register.h \

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 43fd157..85fa564 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -1286,7 +1286,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\VM\Machine.h"\r
+                               RelativePath="..\..\interpreter\Interpreter.h"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 6dc3b33..1c0aed0 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
                141211310A48794D00480255 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
                141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBXBuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; };
                1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; };
+               1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1429D77B0ED20D7300B89619 /* Interpreter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                143A97E60A4A06E200456B66 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
                1440057F0A5335640005F061 /* JSNode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1440F6420A4F8B6A0005F061 /* JSNode.c */; };
                144005CB0A5338D10005F061 /* JSNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1440F6410A4F8B6A0005F061 /* JSNode.h */; };
@@ -213,7 +214,6 @@
                BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 148A1626095D16BB00666D0D /* ListRefPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4360E16F5CD00B34460 /* Locker.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE79270D6C964500FEA3BA /* Locker.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4370E16F5CD00B34460 /* Lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8690255597D01FF60F7 /* Lookup.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C4380E16F5CD00B34460 /* Machine.h in Headers */ = {isa = PBXBuildFile; fileRef = 149B15E60D81F986009CB8C7 /* Machine.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C4390E16F5CD00B34460 /* MainThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D358A30DAAD9C4003B174E /* MainThread.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C43A0E16F5CD00B34460 /* MallocZoneSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */; };
                BC18C43B0E16F5CD00B34460 /* MathExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF6553B0A2048DE0038A194 /* MathExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -393,6 +393,7 @@
                1419D32C0CEA7CDE00FF507A /* RefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounted.h; sourceTree = "<group>"; };
                1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp; sourceTree = "<group>"; };
                142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBase.h; sourceTree = "<group>"; };
+               1429D77B0ED20D7300B89619 /* Interpreter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Interpreter.h; sourceTree = "<group>"; };
                1440051F0A531D3B0005F061 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = tests/Node.h; sourceTree = "<group>"; };
                144005200A531D3B0005F061 /* Node.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Node.c; path = tests/Node.c; sourceTree = "<group>"; };
                144007480A536CC20005F061 /* NodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeList.h; path = tests/NodeList.h; sourceTree = "<group>"; };
@@ -424,7 +425,6 @@
                148A1626095D16BB00666D0D /* ListRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ListRefPtr.h; sourceTree = "<group>"; };
                148A1ECD0D10C23B0069A47C /* RefPtrHashMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefPtrHashMap.h; sourceTree = "<group>"; };
                149559ED0DDCDDF700648087 /* DebuggerCallFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebuggerCallFrame.cpp; sourceTree = "<group>"; };
-               149B15E60D81F986009CB8C7 /* Machine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Machine.h; path = VM/Machine.h; sourceTree = "<group>"; };
                149B15E70D81F986009CB8C7 /* Machine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Machine.cpp; path = VM/Machine.cpp; sourceTree = "<group>"; };
                149B24FF0D8AF6D1009CB8C7 /* Register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Register.h; path = VM/Register.h; sourceTree = "<group>"; };
                14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolTable.h; sourceTree = "<group>"; };
@@ -828,6 +828,7 @@
                                969A078F0ED1D3AE00F1F681 /* bytecode */,
                                7E39D81D0EC38EFA003AF11A /* bytecompiler */,
                                1480DB9A0DDC2231003CFDF2 /* debugger */,
+                               1429D77A0ED20D7300B89619 /* interpreter */,
                                7E39D8370EC3A388003AF11A /* parser */,
                                65417203039E01F90058BFEB /* pcre */,
                                95AB831A0DA42C6900BC83F3 /* profiler */,
@@ -872,6 +873,14 @@
                        tabWidth = 4;
                        usesTabs = 0;
                };
+               1429D77A0ED20D7300B89619 /* interpreter */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1429D77B0ED20D7300B89619 /* Interpreter.h */,
+                       );
+                       path = interpreter;
+                       sourceTree = "<group>";
+               };
                1432EBD70A34CAD400717B9F /* API */ = {
                        isa = PBXGroup;
                        children = (
@@ -949,7 +958,6 @@
                                A72701B40DADE94900E548D7 /* ExceptionHelpers.cpp */,
                                A72701B30DADE94900E548D7 /* ExceptionHelpers.h */,
                                149B15E70D81F986009CB8C7 /* Machine.cpp */,
-                               149B15E60D81F986009CB8C7 /* Machine.h */,
                                149B24FF0D8AF6D1009CB8C7 /* Register.h */,
                                14D792650DAA03FB001A9F05 /* RegisterFile.cpp */,
                                14D792640DAA03FB001A9F05 /* RegisterFile.h */,
@@ -1450,7 +1458,6 @@
                                BC18C4350E16F5CD00B34460 /* ListRefPtr.h in Headers */,
                                BC18C4360E16F5CD00B34460 /* Locker.h in Headers */,
                                BC18C4370E16F5CD00B34460 /* Lookup.h in Headers */,
-                               BC18C4380E16F5CD00B34460 /* Machine.h in Headers */,
                                BC18C4390E16F5CD00B34460 /* MainThread.h in Headers */,
                                BC18C43A0E16F5CD00B34460 /* MallocZoneSupport.h in Headers */,
                                BC18C43B0E16F5CD00B34460 /* MathExtras.h in Headers */,
@@ -1576,6 +1583,7 @@
                                969A07980ED1D3AE00F1F681 /* EvalCodeCache.h in Headers */,
                                969A07990ED1D3AE00F1F681 /* Instruction.h in Headers */,
                                969A079B0ED1D3AE00F1F681 /* Opcode.h in Headers */,
+                               1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/JavaScriptCore/VM/CTI.cpp b/JavaScriptCore/VM/CTI.cpp
index d831ea2..1dda5e8 100644 (file)
--- a/JavaScriptCore/VM/CTI.cpp
+++ b/JavaScriptCore/VM/CTI.cpp
@@ -31,7 +31,7 @@
 #include "CodeBlock.h"
 #include "JSArray.h"
 #include "JSFunction.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "ResultType.h"
 #include "SamplingTool.h"
 

diff --git a/JavaScriptCore/VM/CTI.h b/JavaScriptCore/VM/CTI.h
index e92c632..f49add8 100644 (file)
--- a/JavaScriptCore/VM/CTI.h
+++ b/JavaScriptCore/VM/CTI.h
@@ -32,7 +32,7 @@
 
 #define WTF_USE_CTI_REPATCH_PIC 1
 
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Opcode.h"
 #include "RegisterFile.h"
 #include "X86Assembler.h"

diff --git a/JavaScriptCore/VM/ExceptionHelpers.cpp b/JavaScriptCore/VM/ExceptionHelpers.cpp
index 208625e..2e30898 100644 (file)
--- a/JavaScriptCore/VM/ExceptionHelpers.cpp
+++ b/JavaScriptCore/VM/ExceptionHelpers.cpp
@@ -33,7 +33,7 @@
 #include "ExecState.h"
 #include "JSObject.h"
 #include "JSNotAnObject.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Nodes.h"
 
 namespace JSC {

diff --git a/JavaScriptCore/VM/Machine.cpp b/JavaScriptCore/VM/Machine.cpp
index f7cd31c..c58a1ac 100644 (file)
--- a/JavaScriptCore/VM/Machine.cpp
+++ b/JavaScriptCore/VM/Machine.cpp
@@ -28,7 +28,7 @@
  */
 
 #include "config.h"
-#include "Machine.h"
+#include "Interpreter.h"
 
 #include "Arguments.h"
 #include "BatchedTransitionOptimizer.h"

diff --git a/JavaScriptCore/VM/SamplingTool.cpp b/JavaScriptCore/VM/SamplingTool.cpp
index 58cc314..b73aa9a 100644 (file)
--- a/JavaScriptCore/VM/SamplingTool.cpp
+++ b/JavaScriptCore/VM/SamplingTool.cpp
@@ -30,7 +30,7 @@
 #include "SamplingTool.h"
 
 #include "CodeBlock.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Opcode.h"
 
 #if !PLATFORM(WIN_OS)

diff --git a/JavaScriptCore/bytecode/CodeBlock.cpp b/JavaScriptCore/bytecode/CodeBlock.cpp
index c2fa45e..54f539f 100644 (file)
--- a/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -32,7 +32,7 @@
 
 #include "CTI.h"
 #include "JSValue.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Debugger.h"
 #include <stdio.h>
 #include <wtf/StringExtras.h>

diff --git a/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
index d2ae145..ff8689a 100644 (file)
--- a/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+++ b/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
@@ -32,7 +32,7 @@
 
 #include "BatchedTransitionOptimizer.h"
 #include "JSFunction.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "UString.h"
 
 using namespace std;

diff --git a/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/JavaScriptCore/bytecompiler/BytecodeGenerator.h
index 51ca8da..016352a 100644 (file)
--- a/JavaScriptCore/bytecompiler/BytecodeGenerator.h
+++ b/JavaScriptCore/bytecompiler/BytecodeGenerator.h
@@ -35,7 +35,7 @@
 #include "Instruction.h"
 #include "Label.h"
 #include "LabelScope.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "RegisterID.h"
 #include "SegmentedVector.h"
 #include "SymbolTable.h"

diff --git a/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/JavaScriptCore/debugger/DebuggerCallFrame.cpp
index 296cc75..630de50 100644 (file)
--- a/JavaScriptCore/debugger/DebuggerCallFrame.cpp
+++ b/JavaScriptCore/debugger/DebuggerCallFrame.cpp
@@ -31,7 +31,7 @@
 
 #include "JSFunction.h"
 #include "CodeBlock.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Parser.h"
 
 namespace JSC {

diff --git a/JavaScriptCore/VM/Machine.h b/JavaScriptCore/interpreter/Interpreter.h
similarity index 99%
rename from JavaScriptCore/VM/Machine.h
rename to JavaScriptCore/interpreter/Interpreter.h
index bc118c7..841ceae 100644 (file)
--- a/JavaScriptCore/VM/Machine.h
+++ b/JavaScriptCore/interpreter/Interpreter.h
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef Machine_h
-#define Machine_h
+#ifndef Interpreter_h
+#define Interpreter_h
 
 #include "ArgList.h"
 #include "JSCell.h"
@@ -362,4 +362,4 @@ namespace JSC {
 
 } // namespace JSC
 
-#endif // Machine_h
+#endif // Interpreter_h

diff --git a/JavaScriptCore/jscore.bkl b/JavaScriptCore/jscore.bkl
index 9b24459..7d20ef9 100644 (file)
--- a/JavaScriptCore/jscore.bkl
+++ b/JavaScriptCore/jscore.bkl
@@ -64,6 +64,7 @@ JavaScriptCore Bakefile project file.
         <include>$(SRCDIR)/profiler</include>
         <include>$(SRCDIR)/runtime</include>
         <include>$(SRCDIR)/VM</include>
+        <include>$(SRCDIR)/interpreter</include>
         <include>$(SRCDIR)/bytecode</include>
         <include>$(SRCDIR)/wrec</include>
         <include>$(SRCDIR)/wtf</include>
@@ -101,6 +102,7 @@ JavaScriptCore Bakefile project file.
         <include>$(WK_ROOT)/JavaScriptCore/profiler</include>
         <include>$(WK_ROOT)/JavaScriptCore/runtime</include>
         <include>$(WK_ROOT)/JavaScriptCore/VM</include>
+        <include>$(WK_ROOT)/JavaScriptCore/interpreter</include>
         <include>$(WK_ROOT)/JavaScriptCore/bytecode</include>
         <include>$(WK_ROOT)/JavaScriptCore/wrec</include>
         <include>$(WK_ROOT)/JavaScriptCore/wtf</include>

diff --git a/JavaScriptCore/profiler/ProfileGenerator.cpp b/JavaScriptCore/profiler/ProfileGenerator.cpp
index 6805828..b311229 100644 (file)
--- a/JavaScriptCore/profiler/ProfileGenerator.cpp
+++ b/JavaScriptCore/profiler/ProfileGenerator.cpp
@@ -30,7 +30,7 @@
 #include "JSGlobalObject.h"
 #include "JSStringRef.h"
 #include "JSFunction.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Profile.h"
 #include "Profiler.h"
 #include "Tracing.h"

diff --git a/JavaScriptCore/runtime/Arguments.h b/JavaScriptCore/runtime/Arguments.h
index 8a88158..8c52e05 100644 (file)
--- a/JavaScriptCore/runtime/Arguments.h
+++ b/JavaScriptCore/runtime/Arguments.h
@@ -27,7 +27,7 @@
 #include "JSActivation.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
-#include "Machine.h"
+#include "Interpreter.h"
 
 namespace JSC {
 

diff --git a/JavaScriptCore/runtime/ArrayPrototype.cpp b/JavaScriptCore/runtime/ArrayPrototype.cpp
index 6764e7d..719a141 100644 (file)
--- a/JavaScriptCore/runtime/ArrayPrototype.cpp
+++ b/JavaScriptCore/runtime/ArrayPrototype.cpp
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "ArrayPrototype.h"
 
-#include "Machine.h"
+#include "Interpreter.h"
 #include "ObjectPrototype.h"
 #include "Lookup.h"
 #include "Operations.h"

diff --git a/JavaScriptCore/runtime/Collector.cpp b/JavaScriptCore/runtime/Collector.cpp
index 15a83f5..d7b16c9 100644 (file)
--- a/JavaScriptCore/runtime/Collector.cpp
+++ b/JavaScriptCore/runtime/Collector.cpp
@@ -28,7 +28,7 @@
 #include "JSLock.h"
 #include "JSString.h"
 #include "JSValue.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Tracing.h"
 #include <algorithm>
 #include <setjmp.h>

diff --git a/JavaScriptCore/runtime/Completion.cpp b/JavaScriptCore/runtime/Completion.cpp
index 49afa46..b4a6cc1 100644 (file)
--- a/JavaScriptCore/runtime/Completion.cpp
+++ b/JavaScriptCore/runtime/Completion.cpp
@@ -26,7 +26,7 @@
 #include "ExecState.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Parser.h"
 #include "Debugger.h"
 #include <stdio.h>

diff --git a/JavaScriptCore/runtime/ExecState.h b/JavaScriptCore/runtime/ExecState.h
index 6493406..fc0fc42 100644 (file)
--- a/JavaScriptCore/runtime/ExecState.h
+++ b/JavaScriptCore/runtime/ExecState.h
@@ -26,7 +26,7 @@
 // FIXME: Rename this file to CallFrame.h.
 
 #include "JSGlobalData.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "ScopeChain.h"
 
 namespace JSC  {

diff --git a/JavaScriptCore/runtime/FunctionPrototype.cpp b/JavaScriptCore/runtime/FunctionPrototype.cpp
index fd9586e..dda201a 100644 (file)
--- a/JavaScriptCore/runtime/FunctionPrototype.cpp
+++ b/JavaScriptCore/runtime/FunctionPrototype.cpp
@@ -25,7 +25,7 @@
 #include "JSArray.h"
 #include "JSFunction.h"
 #include "JSString.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "PrototypeFunction.h"
 
 namespace JSC {

diff --git a/JavaScriptCore/runtime/JSActivation.cpp b/JavaScriptCore/runtime/JSActivation.cpp
index d00cfa6..46445b0 100644 (file)
--- a/JavaScriptCore/runtime/JSActivation.cpp
+++ b/JavaScriptCore/runtime/JSActivation.cpp
@@ -30,7 +30,7 @@
 #include "JSActivation.h"
 
 #include "Arguments.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "JSFunction.h"
 
 namespace JSC {

diff --git a/JavaScriptCore/runtime/JSFunction.cpp b/JavaScriptCore/runtime/JSFunction.cpp
index c7a69bf..ed3b2de 100644 (file)
--- a/JavaScriptCore/runtime/JSFunction.cpp
+++ b/JavaScriptCore/runtime/JSFunction.cpp
@@ -30,7 +30,7 @@
 #include "ExecState.h"
 #include "FunctionPrototype.h"
 #include "JSGlobalObject.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "ObjectPrototype.h"
 #include "Parser.h"
 #include "PropertyNameArray.h"

diff --git a/JavaScriptCore/runtime/JSGlobalData.cpp b/JavaScriptCore/runtime/JSGlobalData.cpp
index 2e5a175..22a812b 100644 (file)
--- a/JavaScriptCore/runtime/JSGlobalData.cpp
+++ b/JavaScriptCore/runtime/JSGlobalData.cpp
@@ -36,7 +36,7 @@
 #include "JSLock.h"
 #include "JSNotAnObject.h"
 #include "JSStaticScopeObject.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Parser.h"
 #include "Collector.h"
 #include "Lexer.h"

diff --git a/JavaScriptCore/runtime/JSGlobalObject.cpp b/JavaScriptCore/runtime/JSGlobalObject.cpp
index f377bf0..9dcbc08 100644 (file)
--- a/JavaScriptCore/runtime/JSGlobalObject.cpp
+++ b/JavaScriptCore/runtime/JSGlobalObject.cpp
@@ -49,7 +49,7 @@
 #include "GlobalEvalFunction.h"
 #include "JSGlobalObjectFunctions.h"
 #include "JSLock.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "MathObject.h"
 #include "NativeErrorConstructor.h"
 #include "NativeErrorPrototype.h"

diff --git a/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
index cd79f10..79b4b98 100644 (file)
--- a/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+++ b/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
@@ -29,7 +29,7 @@
 #include "GlobalEvalFunction.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "Parser.h"
 #include "dtoa.h"
 #include "Lexer.h"

diff --git a/JavaScriptCore/wrec/WREC.cpp b/JavaScriptCore/wrec/WREC.cpp
index 752295e..cef345a 100644 (file)
--- a/JavaScriptCore/wrec/WREC.cpp
+++ b/JavaScriptCore/wrec/WREC.cpp
@@ -29,7 +29,7 @@
 #if ENABLE(WREC)
 
 #include "CharacterClassConstructor.h"
-#include "Machine.h"
+#include "Interpreter.h"
 #include "pcre_internal.h"
 
 #define __ m_assembler.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a3c0b0..263d6bf 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,6 +1,21 @@
 2008-11-17  Geoffrey Garen  <ggaren@apple.com>
 
         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:
+
+2008-11-17  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
 
         Updated for JavaScriptCore renames.
 

diff --git a/WebCore/ForwardingHeaders/VM/Machine.h b/WebCore/ForwardingHeaders/VM/Machine.h
deleted file mode 100644 (file)
index c8ad975..0000000
--- a/WebCore/ForwardingHeaders/VM/Machine.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <JavaScriptCore/Machine.h>

diff --git a/WebCore/ForwardingHeaders/interpreter/Interpreter.h b/WebCore/ForwardingHeaders/interpreter/Interpreter.h
new file mode 100644 (file)
index 0000000..175ddce
--- /dev/null
+++ b/WebCore/ForwardingHeaders/interpreter/Interpreter.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/Interpreter.h>

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 83eeced..6c8b37f 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -90,6 +90,7 @@ DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1
 
 INCLUDEPATH += $$PWD $$PWD/../JavaScriptCore $$PWD/../JavaScriptCore/ForwardingHeaders \
                $$PWD/../JavaScriptCore/VM \
+               $$PWD/../JavaScriptCore/interpreter \
                $$PWD/../JavaScriptCore/bytecode \
                $$PWD/../JavaScriptCore/debugger \
                $$PWD/../JavaScriptCore/parser \

diff --git a/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp b/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
index 67956af..4df987b 100644 (file)
--- a/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
+++ b/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
@@ -43,7 +43,7 @@
 #include "JSFile.h"
 #include "XMLHttpRequest.h"
 #include <runtime/Error.h>
-#include <VM/Machine.h>
+#include <interpreter/Interpreter.h>
 
 using namespace JSC;
 

diff --git a/WebCore/page/Console.cpp b/WebCore/page/Console.cpp
index 5a4dcf4..617f413 100644 (file)
--- a/WebCore/page/Console.cpp
+++ b/WebCore/page/Console.cpp
@@ -42,7 +42,7 @@
 #include <runtime/ArgList.h>
 #include <runtime/Completion.h>
 #include <runtime/JSObject.h>
-#include <VM/Machine.h>
+#include <interpreter/Interpreter.h>
 #include <profiler/Profiler.h>
 #include <stdio.h>
 

diff --git a/WebCore/webcore-base.bkl b/WebCore/webcore-base.bkl
index 2a87d9e..c91defa 100644 (file)
--- a/WebCore/webcore-base.bkl
+++ b/WebCore/webcore-base.bkl
@@ -115,6 +115,7 @@ wxWebCore port Bakefile project file.
         <include>$(WK_ROOT)/JavaScriptCore/profiler</include>
         <include>$(WK_ROOT)/JavaScriptCore/runtime</include>
         <include>$(WK_ROOT)/JavaScriptCore/VM</include>
+        <include>$(WK_ROOT)/JavaScriptCore/interpreter</include>
         <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
 
         <sources>$(WEBCORE_BASE_SOURCES)</sources>

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index e7dc9bd..6d13ed4 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,5 +1,13 @@
 2008-11-17  Geoffrey Garen  <ggaren@apple.com>
 
+        Reviewed by Sam Weinig.
+        
+        Updated for JavaScriptCore renames.
+
+        * presets/wxwebkit.bkl:
+
+2008-11-17  Geoffrey Garen  <ggaren@apple.com>
+
         Not reviewed.
         
         Try to fix wx build.

diff --git a/WebKit/wx/presets/wxwebkit.bkl b/WebKit/wx/presets/wxwebkit.bkl
index 1c305ac..f709643 100644 (file)
--- a/WebKit/wx/presets/wxwebkit.bkl
+++ b/WebKit/wx/presets/wxwebkit.bkl
@@ -140,6 +140,7 @@ and WebCore. Include this file to use these settings.
         <include>$(WK_ROOT)/JavaScriptCore/profiler</include>
         <include>$(WK_ROOT)/JavaScriptCore/runtime</include>
         <include>$(WK_ROOT)/JavaScriptCore/VM</include>
+        <include>$(WK_ROOT)/JavaScriptCore/interpreter</include>
         <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
     </template>