2002-05-13 Marcus Brinkmann <marcus@gnu.org>

[platform/upstream/glibc.git] / hurd / catch-exc.c

diff --git a/hurd/catch-exc.c b/hurd/catch-exc.c
index 9eef252..2e0cfef 100644 (file)
--- a/hurd/catch-exc.c
+++ b/hurd/catch-exc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,96,97,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,7 @@
 
 #include <mach/exc_server.h>
 #include <hurd/signal.h>
+#include <assert.h>
 
 /* Called by the microkernel when a thread gets an exception.  */
 
@@ -25,9 +26,15 @@ kern_return_t
 _S_catch_exception_raise (mach_port_t port,
                          thread_t thread,
                          task_t task,
-                         int exception,
-                         int code,
-                         int subcode)
+#ifdef EXC_MASK_ALL            /* New interface flavor.  */
+                         exception_type_t exception,
+                         exception_data_t code,
+                         mach_msg_type_number_t codeCnt
+#else                          /* Vanilla Mach 3.0 interface.  */
+                         integer_t exception,
+                         integer_t code, integer_t subcode
+#endif
+                         )
 {
   struct hurd_sigstate *ss;
   int signo;
@@ -38,8 +45,14 @@ _S_catch_exception_raise (mach_port_t port,
     return EPERM;
 
   d.exc = exception;
+#ifdef EXC_MASK_ALL
+  assert (codeCnt >= 2);
+  d.exc_code = code[0];
+  d.exc_subcode = code[1];
+#else
   d.exc_code = code;
   d.exc_subcode = subcode;
+#endif
 
   /* Call the machine-dependent function to translate the Mach exception
      codes into a signal number and subcode.  */
@@ -79,3 +92,41 @@ _S_catch_exception_raise (mach_port_t port,
 
   return KERN_SUCCESS;
 }
+
+#ifdef EXC_MASK_ALL
+/* XXX New interface flavor has additional RPCs that we could be using
+   instead.  These RPCs roll a thread_get_state/thread_set_state into
+   the message, so the signal thread ought to use these to save some calls.
+ */
+kern_return_t
+_S_catch_exception_raise_state (mach_port_t port,
+                               exception_type_t exception,
+                               exception_data_t code,
+                               mach_msg_type_number_t codeCnt,
+                               int *flavor,
+                               thread_state_t old_state,
+                               mach_msg_type_number_t old_stateCnt,
+                               thread_state_t new_state,
+                               mach_msg_type_number_t *new_stateCnt)
+{
+  abort ();
+  return KERN_FAILURE;
+}
+
+kern_return_t
+_S_catch_exception_raise_state_identity (mach_port_t exception_port,
+                                        thread_t thread,
+                                        task_t task,
+                                        exception_type_t exception,
+                                        exception_data_t code,
+                                        mach_msg_type_number_t codeCnt,
+                                        int *flavor,
+                                        thread_state_t old_state,
+                                        mach_msg_type_number_t old_stateCnt,
+                                        thread_state_t new_state,
+                                        mach_msg_type_number_t *new_stateCnt)
+{
+  abort ();
+  return KERN_FAILURE;
+}
+#endif