gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

emergency fixup for broken build

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30907 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-07-01 07:17:53 +00:00
parent 6b73dea2f3
commit 6f1e7e3af3
3 changed files with 62 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

97
Source/CXXException.m
View file

@ -1,4 +1,5 @@
#if defined(__has_include) && __has_include(<objc/hooks.h>)
#if defined(__has_include)
#if __has_include(<objc/hooks.h>)
#import "Foundation/NSObject.h"
#import "Additions/GNUstepBase/CXXException.h"
#include <objc/runtime.h>
@ -9,7 +10,7 @@
typedef enum
{
_URC_FOREIGN_EXCEPTION_CAUGHT = 1
_URC_FOREIGN_EXCEPTION_CAUGHT = 1
} _Unwind_Reason_Code;
struct _Unwind_Exception;
@ -18,10 +19,10 @@ typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code,
struct _Unwind_Exception *);
struct _Unwind_Exception
{
uint64_t exception_class;
_Unwind_Exception_Cleanup_Fn exception_cleanup;
unsigned long private_1;
unsigned long private_2;
uint64_t exception_class;
_Unwind_Exception_Cleanup_Fn exception_cleanup;
unsigned long private_1;
unsigned long private_2;
} __attribute__((__aligned__));
_Unwind_Reason_Code _Unwind_Resume_or_Rethrow(struct _Unwind_Exception *);
@ -29,20 +30,19 @@ _Unwind_Reason_Code _Unwind_Resume_or_Rethrow(struct _Unwind_Exception *);
struct __cxa_exception
{
void* exceptionType;
void (*exceptionDestructor) (void *);
void (*unexpectedHandler) (void *);
void (*terminateHandler) (void *);
void * nextException;
void *exceptionType;
void (*exceptionDestructor) (void *);
void (*unexpectedHandler) (void *);
void (*terminateHandler) (void *);
void *nextException;
int handlerCount;
int handlerSwitchValue;
const char * actionRecord;
const char * languageSpecificData;
void * catchTemp;
void * adjustedPtr;
struct _Unwind_Exception unwindHeader;
int handlerCount;
int handlerSwitchValue;
const char * actionRecord;
const char * languageSpecificData;
void * catchTemp;
void * adjustedPtr;
struct _Unwind_Exception unwindHeader;
};
@implementation CXXException
@ -50,48 +50,49 @@ static Class CXXExceptionClass;
// TODO: Add an API for registering other classes for other exception types
static Class boxClass(int64_t foo)
{
if (foo == *(int64_t*)"GNUCC++\0")
{
return CXXExceptionClass;
}
return Nil;
if (foo == *(int64_t*)"GNUCC++\0")
{
return CXXExceptionClass;
}
return Nil;
}
+ (void)load
+ (void) load
{
CXXExceptionClass = self;
_objc_class_for_boxing_foreign_exception = boxClass;
CXXExceptionClass = self;
_objc_class_for_boxing_foreign_exception = boxClass;
}
+ (id)exceptionWithForeignException: (struct _Unwind_Exception*)ex
+ (id) exceptionWithForeignException: (struct _Unwind_Exception*)ex
{
CXXException *box = [self new];
box->ex = ex;
return [box autorelease];
CXXException *box = [self new];
box->ex = ex;
return [box autorelease];
}
- (void*)thrownValue
- (void*) thrownValue
{
return ex+1;
return ex + 1;
}
- (void*)cxx_type_info
- (void*) cxx_type_info
{
char *ptr = (char*)ex;
ptr -= __builtin_offsetof(struct __cxa_exception, unwindHeader);
return ((struct __cxa_exception*)ptr)->exceptionType;
char *ptr = (char*)ex;
ptr -= __builtin_offsetof(struct __cxa_exception, unwindHeader);
return ((struct __cxa_exception*)ptr)->exceptionType;
}
- (void)rethrow
- (void) rethrow
{
struct _Unwind_Exception *re = ex;
// We aren't allowed to hold onto the exception if it's been rethrown.
ex = 0;
_Unwind_Resume_or_Rethrow(re);
struct _Unwind_Exception *re = ex;
// We aren't allowed to hold onto the exception if it's been rethrown.
ex = 0;
_Unwind_Resume_or_Rethrow(re);
}
- (void)dealloc
- (void) dealloc
{
if (0 != ex && 0 != ex->exception_cleanup)
{
ex->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, ex);
}
[super dealloc];
if (0 != ex && 0 != ex->exception_cleanup)
{
ex->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, ex);
}
[super dealloc];
}
@end
#endif
#endif