Index: Source/NSInvocation.m =================================================================== --- Source/NSInvocation.m (revision 28458) +++ Source/NSInvocation.m (working copy) @@ -660,82 +660,7 @@ */ - (void) invokeWithTarget: (id)anObject { - id old_target; - retval_t returned; - IMP imp; - int stack_argsize; - - - CLEAR_RETURN_VALUE_IF_OBJECT; - _validReturn = NO; - - /* - * A message to a nil object returns nil. - */ - if (anObject == nil) - { - _validReturn = YES; - memset(_retval, '\0', _info[0].size); /* Clear return value */ - return; - } - - NSAssert(_selector != 0, @"you must set the selector before invoking"); - - /* - * Temporarily set new target and copy it (and the selector) into the - * _cframe. - */ - old_target = RETAIN(_target); - [self setTarget: anObject]; - - _set_arg(self, 0, &_target); - _set_arg(self, 1, &_selector); - - if (_sendToSuper == YES) - { - Super s; - -#ifndef NeXT_RUNTIME - s.self = _target; -#else - s.receiver = _target; -#endif - if (GSObjCIsInstance(_target)) - s.class = GSObjCSuper(GSObjCClass(_target)); - else - s.class = GSObjCSuper((Class)_target); - imp = objc_msg_lookup_super(&s, _selector); - } - else - { - GSMethod method; - method = GSGetMethod((GSObjCIsInstance(_target) - ? (id)GSObjCClass(_target) - : (id)_target), - _selector, - GSObjCIsInstance(_target), - YES); - imp = method_get_imp(method); - /* - * If fast lookup failed, we may be forwarding or something ... - */ - if (imp == 0) - imp = objc_msg_lookup(_target, _selector); - } - [self setTarget: old_target]; - RELEASE(old_target); - - stack_argsize = [_sig frameLength]; - - returned = __builtin_apply((void(*)(void))imp, - (arglist_t)_cframe, stack_argsize); - if (_info[0].size) - { - mframe_decode_return(_info[0].type, _retval, returned); - } - - RETAIN_RETURN_VALUE; - _validReturn = YES; + [self subclassResponsibility: _cmd]; } /** @@ -973,6 +898,8 @@ @end +#if !defined(USE_FFCALL) && !defined(USE_LIBFFI) +#warning Using unreliable NSInvocation implementation. It is strongly recommended that you use libffi. @implementation GSFrameInvocation - (id) initWithArgframe: (arglist_t)frame selector: (SEL)aSelector @@ -1018,12 +945,92 @@ } return self; } +- (void)invokeWithTarget: (id)anObject +{ + id old_target; + retval_t returned; + IMP imp; + int stack_argsize; + + CLEAR_RETURN_VALUE_IF_OBJECT; + _validReturn = NO; + + /* + * A message to a nil object returns nil. + */ + if (anObject == nil) + { + _validReturn = YES; + memset(_retval, '\0', _info[0].size); /* Clear return value */ + return; + } + + NSAssert(_selector != 0, @"you must set the selector before invoking"); + + /* + * Temporarily set new target and copy it (and the selector) into the + * _cframe. + */ + old_target = RETAIN(_target); + [self setTarget: anObject]; + + _set_arg(self, 0, &_target); + _set_arg(self, 1, &_selector); + + if (_sendToSuper == YES) + { + Super s; + +#ifndef NeXT_RUNTIME + s.self = _target; +#else + s.receiver = _target; +#endif + if (GSObjCIsInstance(_target)) + s.class = GSObjCSuper(GSObjCClass(_target)); + else + s.class = GSObjCSuper((Class)_target); + imp = objc_msg_lookup_super(&s, _selector); + } + else + { + GSMethod method; + method = GSGetMethod((GSObjCIsInstance(_target) + ? (id)GSObjCClass(_target) + : (id)_target), + _selector, + GSObjCIsInstance(_target), + YES); + imp = method_get_imp(method); + /* + * If fast lookup failed, we may be forwarding or something ... + */ + if (imp == 0) + imp = objc_msg_lookup(_target, _selector); + } + [self setTarget: old_target]; + RELEASE(old_target); + + stack_argsize = [_sig frameLength]; + + returned = __builtin_apply((void(*)(void))imp, + (arglist_t)_cframe, stack_argsize); + if (_info[0].size) + { + mframe_decode_return(_info[0].type, _retval, returned); + } + + RETAIN_RETURN_VALUE; + _validReturn = YES; +} + - (void*) returnFrame: (arglist_t)argFrame { return mframe_handle_return(_info[0].type, _retval, argFrame); } @end +#endif @implementation GSInvocationProxy Index: Source/mframe.m =================================================================== --- Source/mframe.m (revision 28458) +++ Source/mframe.m (working copy) @@ -803,6 +803,7 @@ single data item (for distributed objects). */ +#if !defined(USE_FFCALL) && !defined(USE_LIBFFI) static inline id retframe_id(void *rframe) { __builtin_return (rframe); @@ -1795,3 +1796,4 @@ return retframe; } +#endif //!defined(USE_FFCALL) && !defined(USE_LIBFFI) Index: Source/NSObject.m =================================================================== --- Source/NSObject.m (revision 28458) +++ Source/NSObject.m (working copy) @@ -219,7 +219,7 @@ #define GSAtomicDecrement(X) InterlockedDecrement((LONG volatile*)X) -#elif defined(USE_ATOMIC_BUILDINS) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) +#elif defined(__llvm__) || (defined(USE_ATOMIC_BUILDINS) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))) /* Use the GCC atomic operations with recent GCC versions */ typedef int32_t volatile *gsatomic_t; @@ -893,6 +893,11 @@ } #endif +static void sigfpehandler(int a) +{ + fprintf(stderr, "Handler got: %d\n", a); +} + /** * This message is sent to a class once just before it is used for the first * time. If class has a superclass, its implementation of +initialize is @@ -971,13 +976,13 @@ // Manipulate the FPU to add the exception mask. (Fixes SIGFPE // problems on *BSD) // Note this only works on x86 - { volatile short cw; - __asm__ volatile ("fstcw (%0)" : : "g" (&cw)); + asm volatile ("fstcw %0" : : "g" (&cw)); cw |= 1; /* Mask 'invalid' exception */ - __asm__ volatile ("fldcw (%0)" : : "g" (&cw)); + asm volatile ("fldcw %0" : : "g" (&cw)); + signal(SIGFPE, sigfpehandler); } #endif Index: Source/NSConnection.m =================================================================== --- Source/NSConnection.m (revision 28458) +++ Source/NSConnection.m (working copy) @@ -37,6 +37,7 @@ #import "Foundation/NSEnumerator.h" #import "GNUstepBase/preface.h" #import "GNUstepBase/GSLock.h" +#import "Foundation/NSDebug.h" /* * Setup for inline operation of pointer map tables. @@ -1937,6 +1938,7 @@ selector: (SEL)sel argFrame: (arglist_t)argframe { +#if !defined(USE_FFCALL) && !defined(USE_LIBFFI) BOOL outParams; BOOL needsResponse; const char *type; @@ -2071,6 +2073,14 @@ NSAssert(ctxt.decoder == nil, NSInternalInconsistencyException); } return retframe; +#else + /* If we've got to here then something has gone badly wrong. Most likely a + * mismatch between NSDistantObject and NSConnection implementations. + */ + NSAssert(NO, @"Legacy forwardForProxy:selector:argFrame: method called when" + " compiled with fcall/ffi."); + return 0; // Not reached. +#endif //!defined(USE_FFCALL) && !defined(USE_LIBFFI) } /* Index: Tools/make_strings/make_strings.m =================================================================== --- Tools/make_strings/make_strings.m (revision 28458) +++ Tools/make_strings/make_strings.m (working copy) @@ -89,6 +89,23 @@ be any reason to). */ + +#define add_arg_ch(ch)\ + {\ + if (arg_len[num_args]+1>=arg_size[num_args])\ + {\ + arg_size[num_args]+=512;\ + args[num_args]=realloc(args[num_args],arg_size[num_args]);\ + if (!args[num_args])\ + {\ + NSLog(@"out of memory!\n");\ + exit(1);\ + }\ + }\ + args[num_args][arg_len[num_args]++]=ch;\ + args[num_args][arg_len[num_args]]=0;\ + } + static int ParseFile(const char *filename,NSMutableDictionary *tables) { FILE *f; @@ -120,21 +137,6 @@ int depth=0; - void add_arg_ch(int ch) - { - if (arg_len[num_args]+1>=arg_size[num_args]) - { - arg_size[num_args]+=512; - args[num_args]=realloc(args[num_args],arg_size[num_args]); - if (!args[num_args]) - { - NSLog(@"out of memory!\n"); - exit(1); - } - } - args[num_args][arg_len[num_args]++]=ch; - args[num_args][arg_len[num_args]]=0; - } filenamestr = [NSString stringWithCString: filename Index: config/config.forward.m =================================================================== --- config/config.forward.m (revision 28458) +++ config/config.forward.m (working copy) @@ -1,3 +1,4 @@ +#include #include int main (void)