/* GNU Objective C Runtime Miscellaneous
- Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
Contrbuted by Kresten Krab Thorup
This file is part of GNU CC.
#define __USE_FIXED_PROTOTYPES__
#include <stdlib.h>
-
-#ifdef __alpha__
-extern int write (int, const char*, int);
-extern size_t strlen (const char*);
-#endif
-
#include "runtime.h"
-void objc_error(id object, const char* fmt, va_list);
+/*
+** Error handler function
+** NULL so that default is to just print to stderr
+*/
+static objc_error_handler _objc_error_handler = NULL;
+
+/* Trigger an objc error */
+void
+objc_error(id object, int code, const char* fmt, ...)
+{
+ va_list ap;
-void (*_objc_error)(id, const char*, va_list) = objc_error;
+ va_start(ap, fmt);
+ objc_verror(object, code, fmt, ap);
+ va_end(ap);
+}
+/* Trigger an objc error */
void
-objc_error(id object, const char* fmt, va_list ap)
+objc_verror(id object, int code, const char* fmt, va_list ap)
{
- vfprintf (stderr, fmt, ap);
- abort ();
+ BOOL result = NO;
+
+ /* Call the error handler if its there
+ Otherwise print to stderr */
+ if (_objc_error_handler)
+ result = (*_objc_error_handler)(object, code, fmt, ap);
+ else
+ vfprintf (stderr, fmt, ap);
+
+ /* Continue if the error handler says its ok
+ Otherwise abort the program */
+ if (result)
+ return;
+ else
+ abort();
}
-volatile void
-objc_fatal(const char* msg)
+/* Set the error handler */
+objc_error_handler
+objc_set_error_handler(objc_error_handler func)
{
- write(2, msg, (int)strlen((const char*)msg));
- abort();
+ objc_error_handler temp = _objc_error_handler;
+ _objc_error_handler = func;
+ return temp;
}
/*
{
void* res = (void*) (*_objc_malloc)(size);
if(!res)
- objc_fatal("Virtual memory exhausted\n");
+ objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
return res;
}
{
void* res = (void*) (*_objc_atomic_malloc)(size);
if(!res)
- objc_fatal("Virtual memory exhausted\n");
+ objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
return res;
}
{
void* res = (void*) (*_objc_valloc)(size);
if(!res)
- objc_fatal("Virtual memory exhausted\n");
+ objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
return res;
}
{
void* res = (void*) (*_objc_realloc)(mem, size);
if(!res)
- objc_fatal("Virtual memory exhausted\n");
+ objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
return res;
}
{
void* res = (void*) (*_objc_calloc)(nelem, size);
if(!res)
- objc_fatal("Virtual memory exhausted\n");
+ objc_error(nil, OBJC_ERR_MEMORY, "Virtual memory exhausted\n");
return res;
}