Changeset 2204 for trunk/src/emx/include

Timestamp:

Jul 4, 2005, 3:17:39 AM (20 years ago)

Author:

bird

Message:

panic enh.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• emx/umalloc.h (modified) (1 diff, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -38 +38 @@
 #include <signal.h>
 #include <emx/io.h>
+#include <stdarg.h>
 
 
@@ -1040 +1041 @@
 /** @} */
 
+
+/** @defgroup grp_Back_panic    LIBC Backend - Panic Routines
+ * @{ */
+
+/** The panic was caused by a signal. Drop the LIBC PANIC line. */
+#define __LIBC_PANIC_SIGNAL         1
+/** Don't set the SPM termination code / status. When set the caller is
+ * responsible for doing this. */
+#define __LIBC_PANIC_NO_SPM_TERM    2
+
+/**
+ * Print a panic message and dump/kill the process.
+ *
+ * @param   fFlags      A combination of the __LIBC_PANIC_* defines.
+ * @param   pvCtx       Pointer to a context record if available. This is a PCONTEXTRECORD.
+ * @param   pszFormat   User message which may contain %s and %x.
+ * @param   ...         String pointers and unsigned intergers as specified by the %s and %x in pszFormat.
+ */
+void __libc_Back_panic(unsigned fFlags, void *pvCtx, const char *pszFormat, ...) __attribute__((__noreturn__));
+
+/**
+ * Print a panic message and dump/kill the process.
+ *
+ * @param   fFlags      A combination of the __LIBC_PANIC_* defines.
+ * @param   pvCtx       Pointer to a context record if available. This is a PCONTEXTRECORD.
+ * @param   pszFormat   User message which may contain %s and %x.
+ * @param   args        String pointers and unsigned intergers as specified by the %s and %x in pszFormat.
+ */
+void __libc_Back_panicV(unsigned fFlags, void *pvCtx, const char *pszFormat, va_list args) __attribute__((__noreturn__));
+
+/* @} */
+
 __END_DECLS
 

trunk/src/emx/include/emx/umalloc.h

@@ -807 +807 @@
 
 
-static __inline__ void _um_abort (const char *pszmsg)
-{
-  /* Use the 'syscall' write for safest possible path. */
-  extern int __write (int handle, const void *buf, size_t nbytes);
-  __write (2, "\r\n!_um_abort!", 13);
-  if (pszmsg)
-    {
-      const char *psz = pszmsg;
-      while (*psz)
-        psz++;
-      __write (2, " ", 1);
-      __write (2, pszmsg, psz - pszmsg);
-    }
-  __write (2, "\r\n", 2);
-  __asm__ __volatile__ ("int $3");
-}
-
+void _um_abort (const char *, ...)  __attribute__((__noreturn__));
 
 #if defined (__cplusplus)