Use clang-cl for assembling offlineasm on Windows

iangrunert · Constellation · commit 45da61538271 · 2024-05-14T09:56:38.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=274154 Reviewed by Yusuke Suzuki. Switched to the LLIntAssembly.h output approach for offlineasm on Windows. Cleanup of dead code in asm.rb and x86.rb left for a future change to make this easier to review and land. * Source/JavaScriptCore/CMakeLists.txt: * Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: * Source/JavaScriptCore/offlineasm/asm.rb: * Source/JavaScriptCore/offlineasm/x86.rb: * Source/WTF/wtf/InlineASM.h: * Source/cmake/OptionsMSVC.cmake: * Source/cmake/OptionsWin.cmake: Canonical link: https://commits.webkit.org/278767@main
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
@@ -441,12 +441,7 @@ WEBKIT_EXECUTABLE(LLIntOffsetsExtractor)
 # LLIntOffsetsExtractor matches, no output is generated. To make this target consistent and avoid
 # running this command for every build, we artificially update LLIntAssembly.h's mtime (using touch)
 # after every asm.rb run.
-if (MSVC AND NOT ENABLE_C_LOOP)
-    set(LLIntOutput LowLevelInterpreterWin.asm)
-    set(OFFLINE_ASM_ARGS --assembler=MASM)
-else ()
-    set(LLIntOutput LLIntAssembly.h)
-endif ()
+set(LLIntOutput LLIntAssembly.h)
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     set(OFFLINE_ASM_ARGS --binary-format=ELF)
@@ -465,20 +460,16 @@ add_custom_command(
 # the .cpp files below is similar to the one in the previous comment. However, since these .cpp
 # files are used to build JavaScriptCore itself, we can just add LLIntAssembly.h to JSC_HEADERS
 # since it is used in the add_library() call at the end of this file.
-if (MSVC AND WTF_CPU_X86_64 AND NOT ENABLE_C_LOOP)
-    list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm)
-    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp)
-else ()
-    # As there's poor toolchain support for using `.file` directives in
-    # inline asm (i.e. there's no way to avoid clashes with the `.file`
-    # directives generated by the C code in the compilation unit), we
-    # introduce a postprocessing pass for the asm that gets assembled into
-    # an object file. We only need to do this for LowLevelInterpreter.cpp
-    # and cmake doesn't allow us to introduce a compiler wrapper for a
-    # single source file, so we need to create a separate target for it.
-    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp
-        ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
-endif ()
+
+# As there's poor toolchain support for using `.file` directives in
+# inline asm (i.e. there's no way to avoid clashes with the `.file`
+# directives generated by the C code in the compilation unit), we
+# introduce a postprocessing pass for the asm that gets assembled into
+# an object file. We only need to do this for LowLevelInterpreter.cpp
+# and cmake doesn't allow us to introduce a compiler wrapper for a
+# single source file, so we need to create a separate target for it.
+add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp
+    ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
 
 # WebAssembly generator
 
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
@@ -483,7 +483,7 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
 
 } // namespace JSC
 
-#elif !COMPILER(MSVC)
+#else // !ENABLE(C_LOOP)
 
 //============================================================================
 // Define the opcode dispatch mechanism when using an ASM loop:
diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
@@ -385,7 +385,7 @@ def debugAnnotation(text)
     $enableDebugAnnotations = false
 end
 
-$emitWinAsm = isMSVC ? outputFlnm.index(".asm") != nil : false
+$emitWinAsm = false # TODO Cleanup unused emitWinAsm code paths
 $commentPrefix = $emitWinAsm ? ";" : "//"
 
 # We want this in all ELF systems we support, except for C_LOOP (we'll disable it later on if we are building cloop)
diff --git a/Source/JavaScriptCore/offlineasm/x86.rb b/Source/JavaScriptCore/offlineasm/x86.rb
@@ -115,6 +115,7 @@ def isMSVC
     $options.has_key?(:assembler) && $options[:assembler] == "MASM"
 end
 
+# TODO Cleanup unused isIntelSyntax paths
 def isIntelSyntax
     $options.has_key?(:assembler) && $options[:assembler] == "MASM"
 end
@@ -547,10 +548,10 @@ def x86LoadOperand(kind, dst)
         # FIXME: Implement this on platforms that aren't Mach-O.
         # https://bugs.webkit.org/show_bug.cgi?id=175104
         used
-        if !isIntelSyntax
+        if !isWin
             $asm.puts "movq #{asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
         else
-            $asm.puts "lea #{dst.x86Operand(:ptr)}, #{asmLabel}"
+            $asm.puts "lea #{asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
         end
         offsetRegister(offset, dst.x86Operand(:ptr))
     end
@@ -676,10 +677,10 @@ def x86Bytes(kind)
     def emitX86Lea(src, dst, kind)
         if src.is_a? LabelReference
             src.used
-            if !isIntelSyntax
+            if !isWin
                 $asm.puts "movq #{src.asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
             else
-                $asm.puts "lea #{dst.x86Operand(:ptr)}, #{src.asmLabel}"
+                $asm.puts "lea #{src.asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
             end
             if src.offset != 0
                 $asm.puts "add#{x86Suffix(kind)} #{orderOperands(const(src.offset), dst.x86Operand(kind))}"
diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
@@ -90,7 +90,8 @@
     || OS(HURD)                \
     || OS(NETBSD)              \
     || OS(QNX)                 \
-    || COMPILER(MINGW)
+    || COMPILER(MINGW)         \
+    || OS(WINDOWS)
     // GNU as-compatible syntax.
 #define LOCAL_LABEL_STRING(name) ".L" #name
 #endif
diff --git a/Source/cmake/OptionsMSVC.cmake b/Source/cmake/OptionsMSVC.cmake
@@ -191,10 +191,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${replace_CMAKE_SHARED_LINKER_FLAG
 string(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replace_CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO})
 set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${replace_CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO")
 
-# Setup MASM assembly
-enable_language(ASM_MASM)
-set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo /Cp /Fo <OBJECT> /c /Ta <SOURCE>")
-
 if (COMPILER_IS_CLANG_CL)
     # FIXME: Building with clang-cl seemed to fail with 128 bit int support
     set(HAVE_INT128_T OFF)
diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
@@ -115,7 +115,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOTIFICATIONS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
 
