Index: src/forwarding/forwarding-amd64-elf.S ================================================================== --- src/forwarding/forwarding-amd64-elf.S +++ src/forwarding/forwarding-amd64-elf.S @@ -50,11 +50,11 @@ mov rdi, rax lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector@PLT test rax, rax - jz short 0f + jz 0f mov rdi, [rbp - 0x10] lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup@PLT @@ -62,13 +62,13 @@ lea rsi, [rip + .Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x18] call rax test rax, rax - jz short 0f + jz 0f cmp rax, [rbp - 0x10] - je short 0f + je 0f mov [rbp - 0x10], rax mov rdi, rax mov rsi, [rbp - 0x18] @@ -136,11 +136,11 @@ mov rdi, rax lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector@PLT test rax, rax - jz short 0f + jz 0f mov rdi, [rbp - 0x18] lea rsi, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup@PLT @@ -148,13 +148,13 @@ lea rsi, [rip + .Lsel_forwardingTargetForSelector_] mov rdx, [rbp - 0x20] call rax test rax, rax - jz short 0f + jz 0f cmp rax, [rbp - 0x18] - je short 0f + je 0f mov [rbp - 0x18], rax mov rdi, rax mov rsi, [rbp - 0x20] Index: src/forwarding/forwarding-amd64-win64.S ================================================================== --- src/forwarding/forwarding-amd64-win64.S +++ src/forwarding/forwarding-amd64-win64.S @@ -42,11 +42,11 @@ mov rcx, rax lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector test rax, rax - jz short 0f + jz 0f mov rcx, [rbp - 0x30] lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup @@ -54,13 +54,13 @@ lea rdx, [rip + .Lsel_forwardingTargetForSelector_] mov r8, [rbp - 0x38] call rax test rax, rax - jz short 0f + jz 0f cmp rax, [rbp - 0x30] - je short 0f + je 0f mov [rbp - 0x30], rax mov rcx, rax mov rdx, [rbp - 0x38] @@ -118,11 +118,11 @@ mov rcx, rax lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call class_respondsToSelector test rax, rax - jz short 0f + jz 0f mov rcx, [rbp - 0x38] lea rdx, [rip + .Lsel_forwardingTargetForSelector_] call objc_msg_lookup @@ -130,13 +130,13 @@ lea rdx, [rip + .Lsel_forwardingTargetForSelector_] mov r8, [rbp - 0x40] call rax test rax, rax - jz short 0f + jz 0f cmp rax, [rbp - 0x38] - je short 0f + je 0f mov [rbp - 0x38], rax mov rcx, rax mov rdx, [rbp - 0x40] Index: src/forwarding/forwarding-x86-elf.S ================================================================== --- src/forwarding/forwarding-x86-elf.S +++ src/forwarding/forwarding-x86-elf.S @@ -41,11 +41,11 @@ lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax call class_respondsToSelector@PLT test eax, eax - jz short 0f + jz 0f mov eax, [ebp + 8] mov [esp], eax lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax @@ -58,13 +58,13 @@ mov edx, [ebp + 12] mov [esp + 8], edx call eax test eax, eax - jz short 0f + jz 0f cmp eax, [ebp + 8] - je short 0f + je 0f mov [ebp + 8], eax mov [esp], eax mov eax, [ebp + 12] mov [esp + 4], eax @@ -105,16 +105,16 @@ lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] mov [esp + 4], eax call class_respondsToSelector@PLT test eax, eax - jz short 0f + jz 0f mov eax, [ebp + 12] mov [esp], eax lea eax, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] - mov [esp + 4], eax + mov [esp + 4], eax call objc_msg_lookup@PLT mov edx, [ebp + 12] mov [esp], edx lea edx, [ebx + .Lsel_forwardingTargetForSelector_@GOTOFF] @@ -122,13 +122,13 @@ mov edx, [ebp + 16] mov [esp + 8], edx call eax test eax, eax - jz short 0f + jz 0f cmp eax, [ebp + 12] - je short 0f + je 0f mov [ebp + 12], eax mov [esp], eax mov eax, [ebp + 16] mov [esp + 4], eax Index: src/forwarding/forwarding-x86-win32.S ================================================================== --- src/forwarding/forwarding-x86-win32.S +++ src/forwarding/forwarding-x86-win32.S @@ -36,11 +36,11 @@ mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax call _class_respondsToSelector test eax, eax - jz short 0f + jz 0f mov eax, [ebp + 8] mov [esp], eax mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax @@ -53,13 +53,13 @@ mov edx, [ebp + 12] mov [esp + 8], edx call eax test eax, eax - jz short 0f + jz 0f cmp eax, [ebp + 8] - je short 0f + je 0f mov [ebp + 8], eax mov [esp], eax mov eax, [ebp + 12] mov [esp + 4], eax @@ -97,11 +97,11 @@ mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax call _class_respondsToSelector test eax, eax - jz short 0f + jz 0f mov eax, [ebp + 12] mov [esp], eax mov eax, offset .Lsel_forwardingTargetForSelector_ mov [esp + 4], eax @@ -114,18 +114,18 @@ mov edx, [ebp + 16] mov [esp + 8], edx call eax test eax, eax - jz short 0f + jz 0f cmp eax, [ebp + 12] - je short 0f + je 0f mov [ebp + 12], eax mov [esp], eax mov eax, [ebp + 16] - mov [esp + 4], eax + mov [esp + 4], eax call _objc_msg_lookup_stret add esp, 20 pop ebx pop ebp Index: src/platform/x86/OFAtomic.h ================================================================== --- src/platform/x86/OFAtomic.h +++ src/platform/x86/OFAtomic.h @@ -235,11 +235,11 @@ "mov{l} { %2, %0 | %0, %2 }\n\t" "mov{l} { %0, %%eax | eax, %0 }\n\t" "or{l} { %1, %0 | %0, %1 }\n\t" "lock\n\t" "cmpxchg{l} { %0, %2 | %2, %0 }\n\t" - "jne { | short } 0b" + "jne 0b" : "=&r"(i) : "r"(i), "m"(*p) : "eax", "cc" ); @@ -258,11 +258,11 @@ "mov{q} { %2, %0 | %0, %2 }\n\t" "mov{q} { %0, %%rax | rax, %0 }\n\t" "or{q} { %1, %0 | %0, %1 }\n\t" "lock\n\t" "cmpxchg{q} { %0, %2 | %2, %0 }\n\t" - "jne { | short } 0b" + "jne 0b" : "=&r"(i) : "r"(i), "m"(*p) : "rax", "cc" ); #endif @@ -280,11 +280,11 @@ "mov{l} { %2, %0 | %0, %2 }\n\t" "mov{l} { %0, %%eax | eax, %0 }\n\t" "and{l} { %1, %0 | %0, %1 }\n\t" "lock\n\t" "cmpxchg{l} { %0, %2 | %2, %0 }\n\t" - "jne { | short } 0b" + "jne 0b" : "=&r"(i) : "r"(i), "m"(*p) : "eax", "cc" ); @@ -303,11 +303,11 @@ "mov{q} { %2, %0 | %0, %2 }\n\t" "mov{q} { %0, %%rax | rax, %0 }\n\t" "and{q} { %1, %0 | %0, %1 }\n\t" "lock\n\t" "cmpxchg{q} { %0, %2 | %2, %0 }\n\t" - "jne { | short } 0b" + "jne 0b" : "=&r"(i) : "r"(i), "m"(*p) : "rax", "cc" ); #endif @@ -325,11 +325,11 @@ "mov{l} { %2, %0 | %0, %2 }\n\t" "mov{l} { %0, %%eax | eax, %0 }\n\t" "xor{l} { %1, %0 | %0, %1 }\n\t" "lock\n\t" "cmpxchg{l} { %0, %2 | %2, %0 }\n\t" - "jne { | short } 0b" + "jne 0b" : "=&r"(i) : "r"(i), "m"(*p) : "eax", "cc" ); @@ -348,11 +348,11 @@ "mov{q} { %2, %0 | %0, %2 }\n\t" "mov{q} { %0, %%rax | rax, %0 }\n\t" "xor{q} { %1, %0 | %0, %1 }\n\t" "lock\n\t" "cmpxchg{q} { %0, %2 | %2, %0 }\n\t" - "jne { | short } 0b" + "jne 0b" : "=&r"(i) : "r"(i), "m"(*p) : "rax", "cc" ); #endif Index: src/runtime/lookup-asm/lookup-asm-amd64-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-amd64-elf.S +++ src/runtime/lookup-asm/lookup-asm-amd64-elf.S @@ -26,14 +26,14 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: test rdi, rdi - jz short .LreturnNilMethod + jz .LreturnNilMethod test dil, 1 - jnz short .LtaggedPointer_\name + jnz .LtaggedPointer_\name mov r8, [rdi] mov r8, [r8 + 64] .Lmain_\name: @@ -47,11 +47,11 @@ #endif mov r8, [r8 + 8 * rcx] mov rax, [r8 + 8 * rdx] test rax, rax - jz short \notFound@PLT + jz \notFound@PLT ret .LtaggedPointer_\name: mov rax, [rip + objc_taggedPointerSecret@GOTPCREL] @@ -61,25 +61,25 @@ mov rax, [rip + objc_taggedPointerClasses@GOTPCREL] mov r8, [rax + 4 * r8] mov r8, [r8 + 64] - jmp short .Lmain_\name + jmp .Lmain_\name .type \name, %function .size \name, .-\name .endm .macro GENERATE_LOOKUP_SUPER name lookup \name: mov r8, rdi mov rdi, [rdi] test rdi, rdi - jz short .LreturnNilMethod + jz .LreturnNilMethod mov r8, [r8 + 8] mov r8, [r8 + 64] - jmp short .Lmain_\lookup + jmp .Lmain_\lookup .type \name, %function .size \name, .-\name .endm GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound Index: src/runtime/lookup-asm/lookup-asm-amd64-win64.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-amd64-win64.S +++ src/runtime/lookup-asm/lookup-asm-amd64-win64.S @@ -24,14 +24,14 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: test rcx, rcx - jz short .LreturnNilMethod + jz .LreturnNilMethod test cl, 1 - jnz short .LtaggedPointer_\name + jnz .LtaggedPointer_\name mov r8, [rcx] mov r8, [r8 + 56] .Lmain_\name: @@ -48,18 +48,18 @@ #endif mov r8, [r8 + 8 * rcx] mov rax, [r8 + 8 * rdx] test rax, rax - jz short 0f + jz 0f ret 0: mov rcx, r10 mov rdx, r11 - jmp short \notFound + jmp \notFound .LtaggedPointer_\name: xor rcx, [rip + objc_taggedPointerSecret] and cl, 0xE movzx r8d, cl @@ -66,11 +66,11 @@ lea rax, [rip + objc_taggedPointerClasses] mov r8, [rax + 4 * r8] mov r8, [r8 + 56] - jmp short .Lmain_\name + jmp .Lmain_\name .def \name .scl 2 .type 32 .endef .endm Index: src/runtime/lookup-asm/lookup-asm-x86-elf.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-x86-elf.S +++ src/runtime/lookup-asm/lookup-asm-x86-elf.S @@ -27,14 +27,14 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: mov edx, [esp + 4] test edx, edx - jz short .LreturnNilMethod + jz .LreturnNilMethod test dl, 1 - jnz short .LtaggedPointer_\name + jnz .LtaggedPointer_\name mov edx, [edx] mov edx, [edx + 32] .Lmain_\name: @@ -48,11 +48,11 @@ mov edx, [edx + 4 * ecx] movzx ecx, byte ptr [eax] mov eax, [edx + 4 * ecx] test eax, eax - jz short 0f + jz 0f ret 0: call .LgetEIP @@ -71,26 +71,26 @@ mov eax, [eax + objc_taggedPointerClasses@GOT] mov edx, [eax + 2 * edx] mov edx, [edx + 32] - jmp short .Lmain_\name + jmp .Lmain_\name .type \name, %function .size \name, .-\name .endm .macro GENERATE_LOOKUP_SUPER name lookup \name: mov edx, [esp + 4] mov eax, [edx] test eax, eax - jz short .LreturnNilMethod + jz .LreturnNilMethod mov [esp + 4], eax mov edx, [edx + 4] mov edx, [edx + 32] - jmp short .Lmain_\lookup + jmp .Lmain_\lookup .type \name, %function .size \name, .-\name .endm GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound Index: src/runtime/lookup-asm/lookup-asm-x86-win32.S ================================================================== --- src/runtime/lookup-asm/lookup-asm-x86-win32.S +++ src/runtime/lookup-asm/lookup-asm-x86-win32.S @@ -25,14 +25,14 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: mov edx, [esp + 4] test edx, edx - jz short .LreturnNilMethod + jz .LreturnNilMethod test dl, 1 - jnz short .LtaggedPointer_\name + jnz .LtaggedPointer_\name mov edx, [edx] mov edx, [edx + 32] .Lmain_\name: @@ -46,11 +46,11 @@ mov edx, [edx + 4 * ecx] movzx ecx, byte ptr [eax] mov eax, [edx + 4 * ecx] test eax, eax - jz short \notFound + jz \notFound ret .LtaggedPointer_\name: xor edx, _objc_taggedPointerSecret @@ -58,11 +58,11 @@ movzx edx, dl mov edx, [_objc_taggedPointerClasses + 2 * edx] mov edx, [edx + 32] - jmp short .Lmain_\name + jmp .Lmain_\name .def \name .scl 2 .type 32 .endef .endm @@ -70,16 +70,16 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mov edx, [esp + 4] mov eax, [edx] test eax, eax - jz short .LreturnNilMethod + jz .LreturnNilMethod mov [esp + 4], eax - mov edx, [edx + 4] + mov edx, [edx + 4] mov edx, [edx + 32] - jmp short .Lmain_\lookup + jmp .Lmain_\lookup .def \name .scl 2 .type 32 .endef .endm