2008-06-27 Adele Peterson <adele@apple.com>

        Reviewed by Geoff.

        Build fixes. 

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * VM/RegisterFile.h:
        (KJS::RegisterFile::RegisterFile):
        * kjs/JSGlobalObject.cpp:
        * kjs/collector.cpp:



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

JavaScriptCore/ChangeLog

+2008-06-27  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Geoff.
+
+        Build fixes. 
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * VM/RegisterFile.h:
+        (KJS::RegisterFile::RegisterFile):
+        * kjs/JSGlobalObject.cpp:
+        * kjs/collector.cpp:
+
 2008-06-27  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Oliver Hunt.

JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

@@ -272,14 +272,6 @@
 				RelativePath="..\..\kjs\Activation.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\kjs\JSArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\kjs\JSArray.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\kjs\ArrayPrototype.cpp"
 				>
@@ -364,14 +356,6 @@
 				RelativePath="..\..\kjs\ExecState.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\kjs\JSFunction.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\kjs\JSFunction.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\kjs\FunctionPrototype.cpp"
 				>
@@ -400,10 +384,6 @@
 				RelativePath="..\..\kjs\internal.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\kjs\JSString.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\kjs\interpreter.cpp"
 				>
@@ -420,6 +400,22 @@
 				RelativePath="..\..\kjs\JSActivation.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\kjs\JSArray.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\kjs\JSArray.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\kjs\JSFunction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\kjs\JSFunction.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\kjs\JSGlobalData.cpp"
 				>
@@ -460,10 +456,30 @@
 				RelativePath="..\..\kjs\JSNotAnObject.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\kjs\JSObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\kjs\JSObject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\kjs\JSString.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\kjs\JSType.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\kjs\JSValue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\kjs\JSValue.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\kjs\JSVariableObject.cpp"
 				>
@@ -520,14 +536,6 @@
 				RelativePath="..\..\kjs\NumberObject.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\kjs\JSObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\kjs\JSObject.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\kjs\object_object.cpp"
 				>
@@ -553,19 +561,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\kjs\PropertySlot.cpp"
+				RelativePath="..\..\kjs\PropertyNameArray.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\kjs\PropertySlot.h"
+				RelativePath="..\..\kjs\PropertyNameArray.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\kjs\PropertyNameArray.cpp"
+				RelativePath="..\..\kjs\PropertySlot.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\kjs\PropertyNameArray.h"
+				RelativePath="..\..\kjs\PropertySlot.h"
 				>
 			</File>
 			<File
@@ -632,14 +640,6 @@
 				RelativePath="..\..\kjs\ustring.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\kjs\JSValue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\kjs\JSValue.h"
-				>
-			</File>
 			<Filter
 				Name="DerivedSources"
 				>
@@ -1021,14 +1021,6 @@
 				RelativePath="..\..\VM\RegisterFile.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\VM\RegisterFileStack.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\VM\RegisterFileStack.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Debugger"

JavaScriptCore/VM/RegisterFile.h

@@ -122,7 +122,7 @@ namespace KJS {
             m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0));
 #elif HAVE(VIRTUALALLOC)
             // FIXME: Use VirtualAlloc, and commit pages as we go.
-            m_buffer = fastMalloc(bufferLength);
+            m_buffer = static_cast<Register*>(fastMalloc(bufferLength));
 #else
             #error "Don't know how to reserve virtual memory on this platform."
 #endif

JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -37,6 +37,7 @@
 #include "debugger.h"
 #include "error_object.h"
 #include "FunctionPrototype.h"
+#include "Machine.h"
 #include "MathObject.h"
 #include "NumberObject.h"
 #include "object_object.h"

JavaScriptCore/kjs/collector.cpp

@@ -24,8 +24,9 @@
 #include "ExecState.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
-#include "list.h"
 #include "JSValue.h"
+#include "list.h"
+#include "Machine.h"
 #include <algorithm>
 #include <setjmp.h>
 #include <stdlib.h>