gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 17:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

mingw fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24464 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-02-04 12:53:43 +00:00
parent edcf9400aa
commit 10dc034618
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Source/NSDebug.m
View file

@ -872,7 +872,7 @@ unsigned NSCountFrames(void)
* functions are not reliable (at least not on my EM64T based system) and * functions are not reliable (at least not on my EM64T based system) and
* will sometimes walk off the stack and access illegal memory locations. * will sometimes walk off the stack and access illegal memory locations.
* In order to prevent such an occurrance from crashing the application, * In order to prevent such an occurrance from crashing the application,
* we use sigsetjmp() and siglongjmp() to ensure that we can recover, and * we use setjmp() and longjmp() to ensure that we can recover, and
* we keep the jump buffer in thread-local memory to avoid possible thread * we keep the jump buffer in thread-local memory to avoid possible thread
* safety issues. * safety issues.
* Of course this will fail horribly if an exception occurs in one of the * Of course this will fail horribly if an exception occurs in one of the
@ -880,7 +880,11 @@ unsigned NSCountFrames(void)
*/ */
#include <signal.h> #include <signal.h>
static sigjmp_buf * #if defined(__MINGW32__)
#include <setjmp.h>
#endif
static jmp_buf *
jbuf() jbuf()
{ {
NSMutableData *d; NSMutableData *d;
@ -888,34 +892,35 @@ jbuf()
d = [[[NSThread currentThread] threadDictionary] objectForKey: @"GSjbuf"]; d = [[[NSThread currentThread] threadDictionary] objectForKey: @"GSjbuf"];
if (d == nil) if (d == nil)
{ {
d = [[NSMutableData alloc] initWithLength: sizeof(sigjmp_buf)]; d = [[NSMutableData alloc] initWithLength:
sizeof(jmp_buf) + sizeof(void(*)(int))];
[[[NSThread currentThread] threadDictionary] setObject: d [[[NSThread currentThread] threadDictionary] setObject: d
forKey: @"GSjbuf"]; forKey: @"GSjbuf"];
RELEASE(d); RELEASE(d);
} }
return (sigjmp_buf*)[d mutableBytes]; return (jmp_buf*)[d mutableBytes];
} }
static void static void
recover(int sig) recover(int sig)
{ {
sigjmp_buf *env = jbuf(); jmp_buf *env = jbuf();
siglongjmp(*env, 1); longjmp(*env, 1);
} }
void * void *
NSFrameAddress(int offset) NSFrameAddress(int offset)
{ {
sigjmp_buf *env; jmp_buf *env;
void (*old)(int);
void *val; void *val;
env = jbuf(); env = jbuf();
if (sigsetjmp(*env, 1) == 0) if (setjmp(*env) == 0)
{ {
void (*old)(int);
old = signal(SIGSEGV, recover); old = signal(SIGSEGV, recover);
memcpy(env + 1, &old, sizeof(old));
switch (offset) switch (offset)
{ {
_NS_FRAME_HACK(0); _NS_FRAME_HACK(1); _NS_FRAME_HACK(2); _NS_FRAME_HACK(0); _NS_FRAME_HACK(1); _NS_FRAME_HACK(2);
@ -958,6 +963,9 @@ NSFrameAddress(int offset)
} }
else else
{ {
env = jbuf();
memcpy(&old, env + 1, sizeof(old));
signal(SIGSEGV, old);
val = NULL; val = NULL;
} }
return val; return val;
@ -966,15 +974,15 @@ NSFrameAddress(int offset)
void * void *
NSReturnAddress(int offset) NSReturnAddress(int offset)
{ {
sigjmp_buf *env; jmp_buf *env;
void (*old)(int);
void *val; void *val;
env = jbuf(); env = jbuf();
if (sigsetjmp(*env, 1) == 0) if (setjmp(*env) == 0)
{ {
void (*old)(int);
old = signal(SIGSEGV, recover); old = signal(SIGSEGV, recover);
memcpy(env + 1, &old, sizeof(old));
switch (offset) switch (offset)
{ {
_NS_RETURN_HACK(0); _NS_RETURN_HACK(1); _NS_RETURN_HACK(2); _NS_RETURN_HACK(0); _NS_RETURN_HACK(1); _NS_RETURN_HACK(2);
@ -1017,6 +1025,9 @@ NSReturnAddress(int offset)
} }
else else
{ {
env = jbuf();
memcpy(&old, env + 1, sizeof(old));
signal(SIGSEGV, old);
val = NULL; val = NULL;
} }

12
Source/NSException.m
View file

@ -368,11 +368,11 @@ static void find_address (bfd *abfd, asection *section,
@end @end
static BOOL LoadModule(NSString *filename); static BOOL GSLoadModule(NSString *filename);
// this method automatically load the current process + GNUstep base & gui. // this method automatically load the current process + GNUstep base & gui.
static NSMutableDictionary * static NSMutableDictionary *
GetStackModules() GSGetStackModules()
{ {
static NSMutableDictionary *stackModules = nil; static NSMutableDictionary *stackModules = nil;
@ -398,7 +398,7 @@ GetStackModules()
{ {
if ([bundle load] == YES) if ([bundle load] == YES)
{ {
LoadModule([bundle executablePath]); GSLoadModule([bundle executablePath]);
} }
} }
} }
@ -407,11 +407,11 @@ GetStackModules()
// initialize stack trace info // initialize stack trace info
static BOOL static BOOL
LoadModule(NSString *filename) GSLoadModule(NSString *filename)
{ {
if ([filename length] > 0) if ([filename length] > 0)
{ {
NSMutableDictionary *modules = GetStackModules(); NSMutableDictionary *modules = GSGetStackModules();
if ([modules objectForKey: filename] == nil) if ([modules objectForKey: filename] == nil)
{ {
@ -495,7 +495,7 @@ LoadModule(NSString *filename)
int m; int m;
frames = [[NSMutableArray alloc] init]; frames = [[NSMutableArray alloc] init];
modules = [GetStackModules() allValues]; modules = [GSGetStackModules() allValues];
n = NSCountFrames(); n = NSCountFrames();
m = [modules count]; m = [modules count];