Prasanth Ullattil <prasanth.ullattil@trolltech.com>

Fix compilation on Win64(2): Implemented currentThreadStackBase on X86-64 on Windows

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7739519..4b0df45 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Simon Hausmann <hausmann@webkit.org>.
 
+        Fix compilation on Win64(2): Implemented currentThreadStackBase on X86-64 on Windows
+        
+
+        * kjs/collector.cpp:
+        (KJS::Collector::heapAllocate):
+
+2008-01-18  Prasanth Ullattil  <prasanth.ullattil@trolltech.com>
+
+        Reviewed by Simon Hausmann <hausmann@webkit.org>.
+
         Fix compilation on Win64(1): Define WTF_PLATFORM_X86_64 correctly on Win64.
         
 

diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index cd7d9e9..fbb840b 100644 (file)
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -328,6 +328,9 @@ static inline void* currentThreadStackBase()
         MOV pTib, EAX
     }
     return (void*)pTib->StackBase;
+#elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
+    PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
+    return (void*)pTib->StackBase;
 #elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC)
     // offset 0x18 from the FS segment register gives a pointer to
     // the thread information block for the current thread