diff options
| author | Dmitriy Vyukov <dvyukov@google.com> | 2013-08-12 21:36:33 +0400 |
|---|---|---|
| committer | Dmitriy Vyukov <dvyukov@google.com> | 2013-08-12 21:36:33 +0400 |
| commit | 92254d4463efb5c3a91ccd6d62abe3f7587a145a (patch) | |
| tree | a0ee74f4982d83d688899a8a80f8fec1229ea324 /src/pkg/runtime | |
| parent | 8b789e17381f8c609cee24aad9c42e0f02ee6310 (diff) | |
| download | go-92254d4463efb5c3a91ccd6d62abe3f7587a145a.tar.xz | |
runtime: fix ARM assembly formatting
R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/12702048
Diffstat (limited to 'src/pkg/runtime')
| -rw-r--r-- | src/pkg/runtime/asm_arm.s | 24 | ||||
| -rw-r--r-- | src/pkg/runtime/sys_linux_arm.s | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/pkg/runtime/asm_arm.s b/src/pkg/runtime/asm_arm.s index bc23b454df..6978ae4426 100644 --- a/src/pkg/runtime/asm_arm.s +++ b/src/pkg/runtime/asm_arm.s @@ -81,19 +81,19 @@ GLOBL runtime·main·f(SB),RODATA,$4 TEXT runtime·breakpoint(SB),NOSPLIT,$0-0 // gdb won't skip this breakpoint instruction automatically, // so you must manually "set $pc+=4" to skip it and continue. - WORD $0xe1200071 // BKPT 0x0001 + WORD $0xe1200071 // BKPT 0x0001 RET GLOBL runtime·goarm(SB), $4 TEXT runtime·asminit(SB),NOSPLIT,$0-0 // disable runfast (flush-to-zero) mode of vfp if runtime.goarm > 5 - MOVW runtime·goarm(SB), R11 - CMP $5, R11 - BLE 4(PC) - WORD $0xeef1ba10 // vmrs r11, fpscr - BIC $(1<<24), R11 - WORD $0xeee1ba10 // vmsr fpscr, r11 + MOVW runtime·goarm(SB), R11 + CMP $5, R11 + BLE 4(PC) + WORD $0xeef1ba10 // vmrs r11, fpscr + BIC $(1<<24), R11 + WORD $0xeee1ba10 // vmsr fpscr, r11 RET /* @@ -448,7 +448,7 @@ TEXT runtime·cgocallback_gofunc(SB),NOSPLIT,$8-12 // the linker analysis by using an indirect call. MOVW m, savedm-4(SP) CMP $0, m - B.NE havem + B.NE havem MOVW $runtime·needm(SB), R0 BL (R0) @@ -566,11 +566,11 @@ TEXT runtime·armcas(SB),NOSPLIT,$0-12 MOVW new+8(FP), R3 casl: LDREX (R1), R0 - CMP R0, R2 - BNE casfail + CMP R0, R2 + BNE casfail STREX R3, (R1), R0 - CMP $0, R0 - BNE casl + CMP $0, R0 + BNE casl MOVW $1, R0 RET casfail: diff --git a/src/pkg/runtime/sys_linux_arm.s b/src/pkg/runtime/sys_linux_arm.s index 3e3709f92d..0e540f1c84 100644 --- a/src/pkg/runtime/sys_linux_arm.s +++ b/src/pkg/runtime/sys_linux_arm.s @@ -371,7 +371,7 @@ casagain: MOVW new+8(FP), R1 BL cas<>(SB) BCC cascheck - MOVW $1, R0 + MOVW $1, R0 RET cascheck: // Kernel lies; double-check. @@ -380,7 +380,7 @@ cascheck: MOVW 0(R2), R3 CMP R0, R3 BEQ casagain - MOVW $0, R0 + MOVW $0, R0 RET TEXT runtime·casp(SB),NOSPLIT,$0 @@ -439,5 +439,5 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$0 MOVW $2, R1 // F_SETFD MOVW $1, R2 // FD_CLOEXEC MOVW $SYS_fcntl, R7 - SWI $0 + SWI $0 RET |