2008-11-17 Geoffrey Garen <ggaren@apple.com>
Reviewed by Sam Weinig.
Moved:
VM/ExceptionHelpers.h => runtime/ExceptionHelpers.h
VM/Register.h => interpreter/Register.h
VM/RegisterFile.h => interpreter/RegisterFile.h
* GNUmakefile.am:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* VM/ExceptionHelpers.h: Removed.
* VM/Register.h: Removed.
* VM/RegisterFile.h: Removed.
* interpreter/Register.h: Copied from VM/Register.h.
* interpreter/RegisterFile.h: Copied from VM/RegisterFile.h.
* runtime/ExceptionHelpers.h: Copied from VM/ExceptionHelpers.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38514 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 22f1ce2..7d708ce 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,25 @@
2008-11-17 Geoffrey Garen <ggaren@apple.com>
+ Reviewed by Sam Weinig.
+
+ Moved:
+ VM/ExceptionHelpers.h => runtime/ExceptionHelpers.h
+ VM/Register.h => interpreter/Register.h
+ VM/RegisterFile.h => interpreter/RegisterFile.h
+
+
+ * GNUmakefile.am:
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * VM/ExceptionHelpers.h: Removed.
+ * VM/Register.h: Removed.
+ * VM/RegisterFile.h: Removed.
+ * interpreter/Register.h: Copied from VM/Register.h.
+ * interpreter/RegisterFile.h: Copied from VM/RegisterFile.h.
+ * runtime/ExceptionHelpers.h: Copied from VM/ExceptionHelpers.h.
+
+2008-11-17 Geoffrey Garen <ggaren@apple.com>
+
Not reviewed.
Try to fix Qt build.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 9563e14..9a19602 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -78,14 +78,14 @@
JavaScriptCore/bytecode/CodeBlock.h \
JavaScriptCore/bytecode/EvalCodeCache.h \
JavaScriptCore/VM/ExceptionHelpers.cpp \
- JavaScriptCore/VM/ExceptionHelpers.h \
+ JavaScriptCore/runtime/ExceptionHelpers.h \
JavaScriptCore/bytecode/Instruction.h \
JavaScriptCore/bytecompiler/Label.h \
JavaScriptCore/interpreter/Interpreter.cpp \
JavaScriptCore/interpreter/Interpreter.h \
JavaScriptCore/bytecode/Opcode.cpp \
JavaScriptCore/bytecode/Opcode.h \
- JavaScriptCore/VM/Register.h \
+ JavaScriptCore/interpreter/Register.h \
JavaScriptCore/bytecompiler/RegisterID.h \
JavaScriptCore/VM/SamplingTool.cpp \
JavaScriptCore/VM/SamplingTool.h \
@@ -231,7 +231,7 @@
javascriptcore_sources += \
JavaScriptCore/VM/RegisterFile.cpp \
- JavaScriptCore/VM/RegisterFile.h \
+ JavaScriptCore/interpreter/RegisterFile.h \
JavaScriptCore/bytecompiler/BytecodeGenerator.cpp \
JavaScriptCore/bytecompiler/BytecodeGenerator.h \
JavaScriptCore/bytecompiler/LabelScope.h \
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 28d622a..1997930 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -1266,7 +1266,7 @@
>
</File>
<File
- RelativePath="..\..\VM\ExceptionHelpers.h"
+ RelativePath="..\..\interpreter\ExceptionHelpers.h"
>
</File>
<File
@@ -1298,7 +1298,7 @@
>
</File>
<File
- RelativePath="..\..\VM\Register.h"
+ RelativePath="..\..\interpreter\Register.h"
>
</File>
<File
@@ -1306,7 +1306,7 @@
>
</File>
<File
- RelativePath="..\..\VM\RegisterFile.h"
+ RelativePath="..\..\interpreter\RegisterFile.h"
>
</File>
<File
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index c086bfa..54e7304 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -426,7 +426,7 @@
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>"; };
- 149B24FF0D8AF6D1009CB8C7 /* Register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Register.h; path = VM/Register.h; sourceTree = "<group>"; };
+ 149B24FF0D8AF6D1009CB8C7 /* Register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Register.h; sourceTree = "<group>"; };
14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolTable.h; sourceTree = "<group>"; };
14ABB36E099C076400E2A24F /* JSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSValue.h; sourceTree = "<group>"; };
14ABB454099C2A0F00E2A24F /* JSType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSType.h; sourceTree = "<group>"; };
@@ -440,7 +440,7 @@
14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSContextRef.h; sourceTree = "<group>"; };
14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSValueRef.cpp; sourceTree = "<group>"; };
14BD5A2D0A3E91F600BAF59C /* testapi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testapi.c; path = API/tests/testapi.c; sourceTree = "<group>"; };
- 14D792640DAA03FB001A9F05 /* RegisterFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterFile.h; path = VM/RegisterFile.h; sourceTree = "<group>"; };
+ 14D792640DAA03FB001A9F05 /* RegisterFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterFile.h; sourceTree = "<group>"; };
14D792650DAA03FB001A9F05 /* RegisterFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterFile.cpp; path = VM/RegisterFile.cpp; sourceTree = "<group>"; };
14D857740A4696C80032146C /* testapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = testapi.js; path = API/tests/testapi.js; sourceTree = "<group>"; };
14DA818E0D99FD2000B0A4FB /* JSActivation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSActivation.h; sourceTree = "<group>"; };
@@ -595,7 +595,7 @@
969A09220ED1E09C00F1F681 /* Completion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Completion.cpp; sourceTree = "<group>"; };
A72700770DAC605600E548D7 /* JSNotAnObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNotAnObject.h; sourceTree = "<group>"; };
A72700780DAC605600E548D7 /* JSNotAnObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNotAnObject.cpp; sourceTree = "<group>"; };
- A72701B30DADE94900E548D7 /* ExceptionHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExceptionHelpers.h; path = VM/ExceptionHelpers.h; sourceTree = "<group>"; };
+ A72701B30DADE94900E548D7 /* ExceptionHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionHelpers.h; sourceTree = "<group>"; };
A72701B40DADE94900E548D7 /* ExceptionHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExceptionHelpers.cpp; path = VM/ExceptionHelpers.cpp; sourceTree = "<group>"; };
A727FF650DA3053B00E548D7 /* JSPropertyNameIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPropertyNameIterator.h; sourceTree = "<group>"; };
A727FF660DA3053B00E548D7 /* JSPropertyNameIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPropertyNameIterator.cpp; sourceTree = "<group>"; };
@@ -878,6 +878,8 @@
children = (
1429D7D30ED2128200B89619 /* Interpreter.cpp */,
1429D77B0ED20D7300B89619 /* Interpreter.h */,
+ 149B24FF0D8AF6D1009CB8C7 /* Register.h */,
+ 14D792640DAA03FB001A9F05 /* RegisterFile.h */,
);
path = interpreter;
sourceTree = "<group>";
@@ -957,10 +959,7 @@
8683B02B0E636482004C19EE /* CTI.cpp */,
8683B02C0E636482004C19EE /* CTI.h */,
A72701B40DADE94900E548D7 /* ExceptionHelpers.cpp */,
- A72701B30DADE94900E548D7 /* ExceptionHelpers.h */,
- 149B24FF0D8AF6D1009CB8C7 /* Register.h */,
14D792650DAA03FB001A9F05 /* RegisterFile.cpp */,
- 14D792640DAA03FB001A9F05 /* RegisterFile.h */,
8613F4580E3A433E00C948FD /* SamplingTool.cpp */,
8613F4590E3A433E00C948FD /* SamplingTool.h */,
);
@@ -1162,6 +1161,7 @@
BC02E98B0E183E38000F9297 /* ErrorInstance.h */,
BC02E9060E1839DB000F9297 /* ErrorPrototype.cpp */,
BC02E9070E1839DB000F9297 /* ErrorPrototype.h */,
+ A72701B30DADE94900E548D7 /* ExceptionHelpers.h */,
14BD53F40A3E12D800BAF59C /* ExecState.cpp */,
14BD53F30A3E12D800BAF59C /* ExecState.h */,
BC2680C00E16D4E900A06E92 /* FunctionConstructor.cpp */,
diff --git a/JavaScriptCore/VM/Register.h b/JavaScriptCore/interpreter/Register.h
similarity index 100%
rename from JavaScriptCore/VM/Register.h
rename to JavaScriptCore/interpreter/Register.h
diff --git a/JavaScriptCore/VM/RegisterFile.h b/JavaScriptCore/interpreter/RegisterFile.h
similarity index 100%
rename from JavaScriptCore/VM/RegisterFile.h
rename to JavaScriptCore/interpreter/RegisterFile.h
diff --git a/JavaScriptCore/VM/ExceptionHelpers.h b/JavaScriptCore/runtime/ExceptionHelpers.h
similarity index 100%
rename from JavaScriptCore/VM/ExceptionHelpers.h
rename to JavaScriptCore/runtime/ExceptionHelpers.h
