Changeset 165296 in webkit

Timestamp:

Mar 7, 2014 3:21:18 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[Win64] Compile error after r165128.
​https://bugs.webkit.org/show_bug.cgi?id=129807

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2014-03-07
Reviewed by Mark Lam.

Source/JavaScriptCore:

• JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:

Check platform environment variable to determine if an assembler file should be generated.

Source/WTF:

• wtf/Platform.h: MSVC does not support computed goto.

Also enabled COMPUTED_GOTO_OPCODES when !ENABLE(LLINT_C_LOOP). This is needed because the ASM LLINT operates like COMPUTED_GOTO_OPCODES,
and relies on the related data structures being defined to support this. On Win32, the platform does not HAVE_COMPUTED_GOTO support,
but does want ENABLE_COMPUTED_GOTO_OPCODES because it uses the ASM LLINT.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-03-07  peavo@outlook.com  <peavo@outlook.com>
+
+        [Win64] Compile error after r165128.
+        https://bugs.webkit.org/show_bug.cgi?id=129807
+
+        Reviewed by Mark Lam.
+
+        * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh: 
+        Check platform environment variable to determine if an assembler file should be generated.
+
 2014-03-07  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh

@@ -21 +21 @@
 cd "${BUILT_PRODUCTS_DIR}/JavaScriptCore/DerivedSources"
 
-##############################################################################
-# Step 3: Build LLIntOffsetsExtractor
-
 # Create a dummy asm file in case we are using the C backend
 # This is needed since LowLevelInterpreterWin.asm is part of the project.
+
 printf "END" > LowLevelInterpreterWin.asm
 
-# When enabling LLINT and switching to the x86 backend, use "LowLevelInterpreterWin.asm" as output file when running asm.rb.
+# Win32 is using the LLINT x86 backend, and should generate an assembler file.
+# Win64 is using the LLINT C backend, and should generate a header file.
 
-/usr/bin/env ruby "${SRCROOT}/offlineasm/asm.rb" "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntOffsetsExtractor/LLIntOffsetsExtractor${3}.exe" "LowLevelInterpreterWin.asm" || exit 1
+if [ "${PLATFORMARCHITECTURE}" == "32" ]; then
+    OUTPUTFILENAME="LowLevelInterpreterWin.asm"
+else
+    OUTPUTFILENAME="LLIntAssembly.h"
+fi
+
+/usr/bin/env ruby "${SRCROOT}/offlineasm/asm.rb" "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntOffsetsExtractor/LLIntOffsetsExtractor${3}.exe" "${OUTPUTFILENAME}" || exit 1

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-03-07  peavo@outlook.com  <peavo@outlook.com>
+
+        [Win64] Compile error after r165128.
+        https://bugs.webkit.org/show_bug.cgi?id=129807
+
+        Reviewed by Mark Lam.
+
+        * wtf/Platform.h: MSVC does not support computed goto.
+        Also enabled COMPUTED_GOTO_OPCODES when !ENABLE(LLINT_C_LOOP). This is needed because the ASM LLINT operates like COMPUTED_GOTO_OPCODES,
+        and relies on the related data structures being defined to support this. On Win32, the platform does not HAVE_COMPUTED_GOTO support,
+        but does want ENABLE_COMPUTED_GOTO_OPCODES because it uses the ASM LLINT.
+
 2014-03-06  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -791 +791 @@
 
 /* Configure the interpreter */
-#if COMPILER(GCC) || COMPILER(MSVC)
+#if COMPILER(GCC)
 #define HAVE_COMPUTED_GOTO 1
 #endif
 
 /* Determine if we need to enable Computed Goto Opcodes or not: */
-#if HAVE(COMPUTED_GOTO) && ENABLE(LLINT)
+#if HAVE(COMPUTED_GOTO) || !ENABLE(LLINT_C_LOOP)
 #define ENABLE_COMPUTED_GOTO_OPCODES 1
 #endif