Overview
Comment: | invoke-x86_64.m: Support passing args via stack |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
0bf9fafd4770a4fa59ac68819db7b90c |
User & Date: | js on 2017-09-11 15:37:05 |
Other Links: | manifest | tags |
Context
2017-09-11
| ||
16:17 | Add missing OF_ITANIUM_ASM define check-in: 48f514d397 user: js tags: trunk | |
15:37 | invoke-x86_64.m: Support passing args via stack check-in: 0bf9fafd47 user: js tags: trunk | |
11:44 | invoke-x86_64: Set %al to number of SSE regs used check-in: bbeb71e81d user: js tags: trunk | |
Changes
Modified src/invocation/apple-call-x86_64.S from [d4bd8ff3de] to [543cf5678f].
︙ | ︙ | |||
20 21 22 23 24 25 26 27 28 | .section __TEXT, __text, regular, pure_instructions _of_invocation_call: pushq %rbp movq %rsp, %rbp subq $16, %rsp movq %rdi, -8(%rbp) | > > > > > > > > > > > > > > > > > > | | 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 | .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 208(%rdi), %rdx movq 200(%rdi), %rcx testq $1, %rcx jnz .fix_align .fill_stack: testq %rcx, %rcx jz .stack_filled decq %rcx movq (%rdx,%rcx,8), %r11 pushq %r11 jmp .fill_stack .stack_filled: movb 192(%rdi), %al movdqa 176(%rdi), %xmm7 movdqa 160(%rdi), %xmm6 movdqa 144(%rdi), %xmm5 movdqa 128(%rdi), %xmm4 movdqa 112(%rdi), %xmm3 movdqa 96(%rdi), %xmm2 |
︙ | ︙ | |||
52 53 54 55 56 57 58 | movdqa %xmm0, 64(%rdi) movdqa %xmm1, 80(%rdi) movq %rbp, %rsp popq %rbp ret | > > > > > | 70 71 72 73 74 75 76 77 78 79 80 81 | movdqa %xmm0, 64(%rdi) movdqa %xmm1, 80(%rdi) movq %rbp, %rsp popq %rbp ret .fix_align: xorq %r11, %r11 pushq %r11 jmp .fill_stack |
Modified src/invocation/invoke-x86_64.m from [abe678c9cf] to [38c3b949a2].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdint.h> #include <xmmintrin.h> #import "OFInvocation.h" #import "OFMethodSignature.h" #import "OFInvalidFormatException.h" #define NUM_GPR_IN 6 #define NUM_GPR_OUT 2 #define NUM_SSE_IN 8 #define NUM_SSE_OUT 2 | > > | | > > | > < | > | 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 | * 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" #define NUM_GPR_IN 6 #define NUM_GPR_OUT 2 #define NUM_SSE_IN 8 #define NUM_SSE_OUT 2 struct call_context { uint64_t gpr[NUM_GPR_IN + NUM_GPR_OUT]; __m128 sse[NUM_SSE_IN]; uint8_t num_sse_used; uint64_t stack_size; uint64_t stack[]; }; extern void of_invocation_call(struct call_context *); void of_invocation_invoke(OFInvocation *invocation) { OFMethodSignature *methodSignature = [invocation methodSignature]; size_t numberOfArguments = [methodSignature numberOfArguments]; struct call_context *context; const char *typeEncoding; size_t currentGPR = 0, currentSSE = 0; if ((context = calloc(sizeof(*context), 1)) == NULL) @throw [OFOutOfMemoryException exception]; for (size_t i = 0; i < numberOfArguments; i++) { union { uint64_t gpr; __m128 sse; } value; enum { |
︙ | ︙ | |||
116 117 118 119 120 121 122 123 124 125 126 127 128 | /* TODO: '{' */ /* TODO: '(' */ CASE_GPR('^', uintptr_t) #ifndef __STDC_NO_COMPLEX__ /* TODO: 'j' */ #endif default: @throw [OFInvalidFormatException exception]; #undef CASE_GPR } if (valueType == VALUE_GPR) { if (currentGPR < NUM_GPR_IN) | > | | > | > | > > > > > > > > > > > > > > | | | > > | > | > > > > > > > > | | > > > > | > > > | | | | | | | | | > | > > | 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 | /* TODO: '{' */ /* TODO: '(' */ CASE_GPR('^', uintptr_t) #ifndef __STDC_NO_COMPLEX__ /* TODO: 'j' */ #endif default: free(context); @throw [OFInvalidFormatException exception]; #undef CASE_GPR } if (valueType == VALUE_GPR) { if (currentGPR < NUM_GPR_IN) context->gpr[currentGPR++] = value.gpr; else { struct call_context *newContext; context->stack_size++; newContext = realloc(context, sizeof(*context) + context->stack_size * 8); if (newContext == NULL) { free(context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(*context) + context->stack_size * 8]; } context = newContext; context->stack[context->stack_size - 1] = value.gpr; } } else if (valueType == VALUE_SSE) { if (currentSSE < NUM_SSE_IN) { context->sse[currentSSE++] = value.sse; context->num_sse_used++; } else { struct call_context *newContext; double tmp; context->stack_size++; newContext = realloc(context, sizeof(*context) + context->stack_size * 8); if (newContext == NULL) { free(context); @throw [OFOutOfMemoryException exceptionWithRequestedSize: sizeof(*context) + context->stack_size * 8]; } context = newContext; _mm_store_sd(&tmp, value.sse); memcpy(&context->stack[context->stack_size - 1], &tmp, 8); } } } of_invocation_call(context); typeEncoding = [methodSignature methodReturnType]; if (*typeEncoding == 'r') typeEncoding++; switch (*typeEncoding) { #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) #ifdef __SIZEOF_INT128__ /* TODO: 't' */ /* TODO: 'T' */ #endif case 'f': { float tmp; _mm_store_ss(&tmp, context->sse[0]); [invocation setReturnValue: &tmp]; } break; case 'd': { double tmp; _mm_store_sd(&tmp, context->sse[0]); [invocation setReturnValue: &tmp]; } break; /* TODO: 'D' */ CASE_GPR('B', _Bool) CASE_GPR('*', uintptr_t) CASE_GPR('@', uintptr_t) CASE_GPR('#', uintptr_t) CASE_GPR(':', uintptr_t) /* TODO: '[' */ /* TODO: '{' */ /* TODO: '(' */ CASE_GPR('^', uintptr_t) #ifndef __STDC_NO_COMPLEX__ /* TODO: 'j' */ #endif default: free(context); @throw [OFInvalidFormatException exception]; #undef CASE_GPR } free(context); } |
Modified tests/OFInvocationTests.m from [0aa6c53400] to [f2f7a265ba].
︙ | ︙ | |||
28 29 30 31 32 33 34 | struct test_struct { unsigned char c; unsigned int i; }; @implementation TestsAppDelegate (OFInvocationTests) | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < | 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 | struct test_struct { unsigned char c; unsigned int i; }; @implementation TestsAppDelegate (OFInvocationTests) - (struct test_struct)invocationTestMethod1: (unsigned char)c : (unsigned int)i : (struct test_struct *)ptr : (struct test_struct)st { return st; } - (int)invocationTestMethod2: (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)invocationTestMethod3: (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; } - (void)invocationTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; SEL selector = @selector(invocationTestMethod1::::); OFMethodSignature *sig = [self methodSignatureForSelector: selector]; OFInvocation *invocation; struct test_struct st, st2, *stp = &st, *stp2; unsigned const char c = 0xAA; unsigned char c2; const unsigned int i = 0x55555555; unsigned int i2; |
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 | 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) [pool drain]; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | 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]; for (int i = 1; i <= 16; i++) [invocation setArgument: &i atIndex: i + 1]; int intResult; TEST(@"-[invoke] #1", R([invocation invoke]) && R([invocation getReturnValue: &intResult]) && intResult == 8) /* -[invoke] #2 */ selector = @selector(invocationTestMethod3::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int i = 1; i <= 16; i++) { double d = i; [invocation setArgument: &d atIndex: i + 1]; } double doubleResult; TEST(@"-[invoke] #2", R([invocation invoke]) && R([invocation getReturnValue: &doubleResult]) && doubleResult == 8.5) #endif [pool drain]; } @end |