Overview
| Comment: | OFMethodSignature: Correctly handle Darwin/PPC ABI |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f641fc7faa0201780cd9da6cf543a795 |
| User & Date: | js on 2017-10-22 18:31:43 |
| Other Links: | manifest | tags |
Context
|
2017-10-22
| ||
| 20:58 | Make struct size a multiple of the alignment check-in: b52c4a41e4 user: js tags: trunk | |
| 18:31 | OFMethodSignature: Correctly handle Darwin/PPC ABI check-in: f641fc7faa user: js tags: trunk | |
| 17:05 | Minor style fix check-in: dbb71903e0 user: js tags: trunk | |
Changes
Modified src/OFMethodSignature.m from [42dcab5ffc] to [70534fd085].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" #import "macros.h" | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
#import "macros.h"
size_t alignofEncoding(const char **type, size_t *length);
size_t sizeofEncoding(const char **type, size_t *length);
size_t
alignofArray(const char **type, size_t *length)
{
size_t align;
assert(*length > 0);
|
| ︙ | ︙ | |||
301 302 303 304 305 306 307 308 309 310 311 312 313 314 |
return align;
}
size_t
alignofStruct(const char **type, size_t *length)
{
size_t align = 0;
assert(*length > 0);
(*type)++;
(*length)--;
/* Skip name */
| > > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 |
return align;
}
size_t
alignofStruct(const char **type, size_t *length)
{
size_t align = 0;
#if defined(OF_POWERPC) && defined(OF_MACOS)
bool first = true;
#endif
assert(*length > 0);
(*type)++;
(*length)--;
/* Skip name */
|
| ︙ | ︙ | |||
322 323 324 325 326 327 328 329 330 331 332 333 334 335 |
/* Skip '=' */
(*type)++;
(*length)--;
while (*length > 0 && **type != '}') {
size_t fieldAlign = alignofEncoding(type, length);
if (fieldAlign > align)
align = fieldAlign;
}
if (*length == 0 || **type != '}')
@throw [OFInvalidFormatException exception];
| > > > > > > > | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 |
/* Skip '=' */
(*type)++;
(*length)--;
while (*length > 0 && **type != '}') {
size_t fieldAlign = alignofEncoding(type, length);
#if defined(OF_POWERPC) && defined(OF_MACOS)
if (!first && fieldAlign > 4)
fieldAlign = 4;
first = false;
#endif
if (fieldAlign > align)
align = fieldAlign;
}
if (*length == 0 || **type != '}')
@throw [OFInvalidFormatException exception];
|
| ︙ | ︙ | |||
491 492 493 494 495 496 497 498 499 500 501 502 503 504 |
}
(*type)++;
(*length)--;
return align;
}
size_t
of_sizeof_type_encoding(const char *type)
{
size_t length = strlen(type);
size_t ret = sizeofEncoding(&type, &length);
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 |
}
(*type)++;
(*length)--;
return align;
}
size_t
sizeofArray(const char **type, size_t *length)
{
size_t count = 0;
size_t size;
assert(*length > 0);
(*type)++;
(*length)--;
while (*length > 0 && isdigit(**type)) {
count = count * 10 + **type - '0';
(*type)++;
(*length)--;
}
if (count == 0)
@throw [OFInvalidFormatException exception];
size = sizeofEncoding(type, length);
if (*length == 0 || **type != ']')
@throw [OFInvalidFormatException exception];
(*type)++;
(*length)--;
if (SIZE_MAX / count < size)
@throw [OFOutOfRangeException exception];
return count * size;
}
size_t
sizeofStruct(const char **type, size_t *length)
{
size_t size = 0;
#if defined(OF_POWERPC) && defined(OF_MACOS)
bool first = true;
size_t alignment;
{
const char *typeCopy = *type;
size_t lengthCopy = *length;
alignment = alignofStruct(&typeCopy, &lengthCopy);
}
#endif
assert(*length > 0);
(*type)++;
(*length)--;
/* Skip name */
while (*length > 0 && **type != '=') {
(*type)++;
(*length)--;
}
if (*length == 0)
@throw [OFInvalidFormatException exception];
/* Skip '=' */
(*type)++;
(*length)--;
while (*length > 0 && **type != '}') {
const char *typeCopy = *type;
size_t lengthCopy = *length;
size_t fieldSize = sizeofEncoding(type, length);
size_t fieldAlign = alignofEncoding(&typeCopy, &lengthCopy);
#if defined(OF_POWERPC) && defined(OF_MACOS)
if (!first && fieldAlign > 4)
fieldAlign = 4;
first = false;
#endif
if (size % fieldAlign != 0) {
size_t padding = fieldAlign - (size % fieldAlign);
if (SIZE_MAX - size < padding)
@throw [OFOutOfRangeException exception];
size += padding;
}
if (SIZE_MAX - size < fieldSize)
@throw [OFOutOfRangeException exception];
size += fieldSize;
}
if (*length == 0 || **type != '}')
@throw [OFInvalidFormatException exception];
(*type)++;
(*length)--;
#if defined(OF_POWERPC) && defined(OF_MACOS)
if (size % alignment != 0) {
size_t padding = alignment - (size % alignment);
if (SIZE_MAX - size < padding)
@throw [OFOutOfRangeException exception];
size += padding;
}
#endif
return size;
}
size_t
sizeofUnion(const char **type, size_t *length)
{
size_t size = 0;
assert(*length > 0);
(*type)++;
(*length)--;
/* Skip name */
while (*length > 0 && **type != '=') {
(*type)++;
(*length)--;
}
if (*length == 0)
@throw [OFInvalidFormatException exception];
/* Skip '=' */
(*type)++;
(*length)--;
while (*length > 0 && **type != ')') {
size_t fieldSize = sizeofEncoding(type, length);
if (fieldSize > size)
size = fieldSize;
}
if (*length == 0 || **type != ')')
@throw [OFInvalidFormatException exception];
(*type)++;
(*length)--;
return size;
}
size_t
sizeofEncoding(const char **type, size_t *length)
{
size_t size;
if (*length == 0)
@throw [OFInvalidFormatException exception];
if (**type == 'r') {
(*type)++;
(*length)--;
if (*length == 0)
@throw [OFInvalidFormatException exception];
}
switch (**type) {
case 'c':
case 'C':
size = sizeof(char);
break;
case 'i':
case 'I':
size = sizeof(int);
break;
case 's':
case 'S':
size = sizeof(short);
break;
case 'l':
case 'L':
size = sizeof(long);
break;
case 'q':
case 'Q':
size = sizeof(long long);
break;
#ifdef __SIZEOF_INT128__
case 't':
case 'T':
size = __extension__ sizeof(__int128);
break;
#endif
case 'f':
size = sizeof(float);
break;
case 'd':
size = sizeof(double);
break;
case 'D':
size = sizeof(long double);
break;
case 'B':
size = sizeof(_Bool);
break;
case 'v':
size = 0;
break;
case '*':
size = sizeof(char *);
break;
case '@':
size = sizeof(id);
break;
case '#':
size = sizeof(Class);
break;
case ':':
size = sizeof(SEL);
break;
case '[':
return sizeofArray(type, length);
case '{':
return sizeofStruct(type, length);
case '(':
return sizeofUnion(type, length);
case '^':
/* Just to skip over the rest */
(*type)++;
(*length)--;
sizeofEncoding(type, length);
return sizeof(void *);
#ifndef __STDC_NO_COMPLEX__
case 'j':
(*type)++;
(*length)--;
if (*length == 0)
@throw [OFInvalidFormatException exception];
switch (**type) {
case 'f':
size = sizeof(float _Complex);
break;
case 'd':
size = sizeof(double _Complex);
break;
case 'D':
size = sizeof(long double _Complex);
break;
default:
@throw [OFInvalidFormatException exception];
}
break;
#endif
default:
@throw [OFInvalidFormatException exception];
}
(*type)++;
(*length)--;
return size;
}
size_t
of_sizeof_type_encoding(const char *type)
{
size_t length = strlen(type);
size_t ret = sizeofEncoding(&type, &length);
|
| ︙ | ︙ |
Modified tests/OFMethodSignatureTests.m from [1b62db423d] to [c1209d706c].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 |
#import "TestsAppDelegate.h"
static OFString *module = @"OFMethodSignature";
struct test1_struct {
char c;
int i;
};
struct test2_struct {
char c;
struct {
short s;
int i;
} st;
union {
char c;
int i;
} u;
| > | | | | 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 |
#import "TestsAppDelegate.h"
static OFString *module = @"OFMethodSignature";
struct test1_struct {
char c;
int i;
char d;
};
struct test2_struct {
char c;
struct {
short s;
int i;
} st;
union {
char c;
int i;
} u;
double d;
};
union test3_union {
char c;
int i;
double d;
};
union test4_union {
char c;
struct {
short x, y;
} st;
int i;
union {
float f;
double d;
} u;
};
@implementation TestsAppDelegate (OFMethodSignatureTests)
- (void)methodSignatureTests
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
|
| ︙ | ︙ | |||
129 130 131 132 133 134 135 | of_sizeof_type_encoding(@encode(union test4_union)) == sizeof(union test4_union)) TEST(@"of_sizeof_type_encoding() #5", of_sizeof_type_encoding(@encode(struct test1_struct [5])) == sizeof(struct test1_struct [5])) | | | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | of_sizeof_type_encoding(@encode(union test4_union)) == sizeof(union test4_union)) TEST(@"of_sizeof_type_encoding() #5", of_sizeof_type_encoding(@encode(struct test1_struct [5])) == sizeof(struct test1_struct [5])) TEST(@"of_alignof_type_encoding() #1", of_alignof_type_encoding(@encode(struct test1_struct)) == OF_ALIGNOF(struct test1_struct)) TEST(@"of_alignof_type_encoding() #2", of_alignof_type_encoding(@encode(struct test2_struct)) == OF_ALIGNOF(struct test2_struct)) |
| ︙ | ︙ |