Add support for building with ClangCL on Windows

Since ClangCL is compatible with MSVC this should get us almost there.

Ref: https://clang.llvm.org/docs/MSVCCompatibility.html

Author: saghul

.github/workflows/ci.yml

@@ -249,6 +249,28 @@ jobs:
         run: |
           make test
 
+  windows-clang:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: build
+        run: |
+          cmake -B build -G "Visual Studio 17 2022" -T ClangCL
+          cmake --build build --target qjs_exe
+      - name: stats
+        run: |
+          cmd /r build\Debug\qjs.exe -qd
+      - name: test
+        run: |
+          cmd /r build\Debug\qjs.exe tests\test_bigint.js
+          cmd /r build\Debug\qjs.exe tests\test_closure.js
+          cmd /r build\Debug\qjs.exe tests\test_language.js
+          cmd /r build\Debug\qjs.exe tests\test_builtin.js
+          cmd /r build\Debug\qjs.exe tests\test_loop.js
+          cmd /r build\Debug\qjs.exe tests\test_std.js
+          cmd /r build\Debug\qjs.exe tests\test_worker.js
+          cmd /r build\Debug\qjs.exe tests\test_queue_microtask.js
+
   windows-mingw:
     runs-on: windows-latest
     strategy:

CMakeLists.txt

@@ -30,8 +30,10 @@ macro(xcheck_add_c_compiler_flag FLAG)
 endmacro()
 
 xcheck_add_c_compiler_flag(-Wall)
-xcheck_add_c_compiler_flag(-Werror)
-xcheck_add_c_compiler_flag(-Wextra)
+if(NOT MSVC)
+    xcheck_add_c_compiler_flag(-Werror)
+    xcheck_add_c_compiler_flag(-Wextra)
+endif()
 xcheck_add_c_compiler_flag(-Wno-implicit-fallthrough)
 xcheck_add_c_compiler_flag(-Wno-sign-compare)
 xcheck_add_c_compiler_flag(-Wno-missing-field-initializers)
@@ -42,6 +44,19 @@ xcheck_add_c_compiler_flag(-Wno-array-bounds)
 xcheck_add_c_compiler_flag(-Wno-format-truncation)
 xcheck_add_c_compiler_flag(-funsigned-char)
 
+# ClangCL is command line compatible with MSVC, so 'MSVC' is set.
+if(MSVC)
+    xcheck_add_c_compiler_flag(-Wno-unsafe-buffer-usage)
+    xcheck_add_c_compiler_flag(-Wno-sign-conversion)
+    xcheck_add_c_compiler_flag(-Wno-nonportable-system-include-path)
+    xcheck_add_c_compiler_flag(-Wno-implicit-int-conversion)
+    xcheck_add_c_compiler_flag(-Wno-shorten-64-to-32)
+    xcheck_add_c_compiler_flag(-Wno-reserved-macro-identifier)
+    xcheck_add_c_compiler_flag(-Wno-reserved-identifier)
+    xcheck_add_c_compiler_flag(-Wdeprecated-declarations)
+    add_compile_definitions(WIN32_LEAN_AND_MEAN)
+endif()
+
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
     add_compile_options(-O0)
     xcheck_add_c_compiler_flag(-ggdb)
@@ -130,12 +145,12 @@ if(BUILD_QJS_LIBC)
     list(APPEND qjs_sources quickjs-libc.c)
 endif()
 list(APPEND qjs_defines _GNU_SOURCE)
-list(APPEND qjs_libs qjs m)
+list(APPEND qjs_libs qjs)
 if(NOT WIN32)
     list(APPEND qjs_libs dl)
 endif()
 if(NOT MSVC)
-    list(APPEND qjs_libs pthread)
+    list(APPEND qjs_libs m pthread)
 endif()
 
 add_library(qjs ${qjs_sources})
@@ -167,7 +182,7 @@ target_link_libraries(qjsc ${qjs_libs})
 
 add_custom_command(
     OUTPUT repl.c
-    COMMAND "${CMAKE_CURRENT_BINARY_DIR}/qjsc" -o ./repl.c -m ${CMAKE_CURRENT_SOURCE_DIR}/repl.js
+    COMMAND qjsc -o ./repl.c -m ${CMAKE_CURRENT_SOURCE_DIR}/repl.js
     DEPENDS qjsc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Compile repl.js to bytecode"
@@ -190,21 +205,23 @@ if(BUILD_STATIC_QJS_EXE OR MINGW)
         target_link_options(qjs_exe PRIVATE -static-libgcc)
     endif()
 endif()
-if(NOT MINGW)
+if(NOT WIN32)
     set_target_properties(qjs_exe PROPERTIES ENABLE_EXPORTS TRUE)
 endif()
 
 
 # Test262 runner
 #
 
-add_executable(run-test262
-    quickjs-libc.c
-    run-test262.c
-)
-target_compile_definitions(run-test262 PRIVATE ${qjs_defines})
-target_link_libraries(run-test262 ${qjs_libs})
-
+# run-test262 uses pthreads.
+if(NOT WIN32)
+    add_executable(run-test262
+        quickjs-libc.c
+        run-test262.c
+    )
+    target_compile_definitions(run-test262 PRIVATE ${qjs_defines})
+    target_link_libraries(run-test262 ${qjs_libs})
+endif()
 
 # Unicode generator
 #
@@ -220,10 +237,10 @@ target_compile_definitions(unicode_gen PRIVATE ${qjs_defines})
 # Examples
 #
 
-if(BUILD_EXAMPLES AND NOT MINGW)
+if(BUILD_EXAMPLES AND NOT WIN32)
     add_custom_command(
         OUTPUT hello.c
-        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/qjsc" -e -o hello.c ${CMAKE_CURRENT_SOURCE_DIR}/examples/hello.js
+        COMMAND qjsc -e -o hello.c ${CMAKE_CURRENT_SOURCE_DIR}/examples/hello.js
         DEPENDS qjsc
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Compile hello.js to a C file with bytecode embeddee"
@@ -239,7 +256,7 @@ if(BUILD_EXAMPLES AND NOT MINGW)
 
     add_custom_command(
         OUTPUT hello_module.c
-        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/qjsc" -e -o hello_module.c -m ${CMAKE_CURRENT_SOURCE_DIR}/examples/hello_module.js
+        COMMAND qjsc -e -o hello_module.c -m ${CMAKE_CURRENT_SOURCE_DIR}/examples/hello_module.js
         DEPENDS qjsc
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Compile hello_module.js to a C file with bytecode embeddee"
@@ -253,7 +270,7 @@ if(BUILD_EXAMPLES AND NOT MINGW)
     target_compile_definitions(hello_module PRIVATE ${qjs_defines})
     target_link_libraries(hello_module ${qjs_libs})
 
-    if(NOT MINGW)
+    if(NOT WIN32)
         add_library(fib MODULE examples/fib.c)
         set_target_properties(fib PROPERTIES
             PREFIX ""
@@ -287,7 +304,7 @@ if(BUILD_EXAMPLES AND NOT MINGW)
 
     add_custom_command(
         OUTPUT test_fib.c
-        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/qjsc" -e -o test_fib.c -M ${CMAKE_CURRENT_SOURCE_DIR}/examples/fib.so,fib -m ${CMAKE_CURRENT_SOURCE_DIR}/examples/test_fib.js
+        COMMAND qjsc -e -o test_fib.c -M ${CMAKE_CURRENT_SOURCE_DIR}/examples/fib.so,fib -m ${CMAKE_CURRENT_SOURCE_DIR}/examples/test_fib.js
         DEPENDS qjsc
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Compile test_fib.js to a C file with bytecode embedded"

cutils.c

@@ -22,10 +22,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include <time.h>
+#if !defined(_MSC_VER)
+#include <sys/time.h>
+#endif
 
 #include "cutils.h"
 
@@ -606,4 +611,67 @@ void rqsort(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
     }
 }
 
+#if defined(_MSC_VER)
+ // From: https://stackoverflow.com/a/26085827
+static int gettimeofday_msvc(struct timeval *tp, struct timezone *tzp)
+{
+  static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL);
+
+  SYSTEMTIME  system_time;
+  FILETIME    file_time;
+  uint64_t    time;
+
+  GetSystemTime(&system_time);
+  SystemTimeToFileTime(&system_time, &file_time);
+  time = ((uint64_t)file_time.dwLowDateTime);
+  time += ((uint64_t)file_time.dwHighDateTime) << 32;
+
+  tp->tv_sec = (long)((time - EPOCH) / 10000000L);
+  tp->tv_usec = (long)(system_time.wMilliseconds * 1000);
+
+  return 0;
+}
+
+uint64_t js__hrtime_ns(void) {
+    LARGE_INTEGER counter, frequency;
+    double scaled_freq;
+    double result;
+
+    if (!QueryPerformanceFrequency(&frequency))
+        abort();
+    assert(frequency.QuadPart != 0);
+
+    if (!QueryPerformanceCounter(&counter))
+        abort();
+    assert(counter.QuadPart != 0);
+
+  /* Because we have no guarantee about the order of magnitude of the
+   * performance counter interval, integer math could cause this computation
+   * to overflow. Therefore we resort to floating point math.
+   */
+  scaled_freq = (double) frequency.QuadPart / 1e9;
+  result = (double) counter.QuadPart / scaled_freq;
+  return (uint64_t) result;
+}
+#else
+uint64_t js__hrtime_ns(void) {
+  struct timespec t;
+
+  if (clock_gettime(CLOCK_MONOTONIC, &t))
+    abort();
+
+  return t.tv_sec * (uint64_t) 1e9 + t.tv_nsec;
+}
+#endif
+
+int64_t js__gettimeofday_us(void) {
+    struct timeval tv;
+#if defined(_MSC_VER)
+    gettimeofday_msvc(&tv, NULL);
+#else
+    gettimeofday(&tv, NULL);
+#endif
+    return ((int64_t)tv.tv_sec * 1000000) + tv.tv_usec;
+}
+
 #pragma GCC visibility pop

cutils.h

@@ -31,6 +31,14 @@
 /* set if CPU is big endian */
 #undef WORDS_BIGENDIAN
 
+#if defined(_MSC_VER)
+#include <windows.h>
+#include <winsock2.h>
+#include <malloc.h>
+#define alloca _alloca
+#define ssize_t ptrdiff_t
+#endif
+
 #define likely(x)       __builtin_expect(!!(x), 1)
 #define unlikely(x)     __builtin_expect(!!(x), 0)
 #define force_inline inline __attribute__((always_inline))
@@ -320,4 +328,7 @@ void rqsort(void *base, size_t nmemb, size_t size,
             int (*cmp)(const void *, const void *, void *),
             void *arg);
 
+int64_t js__gettimeofday_us(void);
+uint64_t js__hrtime_ns(void);
+
 #endif  /* CUTILS_H */