diff options
| author | Austin Clements <austin@google.com> | 2015-06-03 14:59:27 -0400 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2015-06-06 00:07:23 +0000 |
| commit | 2774b37306616380c00a4fde7f46bde1a8668ece (patch) | |
| tree | 592b909c5f2830e705e6c1d6d5e366b19a13dc34 /src/runtime/sys_linux_ppc64x.s | |
| parent | 11b992818549aa169c96363c9242fe66b4073d34 (diff) | |
| download | go-2774b37306616380c00a4fde7f46bde1a8668ece.tar.xz | |
all: use RET instead of RETURN on ppc64
All of the architectures except ppc64 have only "RET" for the return
mnemonic. ppc64 used to have only "RETURN", but commit cf06ea6
introduced RET as a synonym for RETURN to make ppc64 consistent with
the other architectures. However, that commit was never followed up to
make the code itself consistent by eliminating uses of RETURN.
This commit replaces all uses of RETURN in the ppc64 assembly with
RET.
This was done with
sed -i 's/\<RETURN\>/RET/' **/*_ppc64x.s
plus one manual change to syscall/asm.s.
Change-Id: I3f6c8d2be157df8841d48de988ee43f3e3087995
Reviewed-on: https://go-review.googlesource.com/10672
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
Diffstat (limited to 'src/runtime/sys_linux_ppc64x.s')
| -rw-r--r-- | src/runtime/sys_linux_ppc64x.s | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s index 232f299ac2..8cf1549964 100644 --- a/src/runtime/sys_linux_ppc64x.s +++ b/src/runtime/sys_linux_ppc64x.s @@ -50,12 +50,12 @@ TEXT runtime·exit(SB),NOSPLIT,$-8-4 MOVW code+0(FP), R3 SYSCALL $SYS_exit_group - RETURN + RET TEXT runtime·exit1(SB),NOSPLIT,$-8-4 MOVW code+0(FP), R3 SYSCALL $SYS_exit - RETURN + RET TEXT runtime·open(SB),NOSPLIT,$-8-20 MOVD name+0(FP), R3 @@ -65,7 +65,7 @@ TEXT runtime·open(SB),NOSPLIT,$-8-20 BVC 2(PC) MOVW $-1, R3 MOVW R3, ret+16(FP) - RETURN + RET TEXT runtime·closefd(SB),NOSPLIT,$-8-12 MOVW fd+0(FP), R3 @@ -73,7 +73,7 @@ TEXT runtime·closefd(SB),NOSPLIT,$-8-12 BVC 2(PC) MOVW $-1, R3 MOVW R3, ret+8(FP) - RETURN + RET TEXT runtime·write(SB),NOSPLIT,$-8-28 MOVD fd+0(FP), R3 @@ -83,7 +83,7 @@ TEXT runtime·write(SB),NOSPLIT,$-8-28 BVC 2(PC) MOVW $-1, R3 MOVW R3, ret+24(FP) - RETURN + RET TEXT runtime·read(SB),NOSPLIT,$-8-28 MOVW fd+0(FP), R3 @@ -93,14 +93,14 @@ TEXT runtime·read(SB),NOSPLIT,$-8-28 BVC 2(PC) MOVW $-1, R3 MOVW R3, ret+24(FP) - RETURN + RET TEXT runtime·getrlimit(SB),NOSPLIT,$-8-20 MOVW kind+0(FP), R3 MOVD limit+8(FP), R4 SYSCALL $SYS_ugetrlimit MOVW R3, ret+16(FP) - RETURN + RET TEXT runtime·usleep(SB),NOSPLIT,$16-4 MOVW usec+0(FP), R3 @@ -119,28 +119,28 @@ TEXT runtime·usleep(SB),NOSPLIT,$16-4 MOVW $0, R6 ADD $8, R1, R7 SYSCALL $SYS_newselect - RETURN + RET TEXT runtime·raise(SB),NOSPLIT,$-8 SYSCALL $SYS_gettid MOVW R3, R3 // arg 1 tid MOVW sig+0(FP), R4 // arg 2 SYSCALL $SYS_tkill - RETURN + RET TEXT runtime·raiseproc(SB),NOSPLIT,$-8 SYSCALL $SYS_getpid MOVW R3, R3 // arg 1 pid MOVW sig+0(FP), R4 // arg 2 SYSCALL $SYS_kill - RETURN + RET TEXT runtime·setitimer(SB),NOSPLIT,$-8-24 MOVW mode+0(FP), R3 MOVD new+8(FP), R4 MOVD old+16(FP), R5 SYSCALL $SYS_setitimer - RETURN + RET TEXT runtime·mincore(SB),NOSPLIT,$-8-28 MOVD addr+0(FP), R3 @@ -148,7 +148,7 @@ TEXT runtime·mincore(SB),NOSPLIT,$-8-28 MOVD dst+16(FP), R5 SYSCALL $SYS_mincore MOVW R3, ret+24(FP) - RETURN + RET // func now() (sec int64, nsec int32) TEXT time·now(SB),NOSPLIT,$16 @@ -161,7 +161,7 @@ TEXT time·now(SB),NOSPLIT,$16 MULLD R4, R5 MOVD R3, sec+0(FP) MOVW R5, nsec+8(FP) - RETURN + RET TEXT runtime·nanotime(SB),NOSPLIT,$16 MOVW $1, R3 // CLOCK_MONOTONIC @@ -175,7 +175,7 @@ TEXT runtime·nanotime(SB),NOSPLIT,$16 MULLD R4, R3 ADD R5, R3 MOVD R3, ret+0(FP) - RETURN + RET TEXT runtime·rtsigprocmask(SB),NOSPLIT,$-8-28 MOVW sig+0(FP), R3 @@ -185,7 +185,7 @@ TEXT runtime·rtsigprocmask(SB),NOSPLIT,$-8-28 SYSCALL $SYS_rt_sigprocmask BVC 2(PC) MOVD R0, 0xf1(R0) // crash - RETURN + RET TEXT runtime·rt_sigaction(SB),NOSPLIT,$-8-36 MOVD sig+0(FP), R3 @@ -194,7 +194,7 @@ TEXT runtime·rt_sigaction(SB),NOSPLIT,$-8-36 MOVD size+24(FP), R6 SYSCALL $SYS_rt_sigaction MOVW R3, ret+32(FP) - RETURN + RET TEXT runtime·sigfwd(SB),NOSPLIT,$0-32 MOVW sig+8(FP), R3 @@ -203,7 +203,7 @@ TEXT runtime·sigfwd(SB),NOSPLIT,$0-32 MOVD fn+0(FP), R31 MOVD R31, CTR BL (CTR) - RETURN + RET #ifdef GOARCH_ppc64le // ppc64le doesn't need function descriptors @@ -232,7 +232,7 @@ TEXT runtime·_sigtramp(SB),NOSPLIT,$64 MOVD $runtime·sigtrampgo(SB), R31 MOVD R31, CTR BL (CTR) - RETURN + RET TEXT runtime·mmap(SB),NOSPLIT,$-8 MOVD addr+0(FP), R3 @@ -244,7 +244,7 @@ TEXT runtime·mmap(SB),NOSPLIT,$-8 SYSCALL $SYS_mmap MOVD R3, ret+32(FP) - RETURN + RET TEXT runtime·munmap(SB),NOSPLIT,$-8 MOVD addr+0(FP), R3 @@ -252,7 +252,7 @@ TEXT runtime·munmap(SB),NOSPLIT,$-8 SYSCALL $SYS_munmap BVC 2(PC) MOVD R0, 0xf3(R0) - RETURN + RET TEXT runtime·madvise(SB),NOSPLIT,$-8 MOVD addr+0(FP), R3 @@ -260,7 +260,7 @@ TEXT runtime·madvise(SB),NOSPLIT,$-8 MOVW flags+16(FP), R5 SYSCALL $SYS_madvise // ignore failure - maybe pages are locked - RETURN + RET // int64 futex(int32 *uaddr, int32 op, int32 val, // struct timespec *timeout, int32 *uaddr2, int32 val2); @@ -273,7 +273,7 @@ TEXT runtime·futex(SB),NOSPLIT,$-8 MOVW val3+32(FP), R8 SYSCALL $SYS_futex MOVW R3, ret+40(FP) - RETURN + RET // int64 clone(int32 flags, void *stk, M *mp, G *gp, void (*fn)(void)); TEXT runtime·clone(SB),NOSPLIT,$-8 @@ -298,7 +298,7 @@ TEXT runtime·clone(SB),NOSPLIT,$-8 CMP R3, $0 BEQ 3(PC) MOVW R3, ret+40(FP) - RETURN + RET // In child, on new stack. // initialize essential registers @@ -345,11 +345,11 @@ TEXT runtime·sigaltstack(SB),NOSPLIT,$-8 SYSCALL $SYS_sigaltstack BVC 2(PC) MOVD R0, 0xf1(R0) // crash - RETURN + RET TEXT runtime·osyield(SB),NOSPLIT,$-8 SYSCALL $SYS_sched_yield - RETURN + RET TEXT runtime·sched_getaffinity(SB),NOSPLIT,$-8 MOVD pid+0(FP), R3 @@ -357,21 +357,21 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$-8 MOVD buf+16(FP), R5 SYSCALL $SYS_sched_getaffinity MOVW R3, ret+24(FP) - RETURN + RET // int32 runtime·epollcreate(int32 size); TEXT runtime·epollcreate(SB),NOSPLIT,$-8 MOVW size+0(FP), R3 SYSCALL $SYS_epoll_create MOVW R3, ret+8(FP) - RETURN + RET // int32 runtime·epollcreate1(int32 flags); TEXT runtime·epollcreate1(SB),NOSPLIT,$-8 MOVW flags+0(FP), R3 SYSCALL $SYS_epoll_create1 MOVW R3, ret+8(FP) - RETURN + RET // func epollctl(epfd, op, fd int32, ev *epollEvent) int TEXT runtime·epollctl(SB),NOSPLIT,$-8 @@ -381,7 +381,7 @@ TEXT runtime·epollctl(SB),NOSPLIT,$-8 MOVD ev+16(FP), R6 SYSCALL $SYS_epoll_ctl MOVW R3, ret+24(FP) - RETURN + RET // int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout); TEXT runtime·epollwait(SB),NOSPLIT,$-8 @@ -391,7 +391,7 @@ TEXT runtime·epollwait(SB),NOSPLIT,$-8 MOVW timeout+20(FP), R6 SYSCALL $SYS_epoll_wait MOVW R3, ret+24(FP) - RETURN + RET // void runtime·closeonexec(int32 fd); TEXT runtime·closeonexec(SB),NOSPLIT,$-8 @@ -399,4 +399,4 @@ TEXT runtime·closeonexec(SB),NOSPLIT,$-8 MOVD $2, R4 // F_SETFD MOVD $1, R5 // FD_CLOEXEC SYSCALL $SYS_fcntl - RETURN + RET |
