Overview
Comment: | invoke-x86_64.m: Support for long double |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
d0878b2eae8c7dfc728e5fdc23da10fb |
User & Date: | js on 2017-09-11 20:32:29 |
Other Links: | manifest | tags |
Context
2017-09-12
| ||
20:49 | Only compile invoke-x86_64.m for Apple runtime check-in: 3be69edbd5 user: js tags: trunk | |
2017-09-11
| ||
20:32 | invoke-x86_64.m: Support for long double check-in: d0878b2eae user: js tags: trunk | |
16:17 | Add missing OF_ITANIUM_ASM define check-in: 48f514d397 user: js tags: trunk | |
Changes
Modified src/invocation/apple-call-x86_64.S from [543cf5678f] to [4e9c1edaaf].
︙ | ︙ | |||
23 24 25 26 27 28 29 | pushq %rbp movq %rsp, %rbp subq $16, %rsp andq $-16, %rsp movq %rdi, -8(%rbp) | | | | | | | | | | 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 | pushq %rbp movq %rsp, %rbp subq $16, %rsp andq $-16, %rsp movq %rdi, -8(%rbp) leaq 240(%rdi), %rdx movq 232(%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 224(%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 |
︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 | movq -8(%rbp), %rdi movq %rax, 48(%rdi) movq %rdx, 56(%rdi) movdqa %xmm0, 64(%rdi) movdqa %xmm1, 80(%rdi) movq %rbp, %rsp popq %rbp ret | > > > > | | > > > > | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | movq -8(%rbp), %rdi movq %rax, 48(%rdi) movq %rdx, 56(%rdi) movdqa %xmm0, 64(%rdi) movdqa %xmm1, 80(%rdi) cmpb $2, 225(%rdi) je Lpop_long_double Lreturn: movq %rbp, %rsp popq %rbp ret Lfix_align: xorq %r11, %r11 pushq %r11 jmp Lfill_stack Lpop_long_double: fstpt 192(%rdi) jmp Lreturn |
Modified src/invocation/invoke-x86_64.m from [38c3b949a2] to [4f0bfb5114].
︙ | ︙ | |||
25 26 27 28 29 30 31 | #import "OFInvalidFormatException.h" #import "OFOutOfMemoryException.h" #define NUM_GPR_IN 6 #define NUM_GPR_OUT 2 #define NUM_SSE_IN 8 | | > > > > > > > > | 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 | #import "OFInvalidFormatException.h" #import "OFOutOfMemoryException.h" #define NUM_GPR_IN 6 #define NUM_GPR_OUT 2 #define NUM_SSE_IN 8 #define NUM_X87_OUT 2 enum { RETURN_TYPE_NORMAL, RETURN_TYPE_STRUCT, RETURN_TYPE_X87 }; struct call_context { uint64_t gpr[NUM_GPR_IN + NUM_GPR_OUT]; __m128 sse[NUM_SSE_IN]; long double x87[NUM_X87_OUT]; uint8_t num_sse_used; uint8_t return_type; uint64_t stack_size; uint64_t stack[]; }; extern void of_invocation_call(struct call_context *); void |
︙ | ︙ | |||
53 54 55 56 57 58 59 60 61 62 | 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 { VALUE_GPR, | > | > | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | if ((context = calloc(sizeof(*context), 1)) == NULL) @throw [OFOutOfMemoryException exception]; for (size_t i = 0; i < numberOfArguments; i++) { union { uint64_t gpr; __m128 sse; long double x87; } value; enum { VALUE_GPR, VALUE_SSE, VALUE_X87 } valueType; typeEncoding = [methodSignature argumentTypeAtIndex: i]; if (*typeEncoding == 'r') typeEncoding++; |
︙ | ︙ | |||
85 86 87 88 89 90 91 | 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) | < < < < | < | | | | | < | < | | | | | < | > > > > > > > > | > | 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 | 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 'f':; float floatTmp; [invocation getArgument: &floatTmp atIndex: i]; value.sse = _mm_set_ss(floatTmp); valueType = VALUE_SSE; break; case 'd':; double doubleTmp; [invocation getArgument: &doubleTmp atIndex: i]; value.sse = _mm_set_sd(doubleTmp); valueType = VALUE_SSE; break; case 'D': [invocation getArgument: &value.x87 atIndex: i]; valueType = VALUE_X87; break; 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 #ifdef __SIZEOF_INT128__ /* TODO: 't' */ /* TODO: 'T' */ #endif default: free(context); @throw [OFInvalidFormatException exception]; #undef CASE_GPR } switch (valueType) { case VALUE_GPR: if (currentGPR < NUM_GPR_IN) context->gpr[currentGPR++] = value.gpr; else { struct call_context *newContext; context->stack_size++; |
︙ | ︙ | |||
148 149 150 151 152 153 154 | context->stack_size * 8]; } context = newContext; context->stack[context->stack_size - 1] = value.gpr; } | > | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | context->stack_size * 8]; } context = newContext; context->stack[context->stack_size - 1] = value.gpr; } break; case VALUE_SSE: if (currentSSE < NUM_SSE_IN) { context->sse[currentSSE++] = value.sse; context->num_sse_used++; } else { struct call_context *newContext; double tmp; |
︙ | ︙ | |||
173 174 175 176 177 178 179 | } context = newContext; _mm_store_sd(&tmp, value.sse); memcpy(&context->stack[context->stack_size - 1], &tmp, 8); } | > > > > | > | > > > > > > > > | | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < | < | | | < | < | | | < | > > > > > > | 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 | } context = newContext; _mm_store_sd(&tmp, value.sse); memcpy(&context->stack[context->stack_size - 1], &tmp, 8); } break; case VALUE_X87: { struct call_context *newContext; context->stack_size += 2; 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; memcpy(&context->stack[context->stack_size - 2], &value.x87, 16); } break; } } typeEncoding = [methodSignature methodReturnType]; if (*typeEncoding == 'r') typeEncoding++; switch (*typeEncoding) { case 'c': case 'C': case 'i': case 'I': case 's': case 'S': case 'l': case 'L': case 'q': case 'Q': case 'f': case 'd': case 'B': case '*': case '@': case '#': case ':': case '^': context->return_type = RETURN_TYPE_NORMAL; break; case 'D': context->return_type = RETURN_TYPE_X87; break; /* TODO: '[' */ /* TODO: '{' */ /* TODO: '(' */ #ifndef __STDC_NO_COMPLEX__ /* TODO: 'j' */ #endif #ifdef __SIZEOF_INT128__ /* TODO: 't' */ /* TODO: 'T' */ #endif default: free(context); @throw [OFInvalidFormatException exception]; } of_invocation_call(context); 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) case 'f':; float floatTmp; _mm_store_ss(&floatTmp, context->sse[0]); [invocation setReturnValue: &floatTmp]; break; case 'd':; double doubleTmp; _mm_store_sd(&doubleTmp, context->sse[0]); [invocation setReturnValue: &doubleTmp]; break; case 'D': [invocation setReturnValue: &context->x87[0]]; break; 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 #ifdef __SIZEOF_INT128__ /* TODO: 't' */ /* TODO: 'T' */ #endif default: free(context); @throw [OFInvalidFormatException exception]; #undef CASE_GPR } free(context); } |
Modified tests/OFInvocationTests.m from [f2f7a265ba] to [d5cabd9696].
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | : (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; | > > > > > > > > > > > > > > > > > > > > > | 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 | : (double)d14 : (double)d15 : (double)d16 { return (d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10 + d11 + d12 + d13 + d14 + d15 + d16) / 16; } - (long double)invocationTestMethod4: (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; } - (void)invocationTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; SEL selector = @selector(invocationTestMethod1::::); OFMethodSignature *sig = [self methodSignatureForSelector: selector]; OFInvocation *invocation; |
︙ | ︙ | |||
171 172 173 174 175 176 177 178 179 180 181 182 | atIndex: i + 1]; } double doubleResult; TEST(@"-[invoke] #2", R([invocation invoke]) && R([invocation getReturnValue: &doubleResult]) && doubleResult == 8.5) #endif [pool drain]; } @end | > > > > > > > > > > > > > > > > > > > > > > > > | 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 | atIndex: i + 1]; } double doubleResult; TEST(@"-[invoke] #2", R([invocation invoke]) && R([invocation getReturnValue: &doubleResult]) && doubleResult == 8.5) /* Only when encoding long doubles is supported */ if (strcmp(@encode(double), @encode(long double)) != 0) { /* -[invoke] #3 */ selector = @selector(invocationTestMethod4::::::::::::::::); invocation = [OFInvocation invocationWithMethodSignature: [self methodSignatureForSelector: selector]]; [invocation setArgument: &self atIndex: 0]; [invocation setArgument: &selector atIndex: 1]; for (int i = 1; i <= 16; i++) { long double d = i; [invocation setArgument: &d atIndex: i + 1]; } long double longDoubleResult; TEST(@"-[invoke] #3", R([invocation invoke]) && R([invocation getReturnValue: &longDoubleResult]) && longDoubleResult == 8.5) } #endif [pool drain]; } @end |