Changes In Branch invoke-invocation Through [911b65cc6b] Excluding Merge-Ins
This is equivalent to a diff from c71d3d9433 to 911b65cc6b
2021-04-07
| ||
22:35 | Merge trunk into branch "invoke-invocation" check-in: f77f1f13ca user: js tags: invoke-invocation | |
21:38 | Remove utils/ofsock, it has been moved to a branch check-in: 5da858b5be user: js tags: trunk | |
21:37 | Move incomplete utils/ofsock into a new branch check-in: 52b10168ce user: js tags: ofsock | |
21:32 | Merge trunk into branch "invoke-invocation" check-in: 911b65cc6b user: js tags: invoke-invocation | |
21:29 | Remove incomplete -[OFInvocation invoke] support check-in: c71d3d9433 user: js tags: trunk | |
21:24 | Move incomplete support for invoking to new branch check-in: 153a646c78 user: js tags: invoke-invocation | |
21:14 | Rename OFCryptoHash -> OFCryptographicHash check-in: 2969086342 user: js tags: trunk | |
2019-09-29
| ||
15:25 | Remove incomplete -[OFInvocation invoke] support check-in: fc521f01cc user: js tags: 1.0 | |
Modified configure.ac from [b9427c0b96] to [bfb050aa3d].
︙ | ︙ | |||
355 356 357 358 359 360 361 362 363 364 365 366 367 368 | AC_ARG_ENABLE(shared, AS_HELP_STRING([--disable-shared], [do not build shared library])) AS_IF([test x"$enable_shared" != x"no"], [ BUILDSYS_SHARED_LIB AC_SUBST(OBJFW_SHARED_LIB, "${LIB_PREFIX}objfw${LIB_SUFFIX}") AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a") AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a") AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a") BUILDSYS_FRAMEWORK([ AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework") build_framework="yes" ]) ], [ | > | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 | AC_ARG_ENABLE(shared, AS_HELP_STRING([--disable-shared], [do not build shared library])) AS_IF([test x"$enable_shared" != x"no"], [ BUILDSYS_SHARED_LIB AC_SUBST(OBJFW_SHARED_LIB, "${LIB_PREFIX}objfw${LIB_SUFFIX}") AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a") AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a") AC_SUBST(INVOCATION_LIB_A, "invocation.lib.a") AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a") BUILDSYS_FRAMEWORK([ AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework") build_framework="yes" ]) ], [ |
︙ | ︙ | |||
395 396 397 398 399 400 401 402 403 404 405 406 407 408 | AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [ enable_static="yes" ]) AS_IF([test x"$enable_static" = x"yes"], [ AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a") AC_SUBST(EXCEPTIONS_A, "exceptions.a") AC_SUBST(FORWARDING_A, "forwarding.a") AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a") ]) AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins]) AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [ AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}') AC_SUBST(TESTPLUGIN, "plugin") | > | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [ enable_static="yes" ]) AS_IF([test x"$enable_static" = x"yes"], [ 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_A, "lookup-asm.a") ]) AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins]) AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [ AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}') AC_SUBST(TESTPLUGIN, "plugin") |
︙ | ︙ |
Modified src/Makefile from [7c8e6917fc] to [1e045757f6].
1 2 | include ../extra.mk | | | 1 2 3 4 5 6 7 8 9 10 | include ../extra.mk SUBDIRS = ${RUNTIME} exceptions encodings forwarding invocation SUBDIRS_AFTER = ${BRIDGE} DISTCLEAN = Info.plist objfw-defs.h SHARED_LIB = ${OBJFW_SHARED_LIB} STATIC_LIB = ${OBJFW_STATIC_LIB} FRAMEWORK = ${OBJFW_FRAMEWORK} LIB_MAJOR = ${OBJFW_LIB_MAJOR} |
︙ | ︙ | |||
228 229 230 231 232 233 234 | ${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M} \ ${OF_POLL_KERNEL_EVENT_OBSERVER_M} \ ${OF_SELECT_KERNEL_EVENT_OBSERVER_M} \ OFTCPSocketSOCKS5Connector.m OBJS_EXTRA = exceptions/exceptions.a \ encodings/encodings.a \ | | > | > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | ${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M} \ ${OF_POLL_KERNEL_EVENT_OBSERVER_M} \ ${OF_SELECT_KERNEL_EVENT_OBSERVER_M} \ OFTCPSocketSOCKS5Connector.m OBJS_EXTRA = exceptions/exceptions.a \ encodings/encodings.a \ forwarding/forwarding.a \ invocation/invocation.a LIB_OBJS_EXTRA = exceptions/exceptions.lib.a \ encodings/encodings.lib.a \ forwarding/forwarding.lib.a \ invocation/invocation.lib.a include ../buildsys.mk CPPFLAGS += -I. -I.. -Iexceptions -Iruntime LD = ${OBJC} FRAMEWORK_LIBS := -Fruntime \ ${RUNTIME_FRAMEWORK_LIBS} \ ${REEXPORT_RUNTIME_FRAMEWORK} \ ${LIBS} LIBS := -Lruntime ${RUNTIME_LIBS} ${REEXPORT_RUNTIME} ${LIBS} |
Modified src/OFInvocation.h from [8c29c4a2ab] to [14d19be34a].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" OF_ASSUME_NONNULL_BEGIN @class OFMethodSignature; @class OFMutableArray OF_GENERIC(ObjectType); @class OFMutableData; /** * @class OFInvocation OFInvocation.h ObjFW/OFInvocation.h | > > > > > > > > > > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" OF_ASSUME_NONNULL_BEGIN #ifdef OF_APPLE_RUNTIME # ifdef OF_X86_64 # define OF_INVOCATION_CAN_INVOKE # endif #else # ifdef OF_ELF # ifdef OF_X86_64 # define OF_INVOCATION_CAN_INVOKE # endif # endif #endif @class OFMethodSignature; @class OFMutableArray OF_GENERIC(ObjectType); @class OFMutableData; /** * @class OFInvocation OFInvocation.h ObjFW/OFInvocation.h |
︙ | ︙ | |||
81 82 83 84 85 86 87 88 89 90 | /** * @brief Gets the return value. * * @param buffer The buffer in which the return value is stored */ - (void)getReturnValue: (void *)buffer; @end OF_ASSUME_NONNULL_END | > > > > > > > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | /** * @brief Gets the return value. * * @param buffer The buffer in which the return value is stored */ - (void)getReturnValue: (void *)buffer; #ifdef OF_INVOCATION_CAN_INVOKE /** * @brief Invokes the method. */ - (void)invoke; #endif @end OF_ASSUME_NONNULL_END |
Modified src/OFInvocation.m from [ea63101931] to [fa4bb596dc].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include <string.h> #import "OFInvocation.h" #import "OFArray.h" #import "OFData.h" #import "OFMethodSignature.h" @implementation OFInvocation @synthesize methodSignature = _methodSignature; + (instancetype)invocationWithMethodSignature: (OFMethodSignature *)signature { return [[[self alloc] initWithMethodSignature: signature] autorelease]; | > > > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #include <string.h> #import "OFInvocation.h" #import "OFArray.h" #import "OFData.h" #import "OFMethodSignature.h" #ifdef OF_INVOCATION_CAN_INVOKE extern void of_invocation_invoke(OFInvocation *); #endif @implementation OFInvocation @synthesize methodSignature = _methodSignature; + (instancetype)invocationWithMethodSignature: (OFMethodSignature *)signature { return [[[self alloc] initWithMethodSignature: signature] autorelease]; |
︙ | ︙ | |||
101 102 103 104 105 106 107 108 | memcpy(_returnValue.mutableItems, buffer, _returnValue.itemSize); } - (void)getReturnValue: (void *)buffer { memcpy(buffer, _returnValue.items, _returnValue.itemSize); } @end | > > > > > > > | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | memcpy(_returnValue.mutableItems, buffer, _returnValue.itemSize); } - (void)getReturnValue: (void *)buffer { memcpy(buffer, _returnValue.items, _returnValue.itemSize); } #ifdef OF_INVOCATION_CAN_INVOKE - (void)invoke { of_invocation_invoke(self); } #endif @end |
Added src/invocation/Makefile version [a7afc8dd3a].
> > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | include ../../extra.mk STATIC_PIC_LIB_NOINST = ${INVOCATION_LIB_A} STATIC_LIB_NOINST = ${INVOCATION_A} SRCS = call.S \ invoke.m include ../../buildsys.mk ASFLAGS += -I../.. -I.. OBJCFLAGS += -I../.. -I.. -I../exceptions -I../runtime |
Added src/invocation/apple-call-x86_64.S version [bd0fafe6da].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "invoke-x86_64.h" .globl _of_invocation_call .section __TEXT, __text, regular, pure_instructions _of_invocation_call: pushq %rbp movq %rsp, %rbp subq $16, %rsp andq $-16, %rsp movq %rdi, -8(%rbp) leaq OFFSET_STACK(%rdi), %rdx movq OFFSET_STACK_SIZE(%rdi), %rcx testq $1, %rcx jnz Lfix_align Lfill_stack: testq %rcx, %rcx jz Lstack_filled decq %rcx movq (%rdx,%rcx,8), %r11 pushq %r11 jmp Lfill_stack Lstack_filled: movb OFFSET_NUM_SSE_USED(%rdi), %al movaps OFFSET_SSE_INOUT+112(%rdi), %xmm7 movaps OFFSET_SSE_INOUT+96(%rdi), %xmm6 movaps OFFSET_SSE_INOUT+80(%rdi), %xmm5 movaps OFFSET_SSE_INOUT+64(%rdi), %xmm4 movaps OFFSET_SSE_INOUT+48(%rdi), %xmm3 movaps OFFSET_SSE_INOUT+32(%rdi), %xmm2 movaps OFFSET_SSE_INOUT+16(%rdi), %xmm1 movaps OFFSET_SSE_INOUT(%rdi), %xmm0 movq OFFSET_GPR_IN+40(%rdi), %r9 movq OFFSET_GPR_IN+32(%rdi), %r8 movq OFFSET_GPR_IN+24(%rdi), %rcx movq OFFSET_GPR_IN+16(%rdi), %rdx movq OFFSET_GPR_IN+8(%rdi), %rsi movb OFFSET_RETURN_TYPE(%rdi), %r11b movq OFFSET_GPR_IN(%rdi), %rdi cmpb $RETURN_TYPE_STRET, %r11b je Lcall_send_stret cmpb $RETURN_TYPE_JMP, %r11b je _objc_msgSend cmpb $RETURN_TYPE_JMP_STRET, %r11b je _objc_msgSend_stret call _objc_msgSend Lafter_send: movq -8(%rbp), %rdi movq %rax, OFFSET_GPR_OUT(%rdi) movq %rdx, OFFSET_GPR_OUT+8(%rdi) movaps %xmm0, OFFSET_SSE_INOUT(%rdi) movaps %xmm1, OFFSET_SSE_INOUT+16(%rdi) movb OFFSET_RETURN_TYPE(%rdi), %r11b cmpb $RETURN_TYPE_X87, %r11b je Lpop_long_double cmpb $RETURN_TYPE_COMPLEX_X87, %r11b je Lpop_complex_long_double Lreturn: movq %rbp, %rsp popq %rbp ret Lfix_align: xorq %r11, %r11 pushq %r11 jmp Lfill_stack Lcall_send_stret: call _objc_msgSend_stret jmp Lafter_send Lpop_long_double: fstpt OFFSET_X87_OUT(%rdi) jmp Lreturn Lpop_complex_long_double: fstpt OFFSET_X87_OUT(%rdi) fstpt OFFSET_X87_OUT+16(%rdi) jmp Lreturn |
Added src/invocation/call-x86_64-elf.S version [83aad377c2].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "invoke-x86_64.h" .globl of_invocation_call .section .text of_invocation_call: pushq %rbp movq %rsp, %rbp subq $16, %rsp andq $-16, %rsp movq %rdi, -8(%rbp) movb OFFSET_RETURN_TYPE(%rdi), %r11b cmpb $RETURN_TYPE_STRET, %r11b je .Llookup_stret cmpb $RETURN_TYPE_JMP_STRET, %r11b je .Llookup_stret movq OFFSET_GPR_IN+8(%rdi), %rsi movq OFFSET_GPR_IN+0(%rdi), %rdi call objc_msg_lookup@PLT .Lafter_lookup: movq %rax, -16(%rbp) movq -8(%rbp), %rdi leaq OFFSET_STACK(%rdi), %rdx movq OFFSET_STACK_SIZE(%rdi), %rcx testq $1, %rcx jnz .Lfix_align .Lfill_stack: testq %rcx, %rcx jz .Lstack_filled decq %rcx movq (%rdx,%rcx,8), %r11 pushq %r11 jmp .Lfill_stack .Lstack_filled: movb OFFSET_NUM_SSE_USED(%rdi), %al movaps OFFSET_SSE_INOUT+112(%rdi), %xmm7 movaps OFFSET_SSE_INOUT+96(%rdi), %xmm6 movaps OFFSET_SSE_INOUT+80(%rdi), %xmm5 movaps OFFSET_SSE_INOUT+64(%rdi), %xmm4 movaps OFFSET_SSE_INOUT+48(%rdi), %xmm3 movaps OFFSET_SSE_INOUT+32(%rdi), %xmm2 movaps OFFSET_SSE_INOUT+16(%rdi), %xmm1 movaps OFFSET_SSE_INOUT(%rdi), %xmm0 movq OFFSET_GPR_IN+40(%rdi), %r9 movq OFFSET_GPR_IN+32(%rdi), %r8 movq OFFSET_GPR_IN+24(%rdi), %rcx movq OFFSET_GPR_IN+16(%rdi), %rdx movq OFFSET_GPR_IN+8(%rdi), %rsi movb OFFSET_RETURN_TYPE(%rdi), %r11b movq OFFSET_GPR_IN(%rdi), %rdi cmpb $RETURN_TYPE_JMP, %r11b je .Ljmp_into_method cmpb $RETURN_TYPE_JMP_STRET, %r11b je .Ljmp_into_method movq -16(%rbp), %r11 call *%r11 .Lafter_send: movq -8(%rbp), %rdi movq %rax, OFFSET_GPR_OUT(%rdi) movq %rdx, OFFSET_GPR_OUT+8(%rdi) movaps %xmm0, OFFSET_SSE_INOUT(%rdi) movaps %xmm1, OFFSET_SSE_INOUT+16(%rdi) movb OFFSET_RETURN_TYPE(%rdi), %r11b cmpb $RETURN_TYPE_X87, %r11b je .Lpop_long_double cmpb $RETURN_TYPE_COMPLEX_X87, %r11b je .Lpop_complex_long_double .Lreturn: movq %rbp, %rsp popq %rbp ret .Lfix_align: xorq %r11, %r11 pushq %r11 jmp .Lfill_stack .Llookup_stret: movq OFFSET_GPR_IN+16(%rdi), %rsi movq OFFSET_GPR_IN+8(%rdi), %rdi call objc_msg_lookup_stret@PLT jmp .Lafter_lookup .Ljmp_into_method: movq -16(%rbp), %r11 jmp *%r11 .Lpop_long_double: fstpt OFFSET_X87_OUT(%rdi) jmp .Lreturn .Lpop_complex_long_double: fstpt OFFSET_X87_OUT(%rdi) fstpt OFFSET_X87_OUT+16(%rdi) jmp .Lreturn #ifdef OF_LINUX .section .note.GNU-stack, "", %progbits #endif |
Added src/invocation/call.S version [c8172ab4a1].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "platform.h" #ifdef OF_APPLE_RUNTIME # ifdef OF_X86_64 # include "apple-call-x86_64.S" # endif #else # ifdef OF_ELF # ifdef OF_X86_64 # include "call-x86_64-elf.S" # endif # endif #endif |
Added src/invocation/invoke-x86_64.h version [0f6289615c].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #define RETURN_TYPE_NORMAL 0 #define RETURN_TYPE_STRET 1 #define RETURN_TYPE_X87 2 #define RETURN_TYPE_COMPLEX_X87 3 #define RETURN_TYPE_JMP 4 #define RETURN_TYPE_JMP_STRET 5 #define NUM_GPR_IN 6 #define NUM_GPR_OUT 2 #define NUM_SSE_INOUT 8 #define NUM_X87_OUT 2 #define OFFSET_GPR_IN 0 #define OFFSET_GPR_OUT (OFFSET_GPR_IN + NUM_GPR_IN * 8) #define OFFSET_SSE_INOUT (OFFSET_GPR_OUT + NUM_GPR_OUT * 8) #define OFFSET_X87_OUT (OFFSET_SSE_INOUT + NUM_SSE_INOUT * 16) #define OFFSET_NUM_SSE_USED (OFFSET_X87_OUT + NUM_X87_OUT * 16) #define OFFSET_RETURN_TYPE (OFFSET_NUM_SSE_USED + 1) #define OFFSET_STACK_SIZE (OFFSET_RETURN_TYPE + 7) #define OFFSET_STACK (OFFSET_STACK_SIZE + 8) |
Added src/invocation/invoke-x86_64.m version [e0c747a83e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdint.h> #include <stdlib.h> #include <xmmintrin.h> #import "OFInvocation.h" #import "OFMethodSignature.h" #import "OFInvalidFormatException.h" #import "OFOutOfMemoryException.h" #import "invoke-x86_64.h" #import "macros.h" struct call_context { uint64_t GPR[NUM_GPR_IN + NUM_GPR_OUT]; __m128 SSE[NUM_SSE_INOUT]; long double X87[NUM_X87_OUT]; uint8_t numSSEUsed; uint8_t returnType; uint64_t stackSize; uint64_t stack[]; }; extern void of_invocation_call(struct call_context *); static void pushGPR(struct call_context **context, uint_fast8_t *currentGPR, uint64_t value) { struct call_context *newContext; if (*currentGPR < NUM_GPR_IN) { (*context)->GPR[(*currentGPR)++] = value; return; } if ((newContext = realloc(*context, sizeof(**context) + ((*context)->stackSize + 1) * 8)) == NULL) { free(*context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(**context) + ((*context)->stackSize + 1) * 8]; } newContext->stack[newContext->stackSize] = value; newContext->stackSize++; *context = newContext; } static void pushDouble(struct call_context **context, uint_fast8_t *currentSSE, double value) { struct call_context *newContext; if (*currentSSE < NUM_SSE_INOUT) { (*context)->SSE[(*currentSSE)++] = (__m128)_mm_set_sd(value); (*context)->numSSEUsed++; return; } if ((newContext = realloc(*context, sizeof(**context) + ((*context)->stackSize + 1) * 8)) == NULL) { free(*context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(**context) + ((*context)->stackSize + 1) * 8]; } memcpy(&newContext->stack[newContext->stackSize], &value, 8); newContext->stackSize++; *context = newContext; } static void pushQuad(struct call_context **context, uint_fast8_t *currentSSE, double low, double high) { size_t stackSize; struct call_context *newContext; if (*currentSSE + 1 < NUM_SSE_INOUT) { (*context)->SSE[(*currentSSE)++] = (__m128)_mm_set_sd(low); (*context)->SSE[(*currentSSE)++] = (__m128)_mm_set_sd(high); (*context)->numSSEUsed += 2; return; } stackSize = (*context)->stackSize + 2; if ((newContext = realloc(*context, sizeof(**context) + stackSize * 8)) == NULL) { free(*context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(**context) + stackSize * 8]; } memset(&newContext->stack[newContext->stackSize], '\0', (stackSize - newContext->stackSize) * 8); memcpy(&newContext->stack[stackSize - 2], &low, 8); memcpy(&newContext->stack[stackSize - 1], &high, 8); newContext->stackSize = stackSize; *context = newContext; } static void pushLongDouble(struct call_context **context, long double value) { struct call_context *newContext; if ((newContext = realloc(*context, sizeof(**context) + ((*context)->stackSize + 2) * 8)) == NULL) { free(*context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(**context) + ((*context)->stackSize + 2) * 8]; } memcpy(&newContext->stack[newContext->stackSize], &value, 16); newContext->stackSize += 2; *context = newContext; } static void pushLongDoublePair(struct call_context **context, long double value[2]) { size_t stackSize; struct call_context *newContext; stackSize = OF_ROUND_UP_POW2(2UL, (*context)->stackSize) + 4; if ((newContext = realloc(*context, sizeof(**context) + stackSize * 8)) == NULL) { free(*context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(**context) + stackSize * 8]; } memset(&newContext->stack[newContext->stackSize], '\0', (stackSize - newContext->stackSize) * 8); memcpy(&newContext->stack[stackSize - 4], value, 32); newContext->stackSize = stackSize; *context = newContext; } #if defined(__SIZEOF_INT128__) && !defined(__clang__) static void pushInt128(struct call_context **context, uint_fast8_t *currentGPR, uint64_t value[2]) { size_t stackSize; struct call_context *newContext; if (*currentGPR + 1 < NUM_GPR_IN) { (*context)->GPR[(*currentGPR)++] = value[0]; (*context)->GPR[(*currentGPR)++] = value[1]; return; } stackSize = OF_ROUND_UP_POW2(2, (*context)->stackSize) + 2; if ((newContext = realloc(*context, sizeof(**context) + stackSize * 8)) == NULL) { free(*context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(**context) + stackSize * 8]; } memset(&newContext->stack[newContext->stackSize], '\0', (stackSize - newContext->stackSize) * 8); memcpy(&newContext->stack[stackSize - 2], value, 16); newContext->stackSize = stackSize; *context = newContext; } #endif void of_invocation_invoke(OFInvocation *invocation) { OFMethodSignature *methodSignature = invocation.methodSignature; size_t numberOfArguments = methodSignature.numberOfArguments; struct call_context *context; const char *typeEncoding; uint_fast8_t currentGPR = 0, currentSSE = 0; if ((context = calloc(sizeof(*context), 1)) == NULL) @throw [OFOutOfMemoryException exception]; for (size_t i = 0; i < numberOfArguments; i++) { typeEncoding = [methodSignature argumentTypeAtIndex: i]; if (*typeEncoding == 'r') typeEncoding++; switch (*typeEncoding) { #define CASE_GPR(encoding, type) \ case encoding: \ { \ type tmp; \ [invocation getArgument: &tmp \ atIndex: i]; \ pushGPR(&context, ¤tGPR, (uint64_t)tmp); \ } \ break; CASE_GPR('c', char) CASE_GPR('C', unsigned char) CASE_GPR('i', int) CASE_GPR('I', unsigned int) CASE_GPR('s', short) CASE_GPR('S', unsigned short) CASE_GPR('l', long) CASE_GPR('L', unsigned long) CASE_GPR('q', long long) CASE_GPR('Q', unsigned long long) CASE_GPR('B', _Bool) CASE_GPR('*', char *) CASE_GPR('@', id) CASE_GPR('#', Class) /* * Using SEL triggers a warning that casting a SEL to an * integer is deprecated. */ CASE_GPR(':', void *) CASE_GPR('^', void *) #undef CASE_GPR #ifdef __SIZEOF_INT128__ case 't': case 'T':; uint64_t int128Tmp[2]; [invocation getArgument: &int128Tmp atIndex: i]; # ifndef __clang__ pushInt128(&context, ¤tGPR, int128Tmp); # else /* See https://bugs.llvm.org/show_bug.cgi?id=34646 */ pushGPR(&context, ¤tGPR, int128Tmp[0]); pushGPR(&context, ¤tGPR, int128Tmp[1]); # endif break; #endif case 'f':; double floatTmp = 0; [invocation getArgument: &floatTmp atIndex: i]; pushDouble(&context, ¤tSSE, floatTmp); break; case 'd':; double doubleTmp; [invocation getArgument: &doubleTmp atIndex: i]; pushDouble(&context, ¤tSSE, doubleTmp); break; case 'D':; long double longDoubleTmp; [invocation getArgument: &longDoubleTmp atIndex: i]; pushLongDouble(&context, longDoubleTmp); break; case 'j': switch (typeEncoding[1]) { case 'f':; double complexFloatTmp; [invocation getArgument: &complexFloatTmp atIndex: i]; pushDouble(&context, ¤tSSE, complexFloatTmp); break; case 'd':; double complexDoubleTmp[2]; [invocation getArgument: &complexDoubleTmp atIndex: i]; pushQuad(&context, ¤tSSE, complexDoubleTmp[0], complexDoubleTmp[1]); break; case 'D':; long double complexLongDoubleTmp[2]; [invocation getArgument: &complexLongDoubleTmp atIndex: i]; pushLongDoublePair(&context, complexLongDoubleTmp); break; default: free(context); @throw [OFInvalidFormatException exception]; } break; /* TODO: '[' */ /* TODO: '{' */ /* TODO: '(' */ default: free(context); @throw [OFInvalidFormatException exception]; } } typeEncoding = methodSignature.methodReturnType; if (*typeEncoding == 'r') typeEncoding++; switch (*typeEncoding) { case 'v': case 'c': case 'C': case 'i': case 'I': case 's': case 'S': case 'l': case 'L': case 'q': case 'Q': case 'B': case '*': case '@': case '#': case ':': case '^': #ifdef __SIZEOF_INT128__ case 't': case 'T': #endif case 'f': case 'd': context->returnType = RETURN_TYPE_NORMAL; break; case 'D': context->returnType = RETURN_TYPE_X87; break; case 'j': switch (typeEncoding[1]) { case 'f': case 'd': context->returnType = RETURN_TYPE_NORMAL; break; case 'D': context->returnType = RETURN_TYPE_COMPLEX_X87; break; default: free(context); @throw [OFInvalidFormatException exception]; } break; /* TODO: '[' */ /* TODO: '{' */ /* TODO: '(' */ default: free(context); @throw [OFInvalidFormatException exception]; } of_invocation_call(context); switch (*typeEncoding) { case 'v': break; #define CASE_GPR(encoding, type) \ case encoding: \ { \ type tmp = (type)context->GPR[NUM_GPR_IN]; \ [invocation setReturnValue: &tmp]; \ } \ break; CASE_GPR('c', char) CASE_GPR('C', unsigned char) CASE_GPR('i', int) CASE_GPR('I', unsigned int) CASE_GPR('s', short) CASE_GPR('S', unsigned short) CASE_GPR('l', long) CASE_GPR('L', unsigned long) CASE_GPR('q', long long) CASE_GPR('Q', unsigned long long) CASE_GPR('B', _Bool) CASE_GPR('*', char *) CASE_GPR('@', id) CASE_GPR('#', Class) CASE_GPR(':', SEL) CASE_GPR('^', void *) #undef CASE_GPR #ifdef __SIZEOF_INT128__ case 't': case 'T':; [invocation setReturnValue: &context->GPR[NUM_GPR_IN]]; break; #endif case 'f':; float floatTmp; _mm_store_ss(&floatTmp, context->SSE[0]); [invocation setReturnValue: &floatTmp]; break; case 'd':; double doubleTmp; _mm_store_sd(&doubleTmp, (__m128d)context->SSE[0]); [invocation setReturnValue: &doubleTmp]; break; case 'D': [invocation setReturnValue: &context->X87[0]]; break; case 'j': switch (typeEncoding[1]) { case 'f':; double complexFloatTmp; _mm_store_sd(&complexFloatTmp, (__m128d)context->SSE[0]); [invocation setReturnValue: &complexFloatTmp]; break; case 'd':; double complexDoubleTmp[2]; _mm_store_sd(&complexDoubleTmp[0], (__m128d)context->SSE[0]); _mm_store_sd(&complexDoubleTmp[1], (__m128d)context->SSE[1]); [invocation setReturnValue: &complexDoubleTmp]; break; case 'D': [invocation setReturnValue: context->X87]; break; default: free(context); @throw [OFInvalidFormatException exception]; } break; /* TODO: '[' */ /* TODO: '{' */ /* TODO: '(' */ default: free(context); @throw [OFInvalidFormatException exception]; } free(context); } |
Added src/invocation/invoke.m version [09adc50790].
> > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include "platform.h" #if defined(OF_X86_64) && (defined(OF_APPLE_RUNTIME) || defined(OF_ELF)) # include "invoke-x86_64.m" #else /* To not have an empty translation unit otherwise */ int of_invocation_cannot_invoke; #endif |
Modified tests/OFInvocationTests.m from [28645e8e6a] to [1df5434c9d].
︙ | ︙ | |||
303 304 305 306 307 308 309 310 311 312 313 | TEST(@"-[getArgument:atIndex:] #3", R([invocation getArgument: &stp2 atIndex: 4]) && stp == stp2) TEST(@"-[getArgument:atIndex:] #4", R([invocation getArgument: &st2 atIndex: 5]) && memcmp(&st, &st2, sizeof(st)) == 0) objc_autoreleasePoolPop(pool); } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | TEST(@"-[getArgument:atIndex:] #3", R([invocation getArgument: &stp2 atIndex: 4]) && stp == stp2) TEST(@"-[getArgument:atIndex:] #4", R([invocation getArgument: &st2 atIndex: 5]) && memcmp(&st, &st2, sizeof(st)) == 0) #ifdef OF_INVOCATION_CAN_INVOKE /* -[invoke] #1 */ selector = @selector(invocationTestMethod2:); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; [invocation setArgument: &self atIndex: 2]; TEST(@"-[invoke] #1", R([invocation invoke])) /* -[invoke] #2 */ selector = @selector(invocationTestMethod3::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) [invocation setArgument: &j atIndex: j + 1]; int intResult; TEST(@"-[invoke] #2", R([invocation invoke]) && R([invocation getReturnValue: &intResult]) && intResult == 8) /* -[invoke] #3 */ selector = @selector(invocationTestMethod4::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) { double d = j; [invocation setArgument: &d atIndex: j + 1]; } double doubleResult; TEST(@"-[invoke] #3", R([invocation invoke]) && R([invocation getReturnValue: &doubleResult]) && doubleResult == 8.5) /* -[invoke] #4 */ selector = @selector(invocationTestMethod5::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) { float f = j; double d = j; if (j == 1 || j == 10) [invocation setArgument: &d atIndex: j + 1]; else [invocation setArgument: &f atIndex: j + 1]; } float floatResult; TEST(@"-[invoke] #4", R([invocation invoke]) && R([invocation getReturnValue: &floatResult]) && floatResult == 8.5) /* Only when encoding long doubles is supported */ if (strcmp(@encode(double), @encode(long double)) != 0) { /* -[invoke] #5 */ selector = @selector(invocationTestMethod6::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) { long double d = j; [invocation setArgument: &d atIndex: j + 1]; } long double longDoubleResult; TEST(@"-[invoke] #5", R([invocation invoke]) && R([invocation getReturnValue: &longDoubleResult]) && longDoubleResult == 8.5) } # if defined(HAVE_COMPLEX_H) && !defined(__STDC_NO_COMPLEX__) /* -[invoke] #6 */ selector = @selector(invocationTestMethod7::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) { complex float cf = j + 0.5 * j * I; complex double cd = j + 0.5 * j * I; if (j & 1) [invocation setArgument: &cf atIndex: j + 1]; else [invocation setArgument: &cd atIndex: j + 1]; } complex double complexDoubleResult; TEST(@"-[invoke] #6", R([invocation invoke]) && R([invocation getReturnValue: &complexDoubleResult]) && complexDoubleResult == 8.5 + 4.25 * I) /* Only when encoding complex long doubles is supported */ if (strcmp(@encode(complex double), @encode(complex long double)) != 0) { /* -[invoke] #7 */ selector = @selector(invocationTestMethod8::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) { complex double cd = j + 0.5 * j * I; complex float cf = j + 0.5 * j * I; complex long double cld = j + 0.5 * j * I; switch (j % 3) { case 0: [invocation setArgument: &cld atIndex: j + 1]; break; case 1: [invocation setArgument: &cd atIndex: j + 1]; break; case 2: [invocation setArgument: &cf atIndex: j + 1]; break; } } complex long double complexLongDoubleResult; TEST(@"-[invoke] #7", R([invocation invoke]) && R([invocation getReturnValue: &complexLongDoubleResult]) && complexLongDoubleResult == 8.5 + 4.25 * I) } # endif # ifdef __SIZEOF_INT128__ /* -[invoke] #8 */ selector = @selector(invocationTestMethod9::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int j = 1; j <= 16; j++) { __extension__ __int128 i128 = 0xFFFFFFFFFFFFFFFF; i128 <<= 64; i128 |= j; if (j == 1 || j == 5) [invocation setArgument: &j atIndex: j + 1]; else [invocation setArgument: &i128 atIndex: j + 1]; } __extension__ __int128 int128Result; TEST(@"-[invoke] #8", R([invocation invoke]) && R([invocation getReturnValue: &int128Result]) && int128Result == __extension__ ((__int128)0xFFFFFFFFFFFFFFFF << 64) + 8) # endif #endif objc_autoreleasePoolPop(pool); } @end |