Changeset 160062 in webkit

Timestamp:

Dec 3, 2013 5:18:19 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Fix LLINT_C_LOOP build for Win64.
​https://bugs.webkit.org/show_bug.cgi?id=125186.

Reviewed by Michael Saboff.

• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• jit/JITOperationsMSVC64.cpp: Added.

(JSC::getHostCallReturnValueWithExecState):

• Win64 will build JITStubMSVC64.asm even when !ENABLE(JIT). This results in a linkage error due to a missing getHostCallReturnValueWithExecState(). So, we add a stub getHostCallReturnValueWithExecState() here to satisfy that linkage. This function will never be called. The alternative to providing such a stub is to make the MSVC project recognize if the JIT is enabled or not, and exclude JITStubMSVC64.asm if it's not enabled. We don't currently set ENABLE(JIT) via the MSVC project and the work to do that is too much trouble for what we're trying to achieve here. So, we're opting for this simpler workaround instead.

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter.cpp:

(JSC::CLoop::execute):

• Don't build callToJavaScript if we're building the C loop. Otherwise, the C loop won't build if !ENABLE(COMPUTE_GOTO_OPCODES).

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (modified) (1 diff)
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (modified) (1 diff)
• jit/JITOperationsMSVC64.cpp (added)
• llint/LowLevelInterpreter.asm (modified) (2 diffs)
• llint/LowLevelInterpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-03  Mark Lam  <mark.lam@apple.com>
+
+        Fix LLINT_C_LOOP build for Win64.
+        https://bugs.webkit.org/show_bug.cgi?id=125186.
+
+        Reviewed by Michael Saboff.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+        * jit/JITOperationsMSVC64.cpp: Added.
+        (JSC::getHostCallReturnValueWithExecState):
+        - Win64 will build JITStubMSVC64.asm even when !ENABLE(JIT). This results
+          in a linkage error due to a missing getHostCallReturnValueWithExecState().
+          So, we add a stub getHostCallReturnValueWithExecState() here to satisfy
+          that linkage. This function will never be called.
+          The alternative to providing such a stub is to make the MSVC project
+          recognize if the JIT is enabled or not, and exclude JITStubMSVC64.asm
+          if it's not enabled. We don't currently set ENABLE(JIT) via the MSVC
+          project and the work to do that is too much trouble for what we're trying
+          to achieve here. So, we're opting for this simpler workaround instead.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter.cpp:
+        (JSC::CLoop::execute):
+        - Don't build callToJavaScript if we're building the C loop. Otherwise,
+          the C loop won't build if !ENABLE(COMPUTE_GOTO_OPCODES). 
+
 2013-12-03  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

@@ -479 +479 @@
     <ClCompile Include="..\jit\JITOpcodes32_64.cpp" />
     <ClCompile Include="..\jit\JITOperations.cpp" />
+    <ClCompile Include="..\jit\JITOperationsMSVC64.cpp" />
     <ClCompile Include="..\jit\JITPropertyAccess.cpp" />
     <ClCompile Include="..\jit\JITPropertyAccess32_64.cpp" />

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

@@ -1234 +1234 @@
       <Filter>jit</Filter>
     </ClCompile>
+    <ClCompile Include="..\jit\JITOperationsMSVC64.cpp">
+      <Filter>jit</Filter>
+    </ClCompile>
     <ClCompile Include="..\runtime\TestRunnerUtils.cpp">
       <Filter>runtime</Filter>

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -422 +422 @@
 end
 
+if C_LOOP
+else
 # stub to call into JavaScript
 # EncodedJSValue callToJavaScript(void* code, Register* topOfStack)
@@ -428 +430 @@
 _callToJavaScript:
     doCallToJavaScript()
+end
 
 # Indicate the beginning of LLInt.

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

@@ -310 +310 @@
     // 3. 64 bit result values will be in t0.
 
-    CLoopRegister t0, t1, t2, t3, a1;
+    CLoopRegister t0, t1, t2, t3;
 #if USE(JSVALUE64)
     CLoopRegister rBasePC, tagTypeNumber, tagMask;