Module Name: src
Committed By: matt
Date: Fri Mar 27 23:23:14 UTC 2015
Modified Files:
src/lib/libc/arch/riscv/gen: __sigsetjmp14.S swapcontext.S
src/lib/libc/arch/riscv/sys: __clone.S brk.S cerror.S sbrk.S
Log Message:
Adapt to new assembler. jump->tail[call] auipc/lo12 changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/riscv/gen/__sigsetjmp14.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/riscv/gen/swapcontext.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/riscv/sys/__clone.S \
src/lib/libc/arch/riscv/sys/brk.S src/lib/libc/arch/riscv/sys/cerror.S \
src/lib/libc/arch/riscv/sys/sbrk.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/__sigsetjmp14.S
diff -u src/lib/libc/arch/riscv/gen/__sigsetjmp14.S:1.1 src/lib/libc/arch/riscv/gen/__sigsetjmp14.S:1.2
--- src/lib/libc/arch/riscv/gen/__sigsetjmp14.S:1.1 Fri Sep 19 17:36:25 2014
+++ src/lib/libc/arch/riscv/gen/__sigsetjmp14.S Fri Mar 27 23:23:14 2015
@@ -1,21 +1,21 @@
-/* $NetBSD: __sigsetjmp14.S,v 1.1 2014/09/19 17:36:25 matt Exp $ */
+/* $NetBSD: __sigsetjmp14.S,v 1.2 2015/03/27 23:23:14 matt Exp $ */
#include "SYS.h"
#include "assym.h"
#if defined(LIBC_SCCS)
-__RCSID("$NetBSD: __sigsetjmp14.S,v 1.1 2014/09/19 17:36:25 matt Exp $")
+__RCSID("$NetBSD: __sigsetjmp14.S,v 1.2 2015/03/27 23:23:14 matt Exp $")
#endif
ENTRY(__sigsetjmp14)
bnez a1, 1f
- jump PLT(_C_LABEL(_setjmp))
-1: jump PLT(_C_LABEL(__setjmp14))
+ tail PLT(_C_LABEL(_setjmp))
+1: tail PLT(_C_LABEL(__setjmp14))
END(__sigsetjmp14)
ENTRY(__siglongjmp14)
REG_L a2, JB_MAGIC(a0)
bnez a2, 1f
- jump PLT(_C_LABEL(_longjmp))
-1: jump PLT(_C_LABEL(__longjmp14))
+ tail PLT(_C_LABEL(_longjmp))
+1: tail PLT(_C_LABEL(__longjmp14))
END(__siglongjmp14)
Index: src/lib/libc/arch/riscv/gen/swapcontext.S
diff -u src/lib/libc/arch/riscv/gen/swapcontext.S:1.2 src/lib/libc/arch/riscv/gen/swapcontext.S:1.3
--- src/lib/libc/arch/riscv/gen/swapcontext.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/gen/swapcontext.S Fri Mar 27 23:23:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: swapcontext.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "SYS.h"
#include "assym.h"
-__RCSID("$NetBSD: swapcontext.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+__RCSID("$NetBSD: swapcontext.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
#define CALLFRAME_UCP CALLFRAME_S1
#define CALLFRAME_OUCP CALLFRAME_S0
@@ -56,7 +56,7 @@ ENTRY(swapcontext)
REG_S ra, UC_GREGS_PC(a1) # pc <- ra
REG_S sp, UC_GREGS_SP(a1) # adjust sp
- jump PLT(_C_LABEL(setcontext)) # setcontext(ucp)
+ tail PLT(_C_LABEL(setcontext)) # setcontext(ucp)
1: ret # simply return
END(swapcontext)
Index: src/lib/libc/arch/riscv/sys/__clone.S
diff -u src/lib/libc/arch/riscv/sys/__clone.S:1.2 src/lib/libc/arch/riscv/sys/__clone.S:1.3
--- src/lib/libc/arch/riscv/sys/__clone.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/sys/__clone.S Fri Mar 27 23:23:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: __clone.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: __clone.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "SYS.h"
#if defined(SYSLIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: __clone.S,v 1.2 2015/03/27 06:44:28 matt Exp $");
+ RCSID("$NetBSD: __clone.S,v 1.3 2015/03/27 23:23:14 matt Exp $");
#endif /* SYSLIBC_SCCS and not lint */
#ifdef WEAK_ALIAS
@@ -92,7 +92,7 @@ ENTRY(__clone)
jalr t0
/* Pass the return value to _exit. */
- jump _C_LABEL(_exit)
+ tail _C_LABEL(_exit)
/* NOTREACHED */
END(__clone)
Index: src/lib/libc/arch/riscv/sys/brk.S
diff -u src/lib/libc/arch/riscv/sys/brk.S:1.2 src/lib/libc/arch/riscv/sys/brk.S:1.3
--- src/lib/libc/arch/riscv/sys/brk.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/sys/brk.S Fri Mar 27 23:23:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: brk.S,v 1.3 2015/03/27 23:23:14 matt 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.2 2015/03/27 06:44:28 matt Exp $")
+ RCSID("$NetBSD: brk.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
#endif /* LIBC_SCCS and not lint */
.hidden _C_LABEL(__minbrk)
@@ -55,8 +55,8 @@ _C_LABEL(__curbrk):
.text
ENTRY(_brk)
- auipc t1, %pcrel_hi(_C_LABEL(__minbrk))
- addi t1, t1, %pcrel_lo(_C_LABEL(__minbrk))
+.L0: auipc t1, %pcrel_hi(_C_LABEL(__minbrk))
+ addi t1, t1, %pcrel_lo(.L0)
PTR_L t5, 0(t1)
bgeu a0, t5, 1f
move a0, t5 # dont allow break < minbrk
Index: src/lib/libc/arch/riscv/sys/cerror.S
diff -u src/lib/libc/arch/riscv/sys/cerror.S:1.2 src/lib/libc/arch/riscv/sys/cerror.S:1.3
--- src/lib/libc/arch/riscv/sys/cerror.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/sys/cerror.S Fri Mar 27 23:23:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: cerror.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,7 +35,7 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: cerror.S,v 1.2 2015/03/27 06:44:28 matt Exp $")
+ RCSID("$NetBSD: cerror.S,v 1.3 2015/03/27 23:23:14 matt Exp $")
#endif /* LIBC_SCCS and not lint */
.protected _C_LABEL(__cerror)
@@ -55,7 +55,7 @@ ENTRY_NP(__cerror)
addi sp, sp, CALLFRAME_SIZ
#else
aiupc a1, %hi(_C_LABEL(errno))
- sw a0, %lo(_C_LABEL(errno))(a1)
+ INT_S a0, %lo(_C_LABEL(errno))(a1)
#endif /* _REENTRANT */
li a0, -1
li a1, -1
Index: src/lib/libc/arch/riscv/sys/sbrk.S
diff -u src/lib/libc/arch/riscv/sys/sbrk.S:1.2 src/lib/libc/arch/riscv/sys/sbrk.S:1.3
--- src/lib/libc/arch/riscv/sys/sbrk.S:1.2 Fri Mar 27 06:44:28 2015
+++ src/lib/libc/arch/riscv/sys/sbrk.S Fri Mar 27 23:23:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.2 2015/03/27 06:44:28 matt Exp $ */
+/* $NetBSD: sbrk.S,v 1.3 2015/03/27 23:23:14 matt Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -40,8 +40,8 @@ WEAK_ALIAS(sbrk, _sbrk)
#endif
ENTRY(_sbrk)
- auipc t1, %pcrel_hi(_C_LABEL(__curbrk))
- addi t1, t1, %pcrel_lo(_C_LABEL(__curbrk))
+.L0: auipc t1, %pcrel_hi(_C_LABEL(__curbrk))
+ addi t1, t1, %pcrel_lo(.L0)
PTR_L t2, 0(t1)
add a0, a0, t2 // compute current break
SYSTRAP(break)
