Make more emscripten compatibility improvements

See #8

Author: jart

blink/blink.c

@@ -16,11 +16,11 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "blink/web.h"
 #include <unistd.h>
 
 #include "blink/assert.h"
@@ -156,11 +156,12 @@ static void HandleSigs(void) {
 #endif
 }
 
-int main(int argc, char *argv[], char **envp) {
+int main(int argc, char *argv[]) {
+  SetupWeb();
   g_blink_path = argc > 0 ? argv[0] : 0;
   GetOpts(argc, argv);
   if (optind_ == argc) PrintUsage(argc, argv, 48, 2);
   WriteErrorInit();
   HandleSigs();
-  return Exec(argv[optind_], argv + optind_, envp);
+  return Exec(argv[optind_], argv + optind_, environ);
 }

blink/blink.mk

@@ -14,11 +14,6 @@ ifneq ($(MODE), prof)
 o/$(MODE)/blink/uop.o: private CFLAGS += -fomit-frame-pointer
 endif
 
-# x86.c doesn't understand VEX encoding right now
-ifeq ($(HOST_ARCH), x86_64)
-o/$(MODE)/blink/uop.o: private TARGET_ARCH = -march=k8
-endif
-
 # vectorization makes code smaller
 o/$(MODE)/blink/sse2.o: private CFLAGS += -O3
 o/$(MODE)/x86_64/blink/sse2.o: private CFLAGS += -O3

blink/blinkenlights.c

@@ -34,6 +34,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <wchar.h>
+#include "blink/web.h"
 #include <wctype.h>
 
 #include "blink/assert.h"
@@ -3659,6 +3660,7 @@ int main(int argc, char *argv[]) {
   int rc;
   struct System *s;
   static struct sigaction sa;
+  SetupWeb();
   g_blink_path = argc > 0 ? argv[0] : 0;
   react = true;
   tuimode = true;

blink/close.c

@@ -38,7 +38,7 @@ static int CloseFd(struct System *s, struct Fd *fd) {
     if (fd->dirstream) {
       rc = closedir(fd->dirstream);
     } else {
-      rc = IB(fd->cb->close)(sf);
+      rc = fd->cb->close(sf);
     }
     // EINTR shouldn't be possible since we don't support SO_LINGER
     unassert(!(rc == -1 && errno == EINTR));

blink/debug.h

@@ -6,17 +6,6 @@
 #include "blink/machine.h"
 #include "blink/types.h"
 
-#if !defined(NDEBUG) && defined(__GNUC__)
-#define IB(x)                      \
-  __extension__({                  \
-    __typeof__(x) x_ = (x);        \
-    unassert((intptr_t)x_ > 4096); \
-    x_;                            \
-  })
-#else
-#define IB(x) (x)
-#endif
-
 void DumpHex(u8 *, size_t);
 void PrintFds(struct Fds *);
 void LogCpu(struct Machine *);

blink/end.h

@@ -3,7 +3,7 @@
 #include "blink/jit.h"
 #include "blink/mop.h"
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__EMSCRIPTEN__)
 #define IMAGE_END ((u8 *)&StartJit)
 #else
 extern u8 end[];

blink/ioports.c

@@ -29,7 +29,7 @@ static int OpE9Read(struct Machine *m) {
   struct Fd *fd;
   struct iovec t = {&b, 1};
   if (!(fd = GetAndLockFd(m, 0))) return -1;
-  if (IB(fd->cb->readv)(fd->systemfd, &t, 1) == 1) {
+  if (fd->cb->readv(fd->systemfd, &t, 1) == 1) {
     return b;
   } else {
     return -1;
@@ -41,7 +41,7 @@ static int OpE9Write(struct Machine *m, u8 b) {
   struct Fd *fd;
   struct iovec t = {&b, 1};
   if (!(fd = GetAndLockFd(m, 1))) return -1;
-  rc = IB(fd->cb->writev)(fd->systemfd, &t, 1);
+  rc = fd->cb->writev(fd->systemfd, &t, 1);
   UnlockFd(fd);
   return rc;
 }
@@ -53,7 +53,7 @@ static int OpE9Poll(struct Machine *m) {
   if (!(fd = GetAndLockFd(m, 0))) return -1;
   pf.fd = fd->systemfd;
   pf.events = POLLIN | POLLOUT;
-  rc = IB(fd->cb->poll)(&pf, 1, 20);
+  rc = fd->cb->poll(&pf, 1, 20);
   if (rc > 0) rc = pf.revents;
   UnlockFd(fd);
   return rc;

blink/memorymalloc.c

@@ -64,6 +64,10 @@ void FreeBig(void *p, size_t n) {
 
 void *AllocateBig(size_t n) {
   void *p;
+#if defined(__EMSCRIPTEN__)
+  p = Mmap(NULL, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0, "big");
+  return p != MAP_FAILED ? p : 0;
+#else
   u8 *brk;
   if (!(brk = atomic_load_explicit(&g_allocator.brk, memory_order_relaxed))) {
     // we're going to politely ask the kernel for addresses starting
@@ -87,6 +91,7 @@ void *AllocateBig(size_t n) {
              MAP_DEMAND | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0, "big");
   } while (p == MAP_FAILED && errno == MAP_DENIED);
   return p != MAP_FAILED ? p : 0;
+#endif
 }
 
 static void FreeHostPages(struct System *s) {

blink/oneoff.c

@@ -29,47 +29,6 @@
 #include "blink/types.h"
 #include "blink/util.h"
 
-static u64 Vigna(u64 s[1]) {
-  u64 z = (s[0] += 0x9e3779b97f4a7c15);
-  z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;
-  z = (z ^ (z >> 27)) * 0x94d049bb133111eb;
-  return z ^ (z >> 31);
-}
-
-_Noreturn void TerminateSignal(struct Machine *m, int sig) {
-  abort();
-}
-
-u16 add16(u16 x, u16 y, bool *cf, bool *zf) {
-  u16 z = x + y;
-  *cf = z < y;
-  *zf = !z;
-  return z;
-}
-
-u8 add8(u8 x, u8 y, bool *cf, bool *zf) {
-  u8 z = x + y;
-  *cf = z < y;
-  *zf = !z;
-  return z;
-}
-
 int main(int argc, char *argv[]) {
-  int x, y;
-  for (x = -128; x < 127; ++x) {
-    for (y = -128; y < 127; ++y) {
-      u8 z1, z2;
-      bool cf1, cf2;
-      bool zf1, zf2;
-      z1 = add8((i8)x, (i8)y, &cf1, &zf1);
-      z2 = add16((i8)x, (i8)y, &cf2, &zf2);
-      unassert(z1 == z2);
-      unassert(cf1 == cf2);
-      if (zf1 != zf2) {
-        LOGF("%d %d", x, y);
-      }
-      unassert(zf1 == zf2);
-    }
-  }
   return 0;
 }

blink/syscall.c

@@ -1119,7 +1119,7 @@ static i64 SysReadImpl(struct Machine *m, struct Fd *fd, i64 addr, u64 size) {
   unassert(fd->cb);
   InitIovs(&iv);
   if ((rc = AppendIovsReal(m, &iv, addr, size)) != -1) {
-    INTERRUPTIBLE(rc = IB(fd->cb->readv)(fd->systemfd, iv.p, iv.i));
+    INTERRUPTIBLE(rc = fd->cb->readv(fd->systemfd, iv.p, iv.i));
     if (rc != -1) SetWriteAddr(m, addr, rc);
   }
   FreeIovs(&iv);
@@ -1132,7 +1132,7 @@ static i64 SysWriteImpl(struct Machine *m, struct Fd *fd, i64 addr, u64 size) {
   unassert(fd->cb);
   InitIovs(&iv);
   if ((rc = AppendIovsReal(m, &iv, addr, size)) != -1) {
-    INTERRUPTIBLE(rc = IB(fd->cb->writev)(fd->systemfd, iv.p, iv.i));
+    INTERRUPTIBLE(rc = fd->cb->writev(fd->systemfd, iv.p, iv.i));
     if (rc != -1) SetReadAddr(m, addr, rc);
   }
   FreeIovs(&iv);
@@ -1213,7 +1213,7 @@ static i64 SysReadv(struct Machine *m, i32 fildes, i64 iovaddr, i32 iovlen) {
   unassert(fd->cb);
   InitIovs(&iv);
   if ((rc = AppendIovsGuest(m, &iv, iovaddr, iovlen)) != -1) {
-    INTERRUPTIBLE(rc = IB(fd->cb->readv)(fd->systemfd, iv.p, iv.i));
+    INTERRUPTIBLE(rc = fd->cb->readv(fd->systemfd, iv.p, iv.i));
   }
   UnlockFd(fd);
   FreeIovs(&iv);
@@ -1228,7 +1228,7 @@ static i64 SysWritev(struct Machine *m, i32 fildes, i64 iovaddr, i32 iovlen) {
   unassert(fd->cb);
   InitIovs(&iv);
   if ((rc = AppendIovsGuest(m, &iv, iovaddr, iovlen)) != -1) {
-    INTERRUPTIBLE(rc = IB(fd->cb->writev)(fd->systemfd, iv.p, iv.i));
+    INTERRUPTIBLE(rc = fd->cb->writev(fd->systemfd, iv.p, iv.i));
   }
   UnlockFd(fd);
   FreeIovs(&iv);
@@ -1412,7 +1412,7 @@ static int SysIoctl(struct Machine *m, int fildes, u64 request, i64 addr) {
   int (*func)(int, unsigned long, ...);
   if (!(fd = GetAndLockFd(m, fildes))) return -1;
   unassert(fd->cb);
-  func = IB(fd->cb->ioctl);
+  func = fd->cb->ioctl;
   systemfd = atomic_load_explicit(&fd->systemfd, memory_order_relaxed);
   switch (request) {
     case TIOCGWINSZ_LINUX:
@@ -1761,7 +1761,12 @@ static int SysWait4(struct Machine *m, int pid, i64 opt_out_wstatus_addr,
   struct rusage hrusage;
   struct rusage_linux grusage;
   if ((options = XlatWait(options)) == -1) return -1;
+#if !defined(__EMSCRIPTEN__)
   INTERRUPTIBLE(rc = wait4(pid, &wstatus, options, &hrusage));
+#else
+  memset(&hrusage, 0, sizeof(hrusage));
+  INTERRUPTIBLE(rc = waitpid(pid, &wstatus, options));
+#endif
   if (rc != -1) {
     if (opt_out_wstatus_addr) {
       CopyToUserWrite(m, opt_out_wstatus_addr, &wstatus, sizeof(wstatus));
@@ -2191,7 +2196,7 @@ static int SysPoll(struct Machine *m, i64 fdsaddr, u64 nfds, i32 timeout_ms) {
             hfds[0].events = (((ev & POLLIN_LINUX) ? POLLIN : 0) |
                               ((ev & POLLOUT_LINUX) ? POLLOUT : 0) |
                               ((ev & POLLPRI_LINUX) ? POLLPRI : 0));
-            switch (IB(fd->cb->poll)(hfds, 1, 0)) {
+            switch (fd->cb->poll(hfds, 1, 0)) {
               case 0:
                 Write16(gfds[i].revents, 0);
                 break;

blink/web.h

@@ -0,0 +1,13 @@
+#ifndef BLINK_WEB_H_
+#define BLINK_WEB_H_
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+
+static void SetupWeb(void) {
+  // EM_ASM({FS.mkdir("/cwd"); FS.mount(NODEFS, {root : "."}, "/cwd");});
+}
+
+#else
+static void SetupWeb(void) {}
+#endif /* __EMSCRIPTEN__ */
+#endif /* BLINK_WEB_H_ */