Differences From Artifact [8335b4d9d4]:
- File
src/OFObject.m
— part of check-in
[2547c1c4ce]
at
2024-02-13 22:40:37
on branch trunk
— Make sure objects are correctly aligned on Windows
malloc() on Windows XP only aligns with 8 bytes, which is not enough for
SSE. (user: js, size: 29153) [annotate] [blame] [check-ins using] [more...]
To Artifact [69eb852a00]:
- File
src/OFObject.m
— part of check-in
[7965aac7d5]
at
2024-02-18 22:03:00
on branch trunk
— Use __mingw_aligned_* instead of _aligned_*
These are available on Windows 98 as well. (user: js, size: 29181) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
340 341 342 343 344 345 346 | PRE_IVARS_ALIGN + instanceSize) - PRE_IVARS_ALIGN - instanceSize; #ifndef OF_WINDOWS instance = calloc(1, PRE_IVARS_ALIGN + instanceSize + extraAlignment + extraSize); #else | | | | | 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 |
PRE_IVARS_ALIGN + instanceSize) -
PRE_IVARS_ALIGN - instanceSize;
#ifndef OF_WINDOWS
instance = calloc(1, PRE_IVARS_ALIGN + instanceSize +
extraAlignment + extraSize);
#else
instance = __mingw_aligned_malloc(PRE_IVARS_ALIGN + instanceSize +
extraAlignment + extraSize, OF_BIGGEST_ALIGNMENT);
memset(instance, 0, PRE_IVARS_ALIGN + instanceSize + extraAlignment +
extraSize);
#endif
if OF_UNLIKELY (instance == nil) {
object_setClass((id)&allocFailedException,
[OFAllocFailedException class]);
@throw (id)&allocFailedException;
}
((struct PreIvars *)instance)->retainCount = 1;
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
if OF_UNLIKELY (OFSpinlockNew(
&((struct PreIvars *)instance)->retainCountSpinlock) != 0) {
# ifndef OF_WINDOWS
free(instance);
# else
__mingw_aligned_free(instance);
# endif
@throw [OFInitializationFailedException
exceptionWithClass: class];
}
#endif
instance = (OFObject *)(void *)((char *)instance + PRE_IVARS_ALIGN);
if (!objc_constructInstance(class, instance)) {
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
OFSpinlockFree(&((struct PreIvars *)(void *)
((char *)instance - PRE_IVARS_ALIGN))->retainCountSpinlock);
#endif
#ifndef OF_WINDOWS
free((char *)instance - PRE_IVARS_ALIGN);
#else
__mingw_aligned_free((char *)instance - PRE_IVARS_ALIGN);
#endif
@throw [OFInitializationFailedException
exceptionWithClass: class];
}
if OF_UNLIKELY (extra != NULL)
*extra = (char *)instance + instanceSize + extraAlignment;
|
| ︙ | ︙ | |||
1248 1249 1250 1251 1252 1253 1254 | #if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS) OFSpinlockFree(&PRE_IVARS->retainCountSpinlock); #endif #ifndef OF_WINDOWS free((char *)self - PRE_IVARS_ALIGN); #else | | | 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 |
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
OFSpinlockFree(&PRE_IVARS->retainCountSpinlock);
#endif
#ifndef OF_WINDOWS
free((char *)self - PRE_IVARS_ALIGN);
#else
__mingw_aligned_free((char *)self - PRE_IVARS_ALIGN);
#endif
}
/* Required to use properties with the Apple runtime */
- (id)copyWithZone: (void *)zone
{
if OF_UNLIKELY (zone != NULL) {
|
| ︙ | ︙ |