Changeset 85813 in webkit

Timestamp:

May 4, 2011 5:23:54 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-04 Fridrich Strba <​fridrich.strba@bluewin.ch>

Reviewed by Geoffrey Garen.

Port MachineStackMarker.cpp to Windows x64
​https://bugs.webkit.org/show_bug.cgi?id=60216

• heap/MachineStackMarker.cpp: (JSC::getPlatformThreadRegisters): the CONTEXT struct is usable also on 64-bit Windows. (JSC::otherThreadStackPointer): return the Rsp register on Windows x64.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/MachineStackMarker.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Geoffrey Garen.
+
+        Port MachineStackMarker.cpp to Windows x64
+        https://bugs.webkit.org/show_bug.cgi?id=60216
+
+        * heap/MachineStackMarker.cpp:
+        (JSC::getPlatformThreadRegisters): the CONTEXT struct is usable also
+        on 64-bit Windows.
+        (JSC::otherThreadStackPointer): return the Rsp register on Windows x64.
+
 2011-05-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
 

trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp

@@ -324 +324 @@
 #endif
 
-#elif OS(WINDOWS) && CPU(X86)
+#elif OS(WINDOWS)
 typedef CONTEXT PlatformThreadRegisters;
 #elif USE(PTHREADS)
@@ -364 +364 @@
 // end OS(DARWIN)
 
-#elif OS(WINDOWS) && CPU(X86)
+#elif OS(WINDOWS)
     regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL | CONTEXT_SEGMENTS;
     GetThreadContext(platformThread, &regs);
@@ -418 +418 @@
 #elif CPU(X86) && OS(WINDOWS)
     return reinterpret_cast<void*>((uintptr_t) regs.Esp);
+#elif CPU(X86_64) && OS(WINDOWS)
+    return reinterpret_cast<void*>((uintptr_t) regs.Rsp);
 #elif USE(PTHREADS)
     void* stackBase = 0;