Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -385,11 +385,10 @@ AS_IF([test x"$supports_amiga_lib" != x"yes"], [enable_amiga_lib="no"]) AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a") AC_SUBST(EXCEPTIONS_A, "exceptions.a") AC_SUBST(FORWARDING_A, "forwarding.a") - AC_SUBST(INVOCATION_A, "invocation.a") AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a") ]) AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library])) AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [ Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -26,12 +26,10 @@ EXCEPTIONS_A = @EXCEPTIONS_A@ EXCEPTIONS_LIB_A = @EXCEPTIONS_LIB_A@ FISH_COMPLETIONS = @FISH_COMPLETIONS@ FORWARDING_A = @FORWARDING_A@ FORWARDING_LIB_A = @FORWARDING_LIB_A@ -INVOCATION_A = @INVOCATION_A@ -INVOCATION_LIB_A = @INVOCATION_LIB_A@ LIBBASES_M = @LIBBASES_M@ LIBOBJFWRT_DEP = @LIBOBJFWRT_DEP@ LIBOBJFWRT_DEP_LVL2 = @LIBOBJFWRT_DEP_LVL2@ LIBOBJFW_DEP = @LIBOBJFW_DEP@ LIBOBJFW_DEP_LVL2 = @LIBOBJFW_DEP_LVL2@ Index: tests/OFInvocationTests.m ================================================================== --- tests/OFInvocationTests.m +++ tests/OFInvocationTests.m @@ -38,223 +38,10 @@ : (struct test_struct)st { return st; } -#ifdef OF_INVOCATION_CAN_INVOKE -- (void)invocationTestMethod2: (id)obj -{ - assert(obj == self); -} - -- (int)invocationTestMethod3: (int)i1 - : (int)i2 - : (int)i3 - : (int)i4 - : (int)i5 - : (int)i6 - : (int)i7 - : (int)i8 - : (int)i9 - : (int)i10 - : (int)i11 - : (int)i12 - : (int)i13 - : (int)i14 - : (int)i15 - : (int)i16 -{ - return (i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10 + i11 + - i12 + i13 + i14 + i15 + i16) / 16; -} - -- (double)invocationTestMethod4: (double)d1 - : (double)d2 - : (double)d3 - : (double)d4 - : (double)d5 - : (double)d6 - : (double)d7 - : (double)d8 - : (double)d9 - : (double)d10 - : (double)d11 - : (double)d12 - : (double)d13 - : (double)d14 - : (double)d15 - : (double)d16 -{ - return (d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10 + d11 + - d12 + d13 + d14 + d15 + d16) / 16; -} - -- (float)invocationTestMethod5: (double)d1 - : (float)f2 - : (float)f3 - : (float)f4 - : (float)f5 - : (float)f6 - : (float)f7 - : (float)f8 - : (float)f9 - : (double)d10 - : (float)f11 - : (float)f12 - : (float)f13 - : (float)f14 - : (float)f15 - : (float)f16 -{ - return (float)((d1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + d10 + f11 + - f12 + f13 + f14 + f15 + f16) / 16); -} - -- (long double)invocationTestMethod6: (long double)d1 - : (long double)d2 - : (long double)d3 - : (long double)d4 - : (long double)d5 - : (long double)d6 - : (long double)d7 - : (long double)d8 - : (long double)d9 - : (long double)d10 - : (long double)d11 - : (long double)d12 - : (long double)d13 - : (long double)d14 - : (long double)d15 - : (long double)d16 -{ - return (d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10 + d11 + - d12 + d13 + d14 + d15 + d16) / 16; -} - -# if defined(HAVE_COMPLEX_H) && !defined(__STDC_NO_COMPLEX__) -- (complex double)invocationTestMethod7: (complex float)c1 - : (complex double)c2 - : (complex float)c3 - : (complex double)c4 - : (complex float)c5 - : (complex double)c6 - : (complex float)c7 - : (complex double)c8 - : (complex float)c9 - : (complex double)c10 - : (complex float)c11 - : (complex double)c12 - : (complex float)c13 - : (complex double)c14 - : (complex float)c15 - : (complex double)c16 -{ - OF_ENSURE(creal(c1) == 1.0 && cimag(c1) == 0.5); - OF_ENSURE(creal(c2) == 2.0 && cimag(c2) == 1.0); - OF_ENSURE(creal(c3) == 3.0 && cimag(c3) == 1.5); - OF_ENSURE(creal(c4) == 4.0 && cimag(c4) == 2.0); - OF_ENSURE(creal(c5) == 5.0 && cimag(c5) == 2.5); - OF_ENSURE(creal(c6) == 6.0 && cimag(c6) == 3.0); - OF_ENSURE(creal(c7) == 7.0 && cimag(c7) == 3.5); - OF_ENSURE(creal(c8) == 8.0 && cimag(c8) == 4.0); - OF_ENSURE(creal(c9) == 9.0 && cimag(c9) == 4.5); - OF_ENSURE(creal(c10) == 10.0 && cimag(c10) == 5.0); - OF_ENSURE(creal(c11) == 11.0 && cimag(c11) == 5.5); - OF_ENSURE(creal(c12) == 12.0 && cimag(c12) == 6.0); - OF_ENSURE(creal(c13) == 13.0 && cimag(c13) == 6.5); - OF_ENSURE(creal(c14) == 14.0 && cimag(c14) == 7.0); - OF_ENSURE(creal(c15) == 15.0 && cimag(c15) == 7.5); - OF_ENSURE(creal(c16) == 16.0 && cimag(c16) == 8.0); - - return (c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9 + c10 + c11 + - c12 + c13 + c14 + c15 + c16) / 16; -} - -- (complex long double)invocationTestMethod8: (complex double)c1 - : (complex float)c2 - : (complex long double)c3 - : (complex double)c4 - : (complex float)c5 - : (complex long double)c6 - : (complex double)c7 - : (complex float)c8 - : (complex long double)c9 - : (complex double)c10 - : (complex float)c11 - : (complex long double)c12 - : (complex double)c13 - : (complex float)c14 - : (complex long double)c15 - : (complex double)c16 -{ - OF_ENSURE(creal(c1) == 1.0 && cimag(c1) == 0.5); - OF_ENSURE(creal(c2) == 2.0 && cimag(c2) == 1.0); - OF_ENSURE(creal(c3) == 3.0 && cimag(c3) == 1.5); - OF_ENSURE(creal(c4) == 4.0 && cimag(c4) == 2.0); - OF_ENSURE(creal(c5) == 5.0 && cimag(c5) == 2.5); - OF_ENSURE(creal(c6) == 6.0 && cimag(c6) == 3.0); - OF_ENSURE(creal(c7) == 7.0 && cimag(c7) == 3.5); - OF_ENSURE(creal(c8) == 8.0 && cimag(c8) == 4.0); - OF_ENSURE(creal(c9) == 9.0 && cimag(c9) == 4.5); - OF_ENSURE(creal(c10) == 10.0 && cimag(c10) == 5.0); - OF_ENSURE(creal(c11) == 11.0 && cimag(c11) == 5.5); - OF_ENSURE(creal(c12) == 12.0 && cimag(c12) == 6.0); - OF_ENSURE(creal(c13) == 13.0 && cimag(c13) == 6.5); - OF_ENSURE(creal(c14) == 14.0 && cimag(c14) == 7.0); - OF_ENSURE(creal(c15) == 15.0 && cimag(c15) == 7.5); - OF_ENSURE(creal(c16) == 16.0 && cimag(c16) == 8.0); - - return (c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9 + c10 + c11 + - c12 + c13 + c14 + c15 + c16) / 16; -} -# endif - -# ifdef __SIZEOF_INT128__ -__extension__ -- (__int128)invocationTestMethod9: (int)i1 - : (__int128)i2 - : (__int128)i3 - : (__int128)i4 - : (int)i5 - : (__int128)i6 - : (__int128)i7 - : (__int128)i8 - : (__int128)i9 - : (__int128)i10 - : (__int128)i11 - : (__int128)i12 - : (__int128)i13 - : (__int128)i14 - : (__int128)i15 - : (__int128)i16 -{ - __int128 mask = (__int128)0xFFFFFFFFFFFFFFFF << 64; - - OF_ENSURE(i1 == 1); - OF_ENSURE(i2 == mask + 2); - OF_ENSURE(i3 == mask + 3); - OF_ENSURE(i4 == mask + 4); - OF_ENSURE(i5 == 5); - OF_ENSURE(i6 == mask + 6); - OF_ENSURE(i7 == mask + 7); - OF_ENSURE(i8 == mask + 8); - OF_ENSURE(i9 == mask + 9); - OF_ENSURE(i10 == mask + 10); - OF_ENSURE(i11 == mask + 11); - OF_ENSURE(i12 == mask + 12); - OF_ENSURE(i13 == mask + 13); - OF_ENSURE(i14 == mask + 14); - OF_ENSURE(i15 == mask + 15); - OF_ENSURE(i16 == mask + 16); - - return ((i1 + (int)i2 + (int)i3 + (int)i4 + i5 + (int)i6 + (int)i7 + - (int)i8 + (int)i9 + (int)i10 + (int)i11 + (int)i12 + (int)i13 + - (int)i14 + (int)i15 + (int)i16) / 16) + mask; -} -# endif -#endif - - (void)invocationTests { void *pool = objc_autoreleasePoolPush(); SEL selector = @selector(invocationTestMethod1::::); OFMethodSignature *sig = [self methodSignatureForSelector: selector];