Index: src/OFDNSResolver.m ================================================================== --- src/OFDNSResolver.m +++ src/OFDNSResolver.m @@ -798,11 +798,11 @@ OFNumber *ID; OFDNSResolverContext *context; /* Random, unused ID */ do { - ID = [OFNumber numberWithUnsignedShort: of_random16()]; + ID = [OFNumber numberWithUnsignedShort: OFRandom16()]; } while ([_queries objectForKey: ID] != nil); if (query.domainName.UTF8StringLength > 253) @throw [OFOutOfRangeException exception]; Index: src/OFMapTable.m ================================================================== --- src/OFMapTable.m +++ src/OFMapTable.m @@ -152,12 +152,12 @@ if (_capacity < MIN_CAPACITY) _capacity = MIN_CAPACITY; _buckets = OFAllocZeroedMemory(_capacity, sizeof(*_buckets)); - if (of_hash_seed != 0) - _rotate = of_random16() & 31; + if (OFHashSeed != 0) + _rotate = OFRandom16() & 31; } @catch (id e) { [self release]; @throw e; } @@ -524,12 +524,12 @@ /* * Get a new random value for _rotate, so that it is not less secure * than creating a new hash map. */ - if (of_hash_seed != 0) - _rotate = of_random16() & 31; + if (OFHashSeed != 0) + _rotate = OFRandom16() & 31; } - (bool)containsObject: (void *)object { if (object == NULL || _count == 0) Index: src/OFObject.h ================================================================== --- src/OFObject.h +++ src/OFObject.h @@ -1309,18 +1309,35 @@ extern id _Nullable objc_constructInstance(Class _Nullable class_, void *_Nullable bytes); extern void *_Nullable objc_destructInstance(id _Nullable object); # endif #endif -extern id of_alloc_object(Class class_, size_t extraSize, - size_t extraAlignment, void *_Nullable *_Nullable extra); -extern void OF_NO_RETURN_FUNC of_method_not_found(id self, SEL _cmd); -extern uint32_t of_hash_seed; -/* These do *NOT* provide cryptographically secure randomness! */ -extern uint16_t of_random16(void); -extern uint32_t of_random32(void); -extern uint64_t of_random64(void); +extern id OFAllocObject(Class class_, size_t extraSize, size_t extraAlignment, + void *_Nullable *_Nullable extra); +extern void OF_NO_RETURN_FUNC OFMethodNotFound(id self, SEL _cmd); +extern uint32_t OFHashSeed; + +/** + * @brief Returns 16 bit or non-cryptographical randomness. + * + * @return 16 bit or non-cryptographical randomness + */ +extern uint16_t OFRandom16(void); + +/** + * @brief Returns 32 bit or non-cryptographical randomness. + * + * @return 32 bit or non-cryptographical randomness + */ +extern uint32_t OFRandom32(void); + +/** + * @brief Returns 64 bit or non-cryptographical randomness. + * + * @return 64 bit or non-cryptographical randomness + */ +extern uint64_t OFRandom64(void); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFObject.m ================================================================== --- src/OFObject.m +++ src/OFObject.m @@ -70,15 +70,15 @@ #ifdef OF_APPLE_RUNTIME extern id _Nullable _objc_rootAutorelease(id _Nullable object); #endif #if defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR) -extern id of_forward(id, SEL, ...); -extern struct stret of_forward_stret(id, SEL, ...); +extern id OFForward(id, SEL, ...); +extern struct stret OFForward_stret(id, SEL, ...); #else -# define of_forward of_method_not_found -# define of_forward_stret of_method_not_found_stret +# define OFForward OFMethodNotFound +# define OFForward_stret OFMethodNotFound_stret #endif struct pre_ivar { int retainCount; #if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS) @@ -92,11 +92,11 @@ static struct { Class isa; } allocFailedException; -uint32_t of_hash_seed; +uint32_t OFHashSeed; void * OFAllocMemory(size_t count, size_t size) { void *pointer; @@ -170,11 +170,11 @@ # endif } #endif uint16_t -of_random16(void) +OFRandom16(void) { #if defined(HAVE_ARC4RANDOM) return arc4random(); #elif defined(HAVE_GETRANDOM) uint16_t buffer; @@ -192,11 +192,11 @@ # endif #endif } uint32_t -of_random32(void) +OFRandom32(void) { #if defined(HAVE_ARC4RANDOM) return arc4random(); #elif defined(HAVE_GETRANDOM) uint32_t buffer; @@ -203,16 +203,16 @@ OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer)); return buffer; #else - return ((uint32_t)of_random16() << 16) | of_random16(); + return ((uint32_t)OFRandom16() << 16) | OFRandom16(); #endif } uint64_t -of_random64(void) +OFRandom64(void) { #if defined(HAVE_ARC4RANDOM_BUF) uint64_t buffer; arc4random_buf(&buffer, sizeof(buffer)); @@ -223,11 +223,11 @@ OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer)); return buffer; #else - return ((uint64_t)of_random32() << 32) | of_random32(); + return ((uint64_t)OFRandom32() << 32) | OFRandom32(); #endif } static const char * typeEncodingForSelector(Class class, SEL selector) @@ -269,11 +269,11 @@ { @throw [OFEnumerationMutationException exceptionWithObject: object]; } void OF_NO_RETURN_FUNC -of_method_not_found(id object, SEL selector) +OFMethodNotFound(id object, SEL selector) { [object doesNotRecognizeSelector: selector]; /* * Just in case doesNotRecognizeSelector: returned, even though it must @@ -283,17 +283,17 @@ OF_UNREACHABLE } void OF_NO_RETURN_FUNC -of_method_not_found_stret(void *stret, id object, SEL selector) +OFMethodNotFound_stret(void *stret, id object, SEL selector) { - of_method_not_found(object, selector); + OFMethodNotFound(object, selector); } id -of_alloc_object(Class class, size_t extraSize, size_t extraAlignment, +OFAllocObject(Class class, size_t extraSize, size_t extraAlignment, void **extra) { OFObject *instance; size_t instanceSize; @@ -366,25 +366,25 @@ * * Unfortunately, there is no way to check if a forward handler has * already been set, so this is the best we can do. */ if (dlsym(RTLD_DEFAULT, "NSFoundationVersionNumber") == NULL) - objc_setForwardHandler((void *)&of_forward, - (void *)&of_forward_stret); + objc_setForwardHandler((void *)&OFForward, + (void *)&OFForward_stret); #else - objc_setForwardHandler((IMP)&of_forward, (IMP)&of_forward_stret); + objc_setForwardHandler((IMP)&OFForward, (IMP)&OFForward_stret); #endif objc_setEnumerationMutationHandler(enumerationMutationHandler); do { - of_hash_seed = of_random32(); - } while (of_hash_seed == 0); + OFHashSeed = OFRandom32(); + } while (OFHashSeed == 0); #ifdef OF_OBJFW_RUNTIME objc_setTaggedPointerSecret(sizeof(uintptr_t) == 4 - ? (uintptr_t)of_random32() : (uintptr_t)of_random64()); + ? (uintptr_t)OFRandom32() : (uintptr_t)OFRandom64()); #endif } + (void)unload { @@ -394,11 +394,11 @@ { } + (instancetype)alloc { - return of_alloc_object(self, 0, 0, NULL); + return OFAllocObject(self, 0, 0, NULL); } + (instancetype)new { return [[self alloc] init]; Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -380,11 +380,11 @@ OFUTF8String *string; size_t length; void *storage; length = strlen(UTF8String); - string = of_alloc_object([OFUTF8String class], length + 1, 1, &storage); + string = OFAllocObject([OFUTF8String class], length + 1, 1, &storage); return (id)[string of_initWithUTF8String: UTF8String length: length storage: storage]; } @@ -393,11 +393,11 @@ length: (size_t)UTF8StringLength { OFUTF8String *string; void *storage; - string = of_alloc_object([OFUTF8String class], UTF8StringLength + 1, 1, + string = OFAllocObject([OFUTF8String class], UTF8StringLength + 1, 1, &storage); return (id)[string of_initWithUTF8String: UTF8String length: UTF8StringLength storage: storage]; @@ -428,11 +428,11 @@ OFUTF8String *string; size_t length; void *storage; length = strlen(cString); - string = of_alloc_object([OFUTF8String class], length + 1, 1, + string = OFAllocObject([OFUTF8String class], length + 1, 1, &storage); return (id)[string of_initWithUTF8String: cString length: length storage: storage]; @@ -448,12 +448,12 @@ { if (encoding == OFStringEncodingUTF8) { OFUTF8String *string; void *storage; - string = of_alloc_object([OFUTF8String class], - cStringLength + 1, 1, &storage); + string = OFAllocObject([OFUTF8String class], cStringLength + 1, + 1, &storage); return (id)[string of_initWithUTF8String: cString length: cStringLength storage: storage]; } Index: src/forwarding/apple-forwarding-arm.S ================================================================== --- src/forwarding/apple-forwarding-arm.S +++ src/forwarding/apple-forwarding-arm.S @@ -13,12 +13,12 @@ * file. */ #include "config.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" @@ -30,11 +30,11 @@ .long 0, 0 .section __TEXT, __text, regular, pure_instructions .arm .align 2 -_of_forward: +_OFForward: stmfd sp!, {r0-r4, lr} vstmdb sp!, {d0-d7} ldr r4, sel_forwardingTargetForSelector_$indirect_L0 L0: @@ -66,19 +66,19 @@ b _objc_msgSend 0: vldmia sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} - b _of_method_not_found + b _OFMethodNotFound .data_region sel_forwardingTargetForSelector_$indirect_L0: .long sel_forwardingTargetForSelector_-(L0+8) .end_data_region .align 2 -_of_forward_stret: +_OFForward_stret: stmfd sp!, {r0-r4, lr} vstmdb sp!, {d0-d7} ldr r4, sel_forwardingTargetForSelector_$indirect_L1 L1: @@ -114,11 +114,11 @@ b _objc_msgSend_stret 0: vldmia sp!, {d0-d7} ldmfd sp!, {r0-r4, lr} - b _of_method_not_found_stret + b _OFMethodNotFound_stret .data_region sel_forwardingTargetForSelector_$indirect_L1: .long sel_forwardingTargetForSelector_-(L1+8) .end_data_region Index: src/forwarding/apple-forwarding-arm64.S ================================================================== --- src/forwarding/apple-forwarding-arm64.S +++ src/forwarding/apple-forwarding-arm64.S @@ -13,12 +13,12 @@ * file. */ #include "config.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" @@ -29,12 +29,12 @@ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions .align 2 -_of_forward: -_of_forward_stret: +_OFForward: +_OFForward_stret: stp fp, lr, [sp, #-208]! mov fp, sp sub sp, sp, #208 /* Save all arguments, x8 and x19 */ @@ -93,6 +93,6 @@ ldr x19, [sp, #72] mov sp, fp ldp fp, lr, [sp], #208 - b _of_method_not_found + b _OFMethodNotFound Index: src/forwarding/apple-forwarding-i386.S ================================================================== --- src/forwarding/apple-forwarding-i386.S +++ src/forwarding/apple-forwarding-i386.S @@ -13,12 +13,12 @@ * file. */ #include "config.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section __TEXT, __cstring, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" @@ -28,11 +28,11 @@ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions -_of_forward: +_OFForward: pushl %ebp movl %esp, %ebp pushl %ebx subl $20, %esp @@ -76,13 +76,13 @@ 0: addl $20, %esp popl %ebx popl %ebp - jmp _of_method_not_found + jmp _OFMethodNotFound -_of_forward_stret: +_OFForward_stret: pushl %ebp movl %esp, %ebp pushl %ebx subl $20, %esp @@ -126,10 +126,10 @@ 0: addl $20, %esp popl %ebx popl %ebp - jmp _of_method_not_found_stret + jmp _OFMethodNotFound_stret get_eip: movl (%esp), %ebx ret Index: src/forwarding/apple-forwarding-powerpc.S ================================================================== --- src/forwarding/apple-forwarding-powerpc.S +++ src/forwarding/apple-forwarding-powerpc.S @@ -13,12 +13,12 @@ * file. */ #include "config.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section __TEXT, __cstring, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" @@ -28,11 +28,11 @@ .section __OBJC, __image_info .long 0, 0 .section __TEXT, __text, regular, pure_instructions -_of_forward: +_OFForward: mflr r0 stw r0, 8(r1) stwu r1, -192(r1) /* @@ -128,13 +128,13 @@ addi r1, r1, 192 lwz r0, 8(r1) mtlr r0 - b _of_method_not_found + b _OFMethodNotFound -_of_forward_stret: +_OFForward_stret: mflr r0 stw r0, 8(r1) stwu r1, -184(r1) /* @@ -234,6 +234,6 @@ addi r1, r1, 184 lwz r0, 8(r1) mtlr r0 - b _of_method_not_found_stret + b _OFMethodNotFound_stret Index: src/forwarding/apple-forwarding-x86_64.S ================================================================== --- src/forwarding/apple-forwarding-x86_64.S +++ src/forwarding/apple-forwarding-x86_64.S @@ -13,12 +13,12 @@ * file. */ #include "config.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section __TEXT, __objc_methname, cstring_literals str_forwardingTargetForSelector_: .asciz "forwardingTargetForSelector:" @@ -28,11 +28,11 @@ .section __DATA, __objc_imageinfo, regular, no_dead_strip .long 0, 0 .section __TEXT, __text, regular, pure_instructions -_of_forward: +_OFForward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ @@ -99,13 +99,13 @@ movq -0x18(%rbp), %rsi movq %rbp, %rsp popq %rbp - jmp _of_method_not_found + jmp _OFMethodNotFound -_of_forward_stret: +_OFForward_stret: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ @@ -173,6 +173,6 @@ movq -0x20(%rbp), %rdx movq %rbp, %rsp popq %rbp - jmp _of_method_not_found_stret + jmp _OFMethodNotFound_stret Index: src/forwarding/forwarding-arm-elf.S ================================================================== --- src/forwarding/forwarding-arm-elf.S +++ src/forwarding/forwarding-arm-elf.S @@ -19,15 +19,15 @@ #ifdef HAVE_VFP2 .fpu vfp #endif -.globl of_forward -.globl of_forward_stret +.globl OFForward +.globl OFForward_stret .section .text -of_forward: +OFForward: #ifdef HAVE_VFP2 vstmdb sp!, {d0-d7} #endif stmfd sp!, {r0-r4, lr} @@ -74,15 +74,15 @@ 0: ldmfd sp!, {r0-r4, lr} #ifdef HAVE_VFP2 vldmia sp!, {d0-d7} #endif - b of_method_not_found(PLT) -.type of_forward, %function -.size of_forward, .-of_forward + b OFMethodNotFound(PLT) +.type OFForward, %function +.size OFForward, .-OFForward -of_forward_stret: +OFForward_stret: #ifdef HAVE_VFP2 vstmdb sp!, {d0-d7} #endif stmfd sp!, {r0-r4, lr} @@ -130,13 +130,13 @@ 0: ldmfd sp!, {r0-r4, lr} #ifdef HAVE_VFP2 vldmia sp!, {d0-d7} #endif - b of_method_not_found_stret(PLT) -.type of_forward_stret, %function -.size of_forward_stret, .-of_forward_stret + b OFMethodNotFound_stret(PLT) +.type OFForward_stret, %function +.size OFForward_stret, .-OFForward_stret init: ldr r0, module$indirect_.L2 .L2: add r0, pc Index: src/forwarding/forwarding-arm64-elf.S ================================================================== --- src/forwarding/forwarding-arm64-elf.S +++ src/forwarding/forwarding-arm64-elf.S @@ -15,16 +15,16 @@ #include "config.h" #include "platform.h" -.globl of_forward -.globl of_forward_stret +.globl OFForward +.globl OFForward_stret .section .text -of_forward: -of_forward_stret: +OFForward: +OFForward_stret: stp fp, lr, [sp, #-208]! mov fp, sp sub sp, sp, #208 /* Save all arguments, x8 and x19 */ @@ -94,15 +94,15 @@ ldr x19, [sp, #72] mov sp, fp ldp fp, lr, [sp], #208 - b of_method_not_found -.type of_forward, %function -.size of_forward, .-of_forward -.type of_forward_stret, %function -.size of_forward_stret, .-of_forward_stret + b OFMethodNotFound +.type OFForward, %function +.size OFForward, .-OFForward +.type OFForward_stret, %function +.size OFForward_stret, .-OFForward_stret init: adrp x0, module add x0, x0, :lo12:module b __objc_exec_class Index: src/forwarding/forwarding-mips-elf.S ================================================================== --- src/forwarding/forwarding-mips-elf.S +++ src/forwarding/forwarding-mips-elf.S @@ -15,12 +15,12 @@ #include "config.h" #include "platform.h" -.globl of_forward -.globl of_forward_stret +.globl OFForward +.globl OFForward_stret #ifdef OF_PIC .macro j_pic symbol lw $t9, %call16(\symbol)($gp) jr $t9 @@ -37,11 +37,11 @@ jal \symbol .endm #endif .section .text -of_forward: +OFForward: #ifdef OF_PIC lui $gp, %hi(_gp_disp) addiu $gp, $gp, %lo(_gp_disp) addu $gp, $gp, $t9 #endif @@ -158,14 +158,14 @@ lw $ra, 16($sp) addiu $sp, $sp, 96 j_pic of_method_not_found -.type of_forward, %function -.size of_forward, .-of_forward +.type OFForward, %function +.size OFForward, .-OFForward -of_forward_stret: +OFForward_stret: #ifdef OF_PIC lui $gp, %hi(_gp_disp) addiu $gp, $gp, %lo(_gp_disp) addu $gp, $gp, $t9 #endif @@ -284,12 +284,12 @@ lw $ra, 16($sp) addiu $sp, $sp, 96 j_pic of_method_not_found_stret -.type of_forward_stret, %function -.size of_forward_stret, .-of_forward_stret +.type OFForward_stret, %function +.size OFForward_stret, .-OFForward_stret init: #ifdef OF_PIC lui $gp, %hi(_gp_disp) addiu $gp, $gp, %lo(_gp_disp) Index: src/forwarding/forwarding-powerpc-elf.S ================================================================== --- src/forwarding/forwarding-powerpc-elf.S +++ src/forwarding/forwarding-powerpc-elf.S @@ -15,15 +15,15 @@ #include "config.h" #include "platform.h" -.globl of_forward -.globl of_forward_stret +.globl OFForward +.globl OFForward_stret .section .text -of_forward: +OFForward: stwu %r1, -112(%r1) mflr %r0 stw %r0, 116(%r1) #ifdef OF_PIC stw %r30, 104(%r1) @@ -139,11 +139,11 @@ 0: lwz %r3, 8(%r1) lwz %r4, 12(%r1) #ifdef OF_PIC - lwz %r0, .Lgot_of_method_not_found-.Lbiased_got2(%r30) + lwz %r0, .Lgot_OFMethodNotFound-.Lbiased_got2(%r30) mtctr %r0 lwz %r30, 104(%r1) #endif lwz %r0, 116(%r1) @@ -151,16 +151,16 @@ addi %r1, %r1, 112 #ifdef OF_PIC bctr #else - b of_method_not_found + b OFMethodNotFound #endif -.type of_forward, @function -.size of_forward, .-of_forward +.type OFForward, @function +.size OFForward, .-OFForward -of_forward_stret: +OFForward_stret: stwu %r1, -112(%r1) mflr %r0 stw %r0, 116(%r1) #ifdef OF_PIC stw %r30, 104(%r1) @@ -278,11 +278,11 @@ lwz %r3, 8(%r1) lwz %r4, 12(%r1) lwz %r5, 16(%r1) #ifdef OF_PIC - lwz %r0, .Lgot_of_method_not_found_stret-.Lbiased_got2(%r30) + lwz %r0, .Lgot_OFMethodNotFound_stret-.Lbiased_got2(%r30) mtctr %r0 lwz %r30, 104(%r1) #endif lwz %r0, 116(%r1) @@ -290,14 +290,14 @@ addi %r1, %r1, 112 #ifdef OF_PIC bctr #else - b of_method_not_found_stret + b OFMethodNotFound_stret #endif -.type of_forward_stret, @function -.size of_forward_stret, .-of_forward_stret +.type OFForward_stret, @function +.size OFForward_stret, .-OFForward_stret init: stwu %r1, -16(%r1) mflr %r0 stw %r0, 20(%r1) @@ -349,14 +349,14 @@ .Lbiased_got2 = .+0x8000 .Lgot_module: .long module .Lgot_sel_forwardingTargetForSelector_: .long sel_forwardingTargetForSelector_ -.Lgot_of_method_not_found: - .long of_method_not_found -.Lgot_of_method_not_found_stret: - .long of_method_not_found_stret +.Lgot_OFMethodNotFound: + .long OFMethodNotFound +.Lgot_OFMethodNotFound_stret: + .long OFMethodNotFound_stret #endif #ifdef OF_LINUX .section .note.GNU-stack, "", @progbits #endif Index: src/forwarding/forwarding-sparc-elf.S ================================================================== --- src/forwarding/forwarding-sparc-elf.S +++ src/forwarding/forwarding-sparc-elf.S @@ -75,11 +75,11 @@ jmpl %o0, %g0 restore 0: - call of_method_not_found + call OFMethodNotFound restore .type of_forward, %function .size of_forward, .-of_forward of_forward_stret: @@ -136,11 +136,11 @@ jmpl %o0, %g0 restore 0: - call of_method_not_found_stret + call OFMethodNotFound_stret restore .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: Index: src/forwarding/forwarding-sparc64-elf.S ================================================================== --- src/forwarding/forwarding-sparc64-elf.S +++ src/forwarding/forwarding-sparc64-elf.S @@ -109,11 +109,11 @@ jmpl %o0, %g0 restore 0: - call of_method_not_found + call OFMethodNotFound restore .type of_forward, %function .size of_forward, .-of_forward of_forward_stret: @@ -202,11 +202,11 @@ jmpl %o0, %g0 restore 0: - call of_method_not_found_stret + call OFMethodNotFound_stret restore .type of_forward_stret, %function .size of_forward_stret, .-of_forward_stret init: Index: src/forwarding/forwarding-x86-elf.S ================================================================== --- src/forwarding/forwarding-x86-elf.S +++ src/forwarding/forwarding-x86-elf.S @@ -73,11 +73,11 @@ popl %ebp jmp *%eax 0: - leal of_method_not_found@GOTOFF(%ebx), %eax + leal OFMethodNotFound@GOTOFF(%ebx), %eax addl $20, %esp popl %ebx popl %ebp @@ -137,11 +137,11 @@ popl %ebp jmp *%eax 0: - leal of_method_not_found_stret@GOTOFF(%ebx), %eax + leal OFMethodNotFound_stret@GOTOFF(%ebx), %eax addl $20, %esp popl %ebx popl %ebp Index: src/forwarding/forwarding-x86-win32.S ================================================================== --- src/forwarding/forwarding-x86-win32.S +++ src/forwarding/forwarding-x86-win32.S @@ -13,15 +13,15 @@ * file. */ #include "config.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section .text -_of_forward: +_OFForward: pushl %ebp movl %esp, %ebp pushl %ebx subl $20, %esp @@ -72,17 +72,17 @@ 0: addl $20, %esp popl %ebx popl %ebp - jmp _of_method_not_found -.def _of_forward + jmp _OFMethodNotFound +.def _OFForward .scl 2 .type 32 .endef -_of_forward_stret: +_OFForward_stret: pushl %ebp movl %esp, %ebp pushl %ebx subl $20, %esp @@ -133,12 +133,12 @@ 0: addl $20, %esp popl %ebx popl %ebp - jmp _of_method_not_found_stret -.def _of_forward_stret + jmp _OFMethodNotFound_stret +.def _OFForward_stret .scl 2 .type 32 .endef init: Index: src/forwarding/forwarding-x86_64-elf.S ================================================================== --- src/forwarding/forwarding-x86_64-elf.S +++ src/forwarding/forwarding-x86_64-elf.S @@ -15,15 +15,15 @@ #include "config.h" #include "platform.h" -.globl of_forward -.globl of_forward_stret +.globl OFForward +.globl OFForward_stret .section .text -of_forward: +OFForward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ @@ -100,15 +100,15 @@ movq -0x18(%rbp), %rsi movq %rbp, %rsp popq %rbp - jmp of_method_not_found@PLT -.type of_forward, %function -.size of_forward, .-of_forward + jmp OFMethodNotFound@PLT +.type OFForward, %function +.size OFForward, .-OFForward -of_forward_stret: +OFForward_stret: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ @@ -187,13 +187,13 @@ movq -0x20(%rbp), %rdx movq %rbp, %rsp popq %rbp - jmp of_method_not_found_stret@PLT -.type of_forward_stret, %function -.size of_forward_stret, .-of_forward_stret + jmp OFMethodNotFound_stret@PLT +.type OFForward_stret, %function +.size OFForward_stret, .-OFForward_stret init: leaq module(%rip), %rdi jmp __objc_exec_class@PLT Index: src/forwarding/forwarding-x86_64-macho.S ================================================================== --- src/forwarding/forwarding-x86_64-macho.S +++ src/forwarding/forwarding-x86_64-macho.S @@ -15,15 +15,15 @@ #include "config.h" #include "platform.h" -.globl _of_forward -.globl _of_forward_stret +.globl _OFForward +.globl _OFForward_stret .section __TEXT, __text, regular, pure_instructions -_of_forward: +_OFForward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ @@ -100,13 +100,13 @@ movq -0x18(%rbp), %rsi movq %rbp, %rsp popq %rbp - jmp _of_method_not_found + jmp _OFMethodNotFound -_of_forward_stret: +_OFForward_stret: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0xC0, %rsp /* 16-byte alignment */ @@ -185,11 +185,11 @@ movq -0x20(%rbp), %rdx movq %rbp, %rsp popq %rbp - jmp _of_method_not_found_stret + jmp _OFMethodNotFound_stret init: leaq module(%rip), %rdi jmp ___objc_exec_class Index: src/forwarding/forwarding-x86_64-win64.S ================================================================== --- src/forwarding/forwarding-x86_64-win64.S +++ src/forwarding/forwarding-x86_64-win64.S @@ -13,15 +13,15 @@ * file. */ #include "config.h" -.globl of_forward -.globl of_forward_stret +.globl OFForward +.globl OFForward_stret .section .text -of_forward: +OFForward: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0x90, %rsp /* 16-byte alignment */ @@ -86,17 +86,17 @@ movq -0x38(%rbp), %rdx movq %rbp, %rsp popq %rbp - jmp of_method_not_found -.def of_forward + jmp OFMethodNotFound +.def OFForward .scl 2 .type 32 .endef -of_forward_stret: +OFForward_stret: pushq %rbp movq %rsp, %rbp /* Save all arguments */ subq $0x90, %rsp /* 16-byte alignment */ @@ -163,12 +163,12 @@ movq -0x40(%rbp), %r8 movq %rbp, %rsp popq %rbp - jmp of_method_not_found_stret -.def of_forward_stret + jmp OFMethodNotFound_stret +.def OFForward_stret .scl 2 .type 32 .endef init: Index: src/macros.h ================================================================== --- src/macros.h +++ src/macros.h @@ -369,17 +369,17 @@ abort(); \ } \ } while (0) #endif -#define OF_UNRECOGNIZED_SELECTOR of_method_not_found(self, _cmd); +#define OF_UNRECOGNIZED_SELECTOR OFMethodNotFound(self, _cmd); #if __has_feature(objc_arc) -# define OF_INVALID_INIT_METHOD of_method_not_found(self, _cmd); +# define OF_INVALID_INIT_METHOD OFMethodNotFound(self, _cmd); #else # define OF_INVALID_INIT_METHOD \ @try { \ - of_method_not_found(self, _cmd); \ + OFMethodNotFound(self, _cmd); \ } @catch (id e) { \ [self release]; \ @throw e; \ } \ \ @@ -766,11 +766,11 @@ ((value) << (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) \ : (value)) #define OF_ROUND_UP_POW2(pow2, value) (((value) + (pow2) - 1) & ~((pow2) - 1)) -#define OF_HASH_INIT(hash) hash = of_hash_seed; +#define OF_HASH_INIT(hash) hash = OFHashSeed; #define OF_HASH_ADD(hash, byte) \ { \ hash += (uint8_t)(byte); \ hash += (hash << 10); \ hash ^= (hash >> 6); \ Index: tests/TestsAppDelegate.m ================================================================== --- tests/TestsAppDelegate.m +++ tests/TestsAppDelegate.m @@ -88,11 +88,11 @@ */ atexit(objc_exit); #endif /* We need deterministic hashes for tests */ - of_hash_seed = 0; + OFHashSeed = 0; #ifdef OF_WII GXRModeObj *rmode; void *xfb;