Changes In Branch runtime Through [3719e10281] Excluding Merge-Ins
This is equivalent to a diff from 8e0c9d89f9 to 3719e10281
2012-03-23
| ||
12:42 | Add objc_{get,set}PropertyStruct() for GCC >= 4.6. check-in: 08f1d13520 user: js tags: runtime | |
12:41 | Remove hack not necessary anymore. check-in: 03a7cd6427 user: js tags: trunk | |
12:04 | Merge branch 'master' into runtime check-in: 3719e10281 user: js tags: runtime | |
11:08 | Fix class_replaceMethod(). check-in: db2fccd01f user: js tags: runtime | |
2012-03-21
| ||
20:28 | Update buildsys. check-in: 8e0c9d89f9 user: js tags: trunk | |
17:51 | Always pass a char for copy to objc_setProperty(). check-in: 3a983475bc user: js tags: trunk | |
Modified configure.ac from [587857d1f8] to [66c5f3668b].
︙ | |||
124 125 126 127 128 129 130 | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | AC_SUBST(OFBLOCKTESTS_M, "OFBlockTests.m") AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) OBJCFLAGS="$old_OBJCFLAGS" ]) |
︙ | |||
240 241 242 243 244 245 246 247 248 249 250 251 252 253 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | AS_IF([test x"$PLUGIN_SUFFIX" != x""], [ AC_SUBST(OFPLUGIN_M, "OFPlugin.m") AC_SUBST(OFPLUGINTESTS_M, "OFPluginTests.m") AC_SUBST(TESTPLUGIN, "plugin") AC_DEFINE(OF_PLUGINS, 1, [Whether we have plugin support]) AC_SUBST(OFPLUGINS_DEF, "-DOF_PLUGINS") ]) objc_runtime="ObjFW runtime" AC_CHECK_HEADER(objc/objc.h) AC_MSG_CHECKING(which Objective C runtime to use) AS_IF([test x"$ac_cv_header_objc_objc_h" = x"yes"], [ dnl TODO: This is ugly. Let's think of a better check. AC_EGREP_CPP(yes, [ #import <objc/objc.h> #ifdef __objc_INCLUDE_GNU yes #endif ], [ dnl We don't want the GNU runtime ], [ objc_runtime="Apple runtime" ]) ]) AC_MSG_RESULT($objc_runtime) case $objc_runtime in "ObjFW runtime") AC_DEFINE(OF_OBJFW_RUNTIME, 1, [Whether we use the ObjFW runtime]) AC_SUBST(GNU_RUNTIME, "-fgnu-runtime") OBJCFLAGS="$OBJCFLAGS -fgnu-runtime" AC_SUBST(RUNTIME, "runtime") if test x"$enable_shared" != x"no"; then AC_SUBST(RUNTIME_LIB_A, "runtime.lib.a") AC_SUBST(RUNTIME_RUNTIME_LIB_A, "runtime/runtime.lib.a") fi if test x"$enable_static" = x"yes" \ -o x"$enable_shared" = x"no"; then AC_SUBST(RUNTIME_A, "runtime.a") AC_SUBST(RUNTIME_RUNTIME_A, "runtime/runtime.a") fi ;; "Apple runtime") AC_DEFINE(OF_APPLE_RUNTIME, 1, [Whether we use the Apple ObjC runtime]) AC_CHECK_LIB(objc, objc_msgSend, [ LIBS="-lobjc $LIBS" ], [ AC_MSG_ERROR([libobjc not found!]) ]) ;; esac AC_CHECK_FUNC(objc_getProperty,, [ AC_DEFINE(NEED_OBJC_PROPERTIES_INIT, 1, [Whether objc_properties_init needs to be called]) AC_SUBST(OBJC_PROPERTIES_M, "objc_properties.m") ]) AC_CHECK_FUNC(objc_enumerationMutation, [ AC_DEFINE(HAVE_OBJC_ENUMERATIONMUTATION, 1, [Whether we have objc_enumerationMutation]) ]) case "$host_os" in darwin*) AC_SUBST(REEXPORT_LIBOBJC, ["-Wl,-reexport-lobjc"]) AC_SUBST(LDFLAGS_REEXPORT, ["-Wl,-reexport-lobjfw"]) AC_SUBST(MACH_ALIAS_LIST, ["-Xarch_x86_64 -Wl,-alias_list,mach_alias_list"]) |
︙ | |||
574 575 576 577 578 579 580 | 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 | - + | AC_MSG_RESULT($have_threadsafe_getaddrinfo) ]) ], [ AC_MSG_RESULT(no) ]) |
︙ |
Modified extra.mk.in from [c78962a205] to [4dec53a4cc].
︙ | |||
22 23 24 25 26 27 28 29 30 31 32 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | + + + + + | OFSTREAMOBSERVER_KQUEUE_M = @OFSTREAMOBSERVER_KQUEUE_M@ OFSTREAMOBSERVER_POLL_M = @OFSTREAMOBSERVER_POLL_M@ OFSTREAMOBSERVER_SELECT_M = @OFSTREAMOBSERVER_SELECT_M@ OFTHREAD_M = @OFTHREAD_M@ OFTHREADTESTS_M = @OFTHREADTESTS_M@ PROPERTIESTESTS_M = @PROPERTIESTESTS_M@ REEXPORT_LIBOBJC = @REEXPORT_LIBOBJC@ RUNTIME = @RUNTIME@ RUNTIME_A = @RUNTIME_A@ RUNTIME_RUNTIME_A = @RUNTIME_RUNTIME_A@ RUNTIME_RUNTIME_LIB_A = @RUNTIME_RUNTIME_LIB_A@ RUNTIME_LIB_A = @RUNTIME_LIB_A@ TESTPLUGIN = @TESTPLUGIN@ TESTS = @TESTS@ TEST_LAUNCHER = @TEST_LAUNCHER@ THREADING_H = @THREADING_H@ |
Modified src/Makefile from [5510425993] to [09b46eda88].
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | include ../extra.mk |
︙ | |||
95 96 97 98 99 100 101 | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | + - - + + - + | OFTCPSocket+SOCKS5.m \ ${ASPRINTF_M} \ ${FOUNDATION_COMPAT_M} \ iso_8859_15.m \ windows_1252.m \ ${OBJC_PROPERTIES_M} \ ${OBJC_SYNC_M} |
Modified src/OFBlock.m from [5825d5d284] to [100cdf479d].
︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | + + | #include <stdlib.h> #include <string.h> #include <assert.h> #if defined(OF_APPLE_RUNTIME) && !defined(__OBJC2__) # import <objc/runtime.h> #elif defined(OF_OBJFW_RUNTIME) # import "runtime-private.h" #endif #import "OFBlock.h" #import "OFAllocFailedException.h" #import "OFInitializationFailedException.h" #import "OFNotImplementedException.h" |
︙ | |||
69 70 71 72 73 74 75 | 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 | - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - + + + - - - + + + - - - - + + + + + + + - + - - - - + + | }; @protocol RetainRelease - retain; - (void)release; @end |
︙ |
Modified src/OFIntrospection.m from [3e6c8b04d5] to [e4635330ec].
︙ | |||
14 15 16 17 18 19 20 | 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 | - + - - - + - - - - - - - - - - - - - - - - - - | * file. */ #include "config.h" #include <stdlib.h> |
︙ | |||
96 97 98 99 100 101 102 | 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 | - + - - - - - - - - - - - - - - - - - - | { return [OFString stringWithFormat: @"<OFMethod: %@ [%s]>", name, typeEncoding]; } @end @implementation OFInstanceVariable |
︙ | |||
168 169 170 171 172 173 174 | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | - + | } @end #ifdef OF_HAVE_PROPERTIES @implementation OFProperty @synthesize name, attributes; |
︙ | |||
218 219 220 221 222 223 224 | 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 | - + - - - + | - initWithClass: (Class)class { self = [super init]; @try { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; |
︙ | |||
286 287 288 289 290 291 292 | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | _initWithProperty: propertyList[i]] autorelease]]; [pool releaseObjects]; } } @finally { free(propertyList); } |
︙ |
Modified src/OFObject.h from [9620b63ed6] to [c823dc085d].
︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | - + | #endif #include <stddef.h> #include <stdint.h> #include <limits.h> #ifdef OF_OBJFW_RUNTIME |
︙ |
Modified src/OFObject.m from [708e72ca3d] to [97e6d3c1aa].
︙ | |||
36 37 38 39 40 41 42 | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | - + - + - - | #import "OFMemoryNotPartOfObjectException.h" #import "OFNotImplementedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "macros.h" |
︙ | |||
77 78 79 80 81 82 83 | 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 | - - - - - + | (__BIGGEST_ALIGNMENT__ - 1)) & ~(__BIGGEST_ALIGNMENT__ - 1)) #define PRE_IVAR ((struct pre_ivar*)(void*)((char*)self - PRE_IVAR_ALIGN)) #define PRE_MEM_ALIGN ((sizeof(struct pre_mem) + \ (__BIGGEST_ALIGNMENT__ - 1)) & ~(__BIGGEST_ALIGNMENT__ - 1)) #define PRE_MEM(mem) ((struct pre_mem*)(void*)((char*)mem - PRE_MEM_ALIGN)) |
︙ | |||
125 126 127 128 129 130 131 | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | - - - - | void objc_enumerationMutation(id object) { enumeration_mutation_handler(object); } #endif |
︙ | |||
182 183 184 185 186 187 188 | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | const char* _NSPrintForDebugger(id object) { return [[object description] cStringWithEncoding: OF_STRING_ENCODING_NATIVE]; } |
︙ | |||
236 237 238 239 240 241 242 | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | - + | if (!objc_properties_init()) { fputs("Runtime error: objc_properties_init() failed!\n", stderr); abort(); } #endif |
︙ | |||
312 313 314 315 316 317 318 | 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 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | + (Class)superclass { return class_getSuperclass(self); } + (BOOL)instancesRespondToSelector: (SEL)selector { |
︙ | |||
425 426 427 428 429 430 431 | 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 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + | typeEncoding: typeEncoding]; } + (IMP)replaceInstanceMethod: (SEL)selector withImplementation: (IMP)implementation typeEncoding: (const char*)typeEncoding { |
︙ | |||
576 577 578 579 580 581 582 | 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 | - - + + - - + + - - + + - - + + - - + + - - - | [self replaceInstanceMethod: selector withMethodFromClass: class]; } } @finally { free(methodList); } |
︙ | |||
674 675 676 677 678 679 680 | 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 | - - - - - - - - + | - (BOOL)isMemberOfClass: (Class)class { return (isa == class); } - (BOOL)respondsToSelector: (SEL)selector { |
︙ | |||
734 735 736 737 738 739 740 | 563 564 565 566 567 568 569 570 571 572 573 574 575 576 | - - - - - - - - - | const char *ret; if ((ret = objc_get_type_encoding(isa, selector)) == NULL) @throw [OFNotImplementedException exceptionWithClass: isa selector: selector]; return ret; |
︙ | |||
941 942 943 944 945 946 947 | 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 | - + | #endif } - autorelease { /* * Cache OFAutoreleasePool since class lookups are expensive with the |
︙ |
Modified src/OFThread.m from [ee16dd390b] to [15c3b7304d].
︙ | |||
23 24 25 26 27 28 29 | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | - - - - | #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif |
︙ | |||
57 58 59 60 61 62 63 | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | - - - - | static of_tlskey_t threadSelf; static id call_main(id object) { OFThread *thread = (OFThread*)object; |
︙ | |||
87 88 89 90 91 92 93 | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | - - - - | thread->running = OF_THREAD_WAITING_FOR_JOIN; [OFTLSKey callAllDestructors]; [OFAutoreleasePool _releaseAll]; [thread release]; |
︙ | |||
223 224 225 226 227 228 229 | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | - - - - | } [OFTLSKey callAllDestructors]; [OFAutoreleasePool _releaseAll]; [thread release]; |
︙ |
Modified src/base64.h from [1cfc5e7ce8] to [86d7b49ac9].
︙ | |||
20 21 22 23 24 25 26 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | - + | # define __STDC_LIMIT_MACROS #endif #ifndef __STDC_CONSTANT_MACROS # define __STDC_CONSTANT_MACROS #endif #ifdef OF_OBJFW_RUNTIME |
︙ |
Modified src/exceptions/Makefile from [f45b67542a] to [7c2fda7df6].
︙ | |||
55 56 57 58 59 60 61 | 55 56 57 58 59 60 61 62 63 | - + | OFUnsupportedProtocolException.m \ OFWriteFailedException.m INCLUDES = ${SRCS:.m=.h} include ../../buildsys.mk |
Modified src/macros.h from [ef3c33f2fd] to [5266d93197].
︙ | |||
15 16 17 18 19 20 21 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | - + - - | */ #import "OFObject.h" #include <stddef.h> #include <stdint.h> |
︙ | |||
77 78 79 80 81 82 83 | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | - + - - - - - - - - | # elif defined(__ppc__) || defined(__PPC__) # define OF_PPC_ASM # elif defined(__arm__) || defined(__ARM__) # define OF_ARM_ASM # endif #endif |
︙ |
Modified src/objc_sync.m from [6d549f3b5e] to [1594a5423a].
︙ | |||
19 20 21 22 23 24 25 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | - + | #include <stdio.h> #include <stdlib.h> #include <assert.h> #include <sys/types.h> #ifdef OF_OBJFW_RUNTIME |
︙ |
Added src/runtime/Makefile version [48afff7077].
|
Added src/runtime/category.m version [d939f47c4b].