Module Name: src
Committed By: skrll
Date: Sun Dec 4 17:04:07 UTC 2022
Modified Files:
src/lib/libc/arch/riscv/gen: __setjmp14.S _setjmp.S
src/lib/libc/arch/riscv/sys: brk.S sbrk.S
src/libexec/ld.elf_so/arch/riscv: rtld_start.S
Log Message:
Consistently use the 'mv' instrucation (which is itself an alias) instead
of the (old) alternative alias 'move'.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/riscv/gen/__setjmp14.S \
src/lib/libc/arch/riscv/gen/_setjmp.S
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/riscv/sys/brk.S \
src/lib/libc/arch/riscv/sys/sbrk.S
cvs rdiff -u -r1.3 -r1.4 src/libexec/ld.elf_so/arch/riscv/rtld_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/riscv/gen/__setjmp14.S
diff -u src/lib/libc/arch/riscv/gen/__setjmp14.S:1.2 src/lib/libc/arch/riscv/gen/__setjmp14.S:1.3
--- src/lib/libc/arch/riscv/gen/__setjmp14.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/gen/__setjmp14.S Sun Dec 4 17:04:06 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: __setjmp14.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.3 2022/12/04 17:04:06 skrll Exp $ */
#include "SYS.h"
#include "assym.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __setjmp14.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+__RCSID("$NetBSD: __setjmp14.S,v 1.3 2022/12/04 17:04:06 skrll Exp $")
#endif
/*
@@ -94,7 +94,7 @@ ENTRY(__longjmp14)
fld fs10, JB_FS10(a0) /* restore callee saved register */
fld fs11, JB_FS11(a0) /* restore callee saved register */
#endif
- move t1, a1 /* save return value */
+ mv t1, a1 /* save return value */
li a2, 0
addi a1, a0, JB_SIGMASK /* &sigmask */
li a0, SIG_SETMASK
@@ -102,6 +102,6 @@ ENTRY(__longjmp14)
nop /* error */
li a0, 1 /* success */ /* default return value */
beqz t1, 1f /* test return value */
- move a0, t1 /* use it if not 0 */
+ mv a0, t1 /* use it if not 0 */
1: ret
END(__longjmp14)
Index: src/lib/libc/arch/riscv/gen/_setjmp.S
diff -u src/lib/libc/arch/riscv/gen/_setjmp.S:1.2 src/lib/libc/arch/riscv/gen/_setjmp.S:1.3
--- src/lib/libc/arch/riscv/gen/_setjmp.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/gen/_setjmp.S Sun Dec 4 17:04:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: _setjmp.S,v 1.3 2022/12/04 17:04:06 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "assym.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: _setjmp.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+__RCSID("$NetBSD: _setjmp.S,v 1.3 2022/12/04 17:04:06 skrll Exp $")
#endif
/*
@@ -119,6 +119,6 @@ ENTRY(_longjmp)
#endif
li a0, 1 /* default return value */
beqz a1, 1f /* test return value */
- move a0, a1 /* use it if not 0 */
+ mv a0, a1 /* use it if not 0 */
1: ret
END(_longjmp)
Index: src/lib/libc/arch/riscv/sys/brk.S
diff -u src/lib/libc/arch/riscv/sys/brk.S:1.4 src/lib/libc/arch/riscv/sys/brk.S:1.5
--- src/lib/libc/arch/riscv/sys/brk.S:1.4 Tue Mar 31 11:59:41 2015
+++ src/lib/libc/arch/riscv/sys/brk.S Sun Dec 4 17:04:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.4 2015/03/31 11:59:41 matt Exp $ */
+/* $NetBSD: brk.S,v 1.5 2022/12/04 17:04:06 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: brk.S,v 1.4 2015/03/31 11:59:41 matt Exp $")
+ RCSID("$NetBSD: brk.S,v 1.5 2022/12/04 17:04:06 skrll Exp $")
#endif /* LIBC_SCCS and not lint */
.hidden _C_LABEL(__minbrk)
@@ -58,11 +58,11 @@ ENTRY(_brk)
lla t1, _C_LABEL(__minbrk)
PTR_L t5, 0(t1)
bgeu a0, t5, 1f
- move a0, t5 # dont allow break < minbrk
+ mv a0, t5 # dont allow break < minbrk
1:
SYSTRAP(break)
JUMP_TO_CERROR() /* error */
PTR_S a0, __SIZEOF_POINTER__(t1) /* success */
- move a0, zero
+ mv a0, zero
ret
END(_brk)
Index: src/lib/libc/arch/riscv/sys/sbrk.S
diff -u src/lib/libc/arch/riscv/sys/sbrk.S:1.4 src/lib/libc/arch/riscv/sys/sbrk.S:1.5
--- src/lib/libc/arch/riscv/sys/sbrk.S:1.4 Tue Mar 31 11:59:41 2015
+++ src/lib/libc/arch/riscv/sys/sbrk.S Sun Dec 4 17:04:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.4 2015/03/31 11:59:41 matt Exp $ */
+/* $NetBSD: sbrk.S,v 1.5 2022/12/04 17:04:06 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@ ENTRY(_sbrk)
SYSTRAP(break)
JUMP_TO_CERROR() /* error */
PTR_S a0, 0(t1) // save current val of curbrk from above
- move a0, t2 // return old val of curbrk from above
+ mv a0, t2 // return old val of curbrk from above
ret
1:
END(_sbrk)
Index: src/libexec/ld.elf_so/arch/riscv/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/riscv/rtld_start.S:1.3 src/libexec/ld.elf_so/arch/riscv/rtld_start.S:1.4
--- src/libexec/ld.elf_so/arch/riscv/rtld_start.S:1.3 Sat Dec 3 09:39:44 2022
+++ src/libexec/ld.elf_so/arch/riscv/rtld_start.S Sun Dec 4 17:04:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.3 2022/12/03 09:39:44 skrll Exp $ */
+/* $NetBSD: rtld_start.S,v 1.4 2022/12/04 17:04:06 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -41,31 +41,31 @@
* struct ps_strings *ps_strings)
*/
ENTRY(_rtld_start)
- move s0, sp # save stack pointer
+ mv s0, sp # save stack pointer
addi sp, sp, -4*__SIZEOF_POINTER__
# adjust stack pointer
# -> 2*PTR_SIZE(sp) for atexit
# -> 3*PTR_SIZE(sp) for obj_main
- move s1, a2 # save ps_strings pointer
+ mv s1, a2 # save ps_strings pointer
.L0: auipc gp, %pcrel_hi(_GLOBAL_OFFSET_TABLE_)
PTR_L t0, %pcrel_lo(.L0)(gp) # &_DYNAMIC
.L1: auipc a0, %pcrel_hi(_DYNAMIC)
addi a0, a0, %pcrel_lo(.L1)
sub s2, a0, t0 # save for _rtld
- move a1, s2
+ mv a1, s2
call _C_LABEL(_rtld_relocate_nonplt_self)
- move a1, s2 # relocbase
+ mv a1, s2 # relocbase
addi a0, sp, 2*__SIZEOF_POINTER__ # sp
call _C_LABEL(_rtld) # a0 = _rtld(sp, relocbase)
mv t0, a0
PTR_L a0, 2*__SIZEOF_POINTER__(sp) # cleanup function
PTR_L a1, 3*__SIZEOF_POINTER__(sp) # obj_main entry
- move a2, s1 # restore ps_strings
- move sp, s0 # readjust stack
- move s0, zero # break stack chain
+ mv a2, s1 # restore ps_strings
+ mv sp, s0 # readjust stack
+ mv s0, zero # break stack chain
jr t0 # _start(cleanup, obj_main, ps_strings);
END(_rtld_start)
