msvc baremetal build fix

Author: nesbox

cutils.h

@@ -29,11 +29,28 @@
 #include <string.h>
 #include <inttypes.h>
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
+/* set if CPU is big endian */
+#undef WORDS_BIGENDIAN
+
+#if defined(__GNUC__) || defined(__clang__)
 #define likely(x)       __builtin_expect(!!(x), 1)
 #define unlikely(x)     __builtin_expect(!!(x), 0)
 #define force_inline inline __attribute__((always_inline))
 #define no_inline __attribute__((noinline))
 #define __maybe_unused __attribute__((unused))
+#else
+#define likely(x)       (x)
+#define unlikely(x)     (x)
+#define force_inline inline
+#define no_inline
+#define __maybe_unused
+#define __attribute__(x)
+#define __attribute(x)
+#endif
 
 #define xglue(x, y) x ## y
 #define glue(x, y) xglue(x, y)
@@ -128,25 +145,49 @@ static inline int64_t min_int64(int64_t a, int64_t b)
 /* WARNING: undefined if a = 0 */
 static inline int clz32(unsigned int a)
 {
+#ifdef _MSC_VER
+    unsigned long idx;
+    _BitScanReverse(&idx, a);
+    return 31 ^ idx;
+#else
     return __builtin_clz(a);
+#endif
 }
 
 /* WARNING: undefined if a = 0 */
 static inline int clz64(uint64_t a)
 {
+#ifdef _MSC_VER
+    unsigned long idx;
+    _BitScanReverse64(&idx, a);
+    return 63 ^ idx;
+#else
     return __builtin_clzll(a);
+#endif
 }
 
 /* WARNING: undefined if a = 0 */
 static inline int ctz32(unsigned int a)
 {
+#ifdef _MSC_VER
+    unsigned long idx;
+    _BitScanForward(&idx, a);
+    return 31 ^ idx;
+#else
     return __builtin_ctz(a);
+#endif
 }
 
 /* WARNING: undefined if a = 0 */
 static inline int ctz64(uint64_t a)
 {
+#ifdef _MSC_VER
+    unsigned long idx;
+    _BitScanForward64(&idx, a);
+    return 63 ^ idx;
+#else
     return __builtin_ctzll(a);
+#endif
 }
 
 struct __attribute__((packed)) packed_u64 {

qjs.c

@@ -28,7 +28,11 @@
 #include <inttypes.h>
 #include <string.h>
 #include <assert.h>
+
+#if !defined(_MSC_VER)
 #include <unistd.h>
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
 #include <time.h>

qjsc.c

@@ -27,7 +27,11 @@
 #include <inttypes.h>
 #include <string.h>
 #include <assert.h>
+
+#if !defined(_MSC_VER)
 #include <unistd.h>
+#endif
+
 #include <errno.h>
 #if !defined(_WIN32)
 #include <sys/wait.h>
@@ -521,6 +525,80 @@ static const char *get_short_optarg(int *poptind, int opt,
     return optarg;
 }
 
+#if defined(_MSC_VER)
+
+static int opterr = 1;             /* if error message should be printed */
+static int optind = 1;             /* index into parent argv vector */
+static int optopt;                 /* character checked for validity */
+static int optreset;               /* reset getopt */
+static char* optarg;                /* argument associated with option */
+
+#define BADCH   (int)'?'
+#define BADARG  (int)':'
+#define EMSG    ""
+
+/*
+ * getopt --
+ *      Parse argc/argv argument vector.
+ */
+static int getopt(int nargc, char* const nargv[], const char* ostr)
+{
+    static char* place = EMSG;              /* option letter processing */
+    const char* oli;                              /* option letter list index */
+
+    if (optreset || !*place) {              /* update scanning pointer */
+        optreset = 0;
+        if (optind >= nargc || *(place = nargv[optind]) != '-') {
+            place = EMSG;
+            return (-1);
+        }
+        if (place[1] && *++place == '-') {      /* found "--" */
+            ++optind;
+            place = EMSG;
+            return (-1);
+        }
+    }                                       /* option letter okay? */
+    if ((optopt = (int)*place++) == (int)':' ||
+        !(oli = strchr(ostr, optopt))) {
+        /*
+        * if the user didn't specify '-' as an option,
+        * assume it means -1.
+        */
+        if (optopt == (int)'-')
+            return (-1);
+        if (!*place)
+            ++optind;
+        if (opterr && *ostr != ':')
+            (void)printf("illegal option -- %c\n", optopt);
+        return (BADCH);
+    }
+    if (*++oli != ':') {                    /* don't need argument */
+        optarg = NULL;
+        if (!*place)
+            ++optind;
+    }
+    else {                                  /* need an argument */
+        if (*place)                     /* no white space */
+            optarg = place;
+        else if (nargc <= ++optind) {   /* no arg */
+            place = EMSG;
+            if (*ostr == ':')
+                return (BADARG);
+            if (opterr)
+                (void)printf("option requires an argument -- %c\n", optopt);
+            return (BADCH);
+        }
+        else                            /* white space */
+            optarg = nargv[optind];
+        place = EMSG;
+        ++optind;
+    }
+    return (optopt);                        /* dump back option letter */
+}
+
+#endif
+
+
 int main(int argc, char **argv)
 {
     int i, verbose, strip_flags;

quickjs-libc.c

@@ -28,10 +28,16 @@
 #include <inttypes.h>
 #include <string.h>
 #include <assert.h>
+#if defined(_MSC_VER)
+#include <winsock.h>
+#include <sys/utime.h>
+#else
 #include <unistd.h>
+#include <sys/time.h>
+#include <utime.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/time.h>
 #include <time.h>
 #include <signal.h>
 #include <limits.h>
@@ -40,7 +46,6 @@
 #if defined(_WIN32)
 #include <windows.h>
 #include <conio.h>
-#include <utime.h>
 #else
 #include <dlfcn.h>
 #include <termios.h>
@@ -72,6 +77,13 @@ typedef sig_t sighandler_t;
 #include <stdatomic.h>
 #endif
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#define pclose(...) _pclose(__VA_ARGS__)
+#define popen(...) _popen(__VA_ARGS__)
+#endif
+
 #include "cutils.h"
 #include "list.h"
 #include "quickjs-libc.h"
@@ -2011,6 +2023,24 @@ static int64_t get_time_ns(void)
     clock_gettime(CLOCK_MONOTONIC, &ts);
     return (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
 }
+
+#elif defined(_MSC_VER)
+static int64_t get_time_ms(void)
+{
+    return GetTickCount();
+}
+
+static int64_t get_time_ns(void)
+{
+    LARGE_INTEGER frequency;
+    LARGE_INTEGER counter;
+
+    QueryPerformanceFrequency(&frequency);
+    QueryPerformanceCounter(&counter);
+
+    return counter.QuadPart * 1000000000 / frequency.QuadPart;
+}
+
 #else
 /* more portable, but does not work if the date is updated */
 static int64_t get_time_ms(void)
@@ -2721,7 +2751,7 @@ static JSValue js_os_stat(JSContext *ctx, JSValueConst this_val,
     return make_obj_error(ctx, obj, err);
 }
 
-#if !defined(_WIN32)
+#if defined(_MSC_VER) || !defined(_WIN32)
 static void ms_to_timeval(struct timeval *tv, uint64_t v)
 {
     tv->tv_sec = v / 1000;