Move to JS implementation of proc_raise

Author: RReverser

emcc.py

@@ -2966,6 +2966,10 @@ def get_full_import_name(name):
     # in standalone mode, crt1 will call the constructors from inside the wasm
     settings.REQUIRED_EXPORTS.append('__wasm_call_ctors')
 
+  if not settings.MINIMAL_RUNTIME:
+    # For proc_raise to stringify signals.
+    settings.REQUIRED_EXPORTS.append('strsignal')
+
   settings.PRE_JS_FILES = [os.path.abspath(f) for f in options.pre_js]
   settings.POST_JS_FILES = [os.path.abspath(f) for f in options.post_js]
 

src/generated_struct_info32.json

@@ -373,8 +373,40 @@
         "SEEK_CUR": 1,
         "SEEK_END": 2,
         "SEEK_SET": 0,
+        "SIGABRT": 6,
         "SIGALRM": 14,
+        "SIGBUS": 7,
         "SIGCANCEL": 33,
+        "SIGCHLD": 17,
+        "SIGCONT": 18,
+        "SIGFPE": 8,
+        "SIGHUP": 1,
+        "SIGILL": 4,
+        "SIGINT": 2,
+        "SIGIO": 29,
+        "SIGIOT": 6,
+        "SIGKILL": 9,
+        "SIGPIPE": 13,
+        "SIGPOLL": 29,
+        "SIGPROF": 27,
+        "SIGPWR": 30,
+        "SIGQUIT": 3,
+        "SIGSEGV": 11,
+        "SIGSTKFLT": 16,
+        "SIGSTOP": 19,
+        "SIGSYS": 31,
+        "SIGTERM": 15,
+        "SIGTRAP": 5,
+        "SIGTSTP": 20,
+        "SIGTTIN": 21,
+        "SIGTTOU": 22,
+        "SIGURG": 23,
+        "SIGUSR1": 10,
+        "SIGUSR2": 12,
+        "SIGVTALRM": 26,
+        "SIGWINCH": 28,
+        "SIGXCPU": 24,
+        "SIGXFSZ": 25,
         "SOCK_CLOEXEC": 524288,
         "SOCK_DGRAM": 2,
         "SOCK_NONBLOCK": 2048,

src/library_wasi.js

@@ -563,6 +563,48 @@ var WasiLibrary = {
 #endif // SYSCALLS_REQUIRE_FILESYSTEM
   },
   fd_sync__async: true,
+
+  proc_raise__deps: [
+#if !MINIMAL_RUNTIME
+    'strsignal',
+#endif
+    'proc_exit'
+  ],
+  proc_raise: (sig) => {
+    // Default handler actions ~auto-generated from https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/signal.h.html.
+    // Note that stop and continue actions are not supported and treated as ignored.
+    switch (sig) {
+      case {{{ cDefs.SIGABRT }}}:
+      case {{{ cDefs.SIGBUS }}}:
+      case {{{ cDefs.SIGFPE }}}:
+      case {{{ cDefs.SIGILL }}}:
+      case {{{ cDefs.SIGQUIT }}}:
+      case {{{ cDefs.SIGSEGV }}}:
+      case {{{ cDefs.SIGSYS }}}:
+      case {{{ cDefs.SIGTRAP }}}:
+      case {{{ cDefs.SIGXCPU }}}:
+      case {{{ cDefs.SIGXFSZ }}}:
+#if !MINIMAL_RUNTIME
+        EXITSTATUS = 128 + sig;
+        // TODO: abort should raise a signal (SIGABRT) instead of raise invoking abort.
+        sig = 'Signal: ' + UTF8ToString(_strsignal(sig));
+#endif
+        abort(sig);
+      case {{{ cDefs.SIGALRM }}}:
+      case {{{ cDefs.SIGHUP }}}:
+      case {{{ cDefs.SIGINT }}}:
+      case {{{ cDefs.SIGKILL }}}:
+      case {{{ cDefs.SIGPIPE }}}:
+      case {{{ cDefs.SIGTERM }}}:
+      case {{{ cDefs.SIGUSR1 }}}:
+      case {{{ cDefs.SIGUSR2 }}}:
+      case {{{ cDefs.SIGPOLL }}}:
+      case {{{ cDefs.SIGPROF }}}:
+      case {{{ cDefs.SIGVTALRM }}}:
+        _proc_exit(128 + sig);
+    }
+    return 0;
+  },
 };
 
 for (var x in WasiLibrary) {

src/struct_info.json

@@ -274,7 +274,39 @@
     {
         "file": "signal.h",
         "defines": [
-            "SIGALRM"
+            "SIGHUP",
+            "SIGINT",
+            "SIGQUIT",
+            "SIGILL",
+            "SIGTRAP",
+            "SIGABRT",
+            "SIGIOT",
+            "SIGBUS",
+            "SIGFPE",
+            "SIGKILL",
+            "SIGUSR1",
+            "SIGSEGV",
+            "SIGUSR2",
+            "SIGPIPE",
+            "SIGALRM",
+            "SIGTERM",
+            "SIGSTKFLT",
+            "SIGCHLD",
+            "SIGCONT",
+            "SIGSTOP",
+            "SIGTSTP",
+            "SIGTTIN",
+            "SIGTTOU",
+            "SIGURG",
+            "SIGXCPU",
+            "SIGXFSZ",
+            "SIGVTALRM",
+            "SIGPROF",
+            "SIGWINCH",
+            "SIGIO",
+            "SIGPOLL",
+            "SIGPWR",
+            "SIGSYS"
         ]
     },
     {

system/lib/libc/raise.c

@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <signal.h>
+#include "syscall.h"
 
 #include "emscripten_internal.h"
 
@@ -17,39 +18,6 @@ extern sigset_t __sig_pending;
 
 bool __sig_is_blocked(int sig);
 
-// Default handler actions ~auto-generated from https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/signal.h.html.
-// Note that stop and continue actions are not supported and treated as ignored.
-
-typedef enum {
-  ACTION_IGNORE = 0,
-  ACTION_TERMINATE,
-  ACTION_ABORT,
-} default_action_t;
-
-static default_action_t default_actions[_NSIG] = {
-  [SIGABRT] = ACTION_ABORT,
-  [SIGALRM] = ACTION_TERMINATE,
-  [SIGBUS] = ACTION_ABORT,
-  [SIGFPE] = ACTION_ABORT,
-  [SIGHUP] = ACTION_TERMINATE,
-  [SIGILL] = ACTION_ABORT,
-  [SIGINT] = ACTION_TERMINATE,
-  [SIGKILL] = ACTION_TERMINATE,
-  [SIGPIPE] = ACTION_TERMINATE,
-  [SIGQUIT] = ACTION_ABORT,
-  [SIGSEGV] = ACTION_ABORT,
-  [SIGTERM] = ACTION_TERMINATE,
-  [SIGUSR1] = ACTION_TERMINATE,
-  [SIGUSR2] = ACTION_TERMINATE,
-  [SIGPOLL] = ACTION_TERMINATE,
-  [SIGPROF] = ACTION_TERMINATE,
-  [SIGSYS] = ACTION_ABORT,
-  [SIGTRAP] = ACTION_ABORT,
-  [SIGVTALRM] = ACTION_TERMINATE,
-  [SIGXCPU] = ACTION_ABORT,
-  [SIGXFSZ] = ACTION_ABORT,
-};
-
 int raise(int sig) {
   if (__sig_is_blocked(sig)) {
     sigaddset(&__sig_pending, sig);
@@ -61,18 +29,9 @@ int raise(int sig) {
   } else {
     void (*handler)(int) = __sig_actions[sig].sa_handler;
     if (handler == SIG_DFL) {
-      switch (default_actions[sig]) {
-        case ACTION_IGNORE:
-          break;
-        case ACTION_TERMINATE:
-          // Intentionally exiting via a function that doesn't call atexit handlers.
-          _Exit(128 + sig);
-        case ACTION_ABORT:
-          // TODO: should this integrate with `Module['onAbort'] once `abort` is migrated
-          // to raise SIGABRT as per spec?
-          __builtin_trap();
-      }
-    } else if (handler != SIG_IGN) {
+      return __wasi_syscall_ret(__wasi_proc_raise(sig));
+    }
+    if (handler != SIG_IGN) {
         // Avoid a direct call to the handler, and instead call via JS so we can
         // avoid strict signature checking.
         // https://github.com/emscripten-core/posixtestsuite/issues/6

test/test_core.py

@@ -6181,15 +6181,11 @@ def test_signals(self):
     self.do_core_test(test_file('test_signals.c'))
 
   @parameterized({
-    'sigint': ('sigint', signal.SIGINT, 128 + signal.SIGINT, True, ['EXIT_RUNTIME']),
-    'sigabrt': ('sigabrt', signal.SIGABRT, NON_ZERO, False, ['EXIT_RUNTIME']),
-    # TODO: @also_with_standalone_wasm() should work with @parameterized() as a matrix.
-    'sigint_standalone': ('sigint', signal.SIGINT, 128 + signal.SIGINT, True, ['PURE_WASI']),
-    'sigabrt_standalone': ('sigabrt', signal.SIGABRT, NON_ZERO, False, ['PURE_WASI']),
+    'sigint': ('sigint', signal.SIGINT, 128 + signal.SIGINT, True),
+    'sigabrt': ('sigabrt', signal.SIGABRT, NON_ZERO, False),
   })
-  def test_sig_default(self, suffix, signal, exit_code, assert_identical, settings):
-    for setting in settings:
-      self.set_setting(setting)
+  def test_sig_default(self, suffix, signal, exit_code, assert_identical):
+    self.set_setting('EXIT_RUNTIME')
     self.do_run_from_file(
       test_file('test_sig_default.c'),
       test_file(f'test_sig_default_{suffix}.out'),

test/test_sig_default_sigabrt.out

@@ -1 +1,2 @@
-RuntimeError: unreachable
+1
+Aborted(Signal: Aborted)