Changes In Branch runtime Through [feed2dbe67] Excluding Merge-Ins
This is equivalent to a diff from 43038ba0a6 to feed2dbe67
2012-03-06
| ||
16:24 | objc_replace_{class,instance}_method() -> class_replaceMethod(). check-in: 2e39765aa2 user: js tags: runtime | |
2012-03-05
| ||
00:13 | Add missing -I for runtime in tests. check-in: feed2dbe67 user: js tags: runtime | |
00:01 | Add sel_isEqual(). check-in: 7215a36f5a user: js tags: runtime | |
2012-03-04
| ||
22:06 | Add OFTLSSocket protocol. check-in: dfe3aadc7e user: js tags: trunk | |
19:08 | Create runtime branch. check-in: 8e770e102d user: js tags: runtime | |
2012-03-02
| ||
16:37 |
@finally { [pool release]; } is a bad idea when throwing exceptions. The exception is released before it is ever caught. check-in: 43038ba0a6 user: js tags: trunk | |
2012-03-01
| ||
15:03 | Fix OFDate documentation. check-in: 3b2d8b81ed user: js tags: trunk | |
Modified configure.ac from [be20c9c7db] to [965b9ca7ef].
︙ | |||
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 [512d8f1f74] to [d7f52119d7].
︙ | |||
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 [effe04d38d] to [652d953755].
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | include ../extra.mk |
︙ | |||
96 97 98 99 100 101 102 | 96 97 98 99 100 101 102 103 104 105 106 107 108 | - + - - + + | iso_8859_15.m \ windows_1252.m \ ${OBJC_PROPERTIES_M} \ ${OBJC_SYNC_M} include ../buildsys.mk |
Modified src/OFBlock.m from [aca779a840] to [5f9f9c11d5].
︙ | |||
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 [131792314e] to [37e4450eb1].
︙ | |||
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 [76ac8473f2] to [ad59fef6e2].
︙ | |||
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" |
︙ | |||
74 75 76 77 78 79 80 | 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 | - - - - - + | # define __BIGGEST_ALIGNMENT__ 16 #endif #define PRE_IVAR_ALIGN ((sizeof(struct pre_ivar) + \ (__BIGGEST_ALIGNMENT__ - 1)) & ~(__BIGGEST_ALIGNMENT__ - 1)) #define PRE_IVAR ((struct pre_ivar*)(void*)((char*)self - PRE_IVAR_ALIGN)) |
︙ | |||
121 122 123 124 125 126 127 | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | void objc_enumerationMutation(id object) { enumeration_mutation_handler(object); } #endif |
︙ | |||
186 187 188 189 190 191 192 | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | - + | if (!objc_properties_init()) { fputs("Runtime error: objc_properties_init() failed!\n", stderr); abort(); } #endif |
︙ | |||
298 299 300 301 302 303 304 | 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 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | + (Class)superclass { return class_getSuperclass(self); } + (BOOL)instancesRespondToSelector: (SEL)selector { |
︙ | |||
388 389 390 391 392 393 394 | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | { #if defined(OF_OBJFW_RUNTIME) if (newImp == (IMP)0 || !class_respondsToSelector(self->isa, selector)) @throw [OFInvalidArgumentException exceptionWithClass: self selector: _cmd]; return objc_replace_class_method(self, selector, newImp); |
︙ | |||
463 464 465 466 467 468 469 | 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | { #if defined(OF_OBJFW_RUNTIME) if (newImp == (IMP)0 || !class_respondsToSelector(self, selector)) @throw [OFInvalidArgumentException exceptionWithClass: self selector: _cmd]; return objc_replace_instance_method(self, selector, newImp); |
︙ | |||
528 529 530 531 532 533 534 | 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 | - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + | forInstanceMethod: selector]; } + (BOOL)addInstanceMethod: (SEL)selector withTypeEncoding: (const char*)typeEncoding implementation: (IMP)implementation { |
︙ | |||
680 681 682 683 684 685 686 | 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 | - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | withTypeEncoding: typeEncoding implementation: implementation]; } } } @finally { free(methodList); } |
︙ | |||
785 786 787 788 789 790 791 | 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 | - - - - - - - - + | - (BOOL)isMemberOfClass: (Class)class { return (isa == class); } - (BOOL)respondsToSelector: (SEL)selector { |
︙ | |||
845 846 847 848 849 850 851 | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 | - - - - - - - - - | const char *ret; if ((ret = objc_get_type_encoding(isa, selector)) == NULL) @throw [OFNotImplementedException exceptionWithClass: isa selector: selector]; return ret; |
︙ |
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 [d255a09914] to [52ea94e401].
︙ | |||
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> |
︙ | |||
72 73 74 75 76 77 78 | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | - + - - - - - - - - | # 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 [700f73028d].
|
Added src/runtime/asm/amd64-elf/lookup.S version [1fd16b224f].
|
Added src/runtime/asm/x86-elf/lookup.S version [213672a51c].
|
Added src/runtime/category.m version [d939f47c4b].