Module Name: src
Committed By: matt
Date: Sat Sep 5 03:04:58 UTC 2009
Modified Files:
src/lib/libc/arch/mips [matt-nb5-mips64]: SYS.h
src/lib/libc/arch/mips/sys [matt-nb5-mips64]: brk.S cerror.S sbrk.S
Log Message:
LP64 cleanup --> s/la/PTR_LA/
To generate a diff of this commit:
cvs rdiff -u -r1.18.46.2 -r1.18.46.3 src/lib/libc/arch/mips/SYS.h
cvs rdiff -u -r1.16.46.2 -r1.16.46.3 src/lib/libc/arch/mips/sys/brk.S
cvs rdiff -u -r1.13.46.3 -r1.13.46.4 src/lib/libc/arch/mips/sys/cerror.S
cvs rdiff -u -r1.16.34.2 -r1.16.34.3 src/lib/libc/arch/mips/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/mips/SYS.h
diff -u src/lib/libc/arch/mips/SYS.h:1.18.46.2 src/lib/libc/arch/mips/SYS.h:1.18.46.3
--- src/lib/libc/arch/mips/SYS.h:1.18.46.2 Tue Aug 18 06:44:26 2009
+++ src/lib/libc/arch/mips/SYS.h Sat Sep 5 03:04:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: SYS.h,v 1.18.46.2 2009/08/18 06:44:26 matt Exp $ */
+/* $NetBSD: SYS.h,v 1.18.46.3 2009/09/05 03:04:58 matt Exp $ */
/*-
* Copyright (c) 1996 Jonathan Stone
@@ -80,11 +80,11 @@
.abicalls
# if defined(__mips_o32) || defined(__mips_o64)
# define PIC_PROLOGUE(x) SETUP_GP
-# define PIC_TAILCALL(l) la t9, _C_LABEL(l); jr t9
+# define PIC_TAILCALL(l) PTR_LA t9, _C_LABEL(l); jr t9
# define PIC_RETURN() j ra
# else
# define PIC_PROLOGUE(x) SETUP_GP64(t3, x)
-# define PIC_TAILCALL(l) la t9, _C_LABEL(l); RESTORE_GP64; jr t9
+# define PIC_TAILCALL(l) PTR_LA t9, _C_LABEL(l); RESTORE_GP64; jr t9
# define PIC_RETURN() RESTORE_GP64; j ra
# endif
#else
Index: src/lib/libc/arch/mips/sys/brk.S
diff -u src/lib/libc/arch/mips/sys/brk.S:1.16.46.2 src/lib/libc/arch/mips/sys/brk.S:1.16.46.3
--- src/lib/libc/arch/mips/sys/brk.S:1.16.46.2 Tue Aug 18 06:56:52 2009
+++ src/lib/libc/arch/mips/sys/brk.S Sat Sep 5 03:04:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.16.46.2 2009/08/18 06:56:52 matt Exp $ */
+/* $NetBSD: brk.S,v 1.16.46.3 2009/09/05 03:04:58 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
RCSID("from: @(#)brk.s 8.1 (Berkeley) 6/4/93")
#else
- RCSID("$NetBSD: brk.S,v 1.16.46.2 2009/08/18 06:56:52 matt Exp $")
+ RCSID("$NetBSD: brk.S,v 1.16.46.3 2009/09/05 03:04:58 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -57,7 +57,7 @@
LEAF(_brk)
PIC_PROLOGUE(_brk)
- la t0, _C_LABEL(__minbrk)
+ PTR_LA t0, _C_LABEL(__minbrk)
PTR_L v0, 0(t0)
bgeu a0, v0, 1f
move a0, v0 # dont allow break < minbrk
Index: src/lib/libc/arch/mips/sys/cerror.S
diff -u src/lib/libc/arch/mips/sys/cerror.S:1.13.46.3 src/lib/libc/arch/mips/sys/cerror.S:1.13.46.4
--- src/lib/libc/arch/mips/sys/cerror.S:1.13.46.3 Mon Aug 24 05:25:25 2009
+++ src/lib/libc/arch/mips/sys/cerror.S Sat Sep 5 03:04:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.13.46.3 2009/08/24 05:25:25 matt Exp $ */
+/* $NetBSD: cerror.S,v 1.13.46.4 2009/09/05 03:04:58 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
RCSID("from: @(#)cerror.s 8.1 (Berkeley) 6/16/93")
#else
- RCSID("$NetBSD: cerror.S,v 1.13.46.3 2009/08/24 05:25:25 matt Exp $")
+ RCSID("$NetBSD: cerror.S,v 1.13.46.4 2009/09/05 03:04:58 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -53,7 +53,7 @@
SAVE_GP(CALLFRAME_GP)
- la t9, _C_LABEL(__errno) # locate address of errno
+ PTR_LA t9, _C_LABEL(__errno) # locate address of errno
jalr t9
INT_L t0, CALLFRAME_S0(sp)
Index: src/lib/libc/arch/mips/sys/sbrk.S
diff -u src/lib/libc/arch/mips/sys/sbrk.S:1.16.34.2 src/lib/libc/arch/mips/sys/sbrk.S:1.16.34.3
--- src/lib/libc/arch/mips/sys/sbrk.S:1.16.34.2 Tue Aug 18 06:56:52 2009
+++ src/lib/libc/arch/mips/sys/sbrk.S Sat Sep 5 03:04:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.16.34.2 2009/08/18 06:56:52 matt Exp $ */
+/* $NetBSD: sbrk.S,v 1.16.34.3 2009/09/05 03:04:58 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
RCSID("from: @(#)sbrk.s 8.1 (Berkeley) 6/4/93")
#else
- RCSID("$NetBSD: sbrk.S,v 1.16.34.2 2009/08/18 06:56:52 matt Exp $")
+ RCSID("$NetBSD: sbrk.S,v 1.16.34.3 2009/09/05 03:04:58 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,7 +56,7 @@
LEAF(_sbrk)
PIC_PROLOGUE(_sbrk)
- la t0, _C_LABEL(__curbrk)
+ PTR_LA t0, _C_LABEL(__curbrk)
PTR_L v1, 0(t0)
PTR_ADDU a0, a0, v1 # compute current break
SYSTRAP(break)
