Module Name: src
Committed By: mrg
Date: Tue Jul 12 07:51:34 UTC 2011
Modified Files:
src/lib/libc/arch/sparc64/string: memcpy.S
src/lib/libc/compat/arch/sparc64/sys: compat___sigtramp1.S
src/sys/arch/sparc64/include: db_machdep.h psl.h reg.h
src/sys/arch/sparc64/sparc64: cpu.c locore.s memcpyset.s mp_subr.S
pmap.c svr4_sigcode64.s trap.c
Log Message:
rename sparc64 BLOCK_SIZE and BLOCK_ALIGN to have SPARC64_ prefixes.
for the assembler files, define the old names to the new names
since using the new names cause ugliness due to longer identifer
names, and reduces churn.
fixes build issues in dtv and vaguely makes <machine/psl.h> slightly
less name-space invasive.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sparc64/string/memcpy.S
cvs rdiff -u -r1.1 -r1.2 \
src/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sparc64/include/db_machdep.h
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sparc64/include/psl.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc64/include/reg.h
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.334 -r1.335 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/sparc64/memcpyset.s \
src/sys/arch/sparc64/sparc64/mp_subr.S
cvs rdiff -u -r1.274 -r1.275 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/sparc64/svr4_sigcode64.s
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/sparc64/sparc64/trap.c
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/sparc64/string/memcpy.S
diff -u src/lib/libc/arch/sparc64/string/memcpy.S:1.4 src/lib/libc/arch/sparc64/string/memcpy.S:1.5
--- src/lib/libc/arch/sparc64/string/memcpy.S:1.4 Wed May 25 02:11:16 2011
+++ src/lib/libc/arch/sparc64/string/memcpy.S Tue Jul 12 07:51:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy.S,v 1.4 2011/05/25 02:11:16 christos Exp $ */
+/* $NetBSD: memcpy.S,v 1.5 2011/07/12 07:51:33 mrg Exp $ */
/*
* Copyright (c) 2001 Eduardo E. Horvath
@@ -46,14 +46,15 @@
#include <machine/psl.h>
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: memcpy.S,v 1.4 2011/05/25 02:11:16 christos Exp $")
+ RCSID("$NetBSD: memcpy.S,v 1.5 2011/07/12 07:51:33 mrg Exp $")
#endif /* LIBC_SCCS and not lint */
#define EMPTY nop
#define NOTREACHED ta 1
#define BCOPY_SMALL 16
-#define BLOCK_SIZE 64
+#define BLOCK_SIZE SPARC64_BLOCK_SIZE
+#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
#if 0
#define ASI_STORE ASI_BLK_COMMIT_P
Index: src/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S
diff -u src/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S:1.1 src/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S:1.2
--- src/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S:1.1 Sun Oct 16 04:41:34 2005
+++ src/lib/libc/compat/arch/sparc64/sys/compat___sigtramp1.S Tue Jul 12 07:51:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: compat___sigtramp1.S,v 1.1 2005/10/16 04:41:34 christos Exp $ */
+/* $NetBSD: compat___sigtramp1.S,v 1.2 2011/07/12 07:51:33 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -58,6 +58,9 @@
.register %g2,#ignore
.register %g3,#ignore
+#define BLOCK_SIZE SPARC64_BLOCK_SIZE
+#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
+
/*
* When this code is run, the stack looks like:
* [%sp] 128 bytes to which registers can be dumped
Index: src/sys/arch/sparc64/include/db_machdep.h
diff -u src/sys/arch/sparc64/include/db_machdep.h:1.32 src/sys/arch/sparc64/include/db_machdep.h:1.33
--- src/sys/arch/sparc64/include/db_machdep.h:1.32 Mon Jun 20 09:25:48 2011
+++ src/sys/arch/sparc64/include/db_machdep.h Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.32 2011/06/20 09:25:48 nakayama Exp $ */
+/* $NetBSD: db_machdep.h,v 1.33 2011/07/12 07:51:34 mrg Exp $ */
/*
* Mach Operating System
@@ -68,7 +68,7 @@
struct frame64 db_fr;
struct trapstate db_ts[5];
int db_tl;
- struct fpstate64 db_fpstate __aligned(BLOCK_SIZE);
+ struct fpstate64 db_fpstate __aligned(SPARC64_BLOCK_SIZE);
} db_regs_t;
/* Current CPU register state */
Index: src/sys/arch/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.48 src/sys/arch/sparc64/include/psl.h:1.49
--- src/sys/arch/sparc64/include/psl.h:1.48 Wed May 25 12:01:30 2011
+++ src/sys/arch/sparc64/include/psl.h Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.48 2011/05/25 12:01:30 mrg Exp $ */
+/* $NetBSD: psl.h,v 1.49 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -265,8 +265,8 @@
#define CWP 0x01f
/* 64-byte alignment -- this seems the best place to put this. */
-#define BLOCK_SIZE 64
-#define BLOCK_ALIGN 0x3f
+#define SPARC64_BLOCK_SIZE 64
+#define SPARC64_BLOCK_ALIGN 0x3f
#if defined(_KERNEL) && !defined(_LOCORE)
Index: src/sys/arch/sparc64/include/reg.h
diff -u src/sys/arch/sparc64/include/reg.h:1.13 src/sys/arch/sparc64/include/reg.h:1.14
--- src/sys/arch/sparc64/include/reg.h:1.13 Sun Dec 11 12:19:10 2005
+++ src/sys/arch/sparc64/include/reg.h Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: reg.h,v 1.13 2005/12/11 12:19:10 christos Exp $ */
+/* $NetBSD: reg.h,v 1.14 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -171,7 +171,7 @@
* XXXX UltraSPARC processors don't implement a floating point queue.
*/
#define FP_QSIZE 16
-#define ALIGNFPSTATE(f) ((struct fpstate64 *)(((long)(f))&(~BLOCK_ALIGN)))
+#define ALIGNFPSTATE(f) ((struct fpstate64 *)(((long)(f))&(~SPARC64_BLOCK_ALIGN)))
struct fp_qentry {
int *fq_addr; /* the instruction's address */
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.99 src/sys/arch/sparc64/sparc64/cpu.c:1.100
--- src/sys/arch/sparc64/sparc64/cpu.c:1.99 Sat Jun 18 18:51:18 2011
+++ src/sys/arch/sparc64/sparc64/cpu.c Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.99 2011/06/18 18:51:18 nakayama Exp $ */
+/* $NetBSD: cpu.c,v 1.100 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.99 2011/06/18 18:51:18 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.100 2011/07/12 07:51:34 mrg Exp $");
#include "opt_multiprocessor.h"
@@ -269,8 +269,8 @@
*/
if (ci->ci_flags & CPUF_PRIMARY) {
fpstate_cache = pool_cache_init(sizeof(struct fpstate64),
- BLOCK_SIZE, 0, 0, "fpstate", NULL,
- IPL_NONE, NULL, NULL, NULL);
+ SPARC64_BLOCK_SIZE, 0, 0, "fpstate",
+ NULL, IPL_NONE, NULL, NULL, NULL);
cpu_reset_fpustate();
}
#ifdef MULTIPROCESSOR
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.334 src/sys/arch/sparc64/sparc64/locore.s:1.335
--- src/sys/arch/sparc64/sparc64/locore.s:1.334 Sat Jun 18 18:51:18 2011
+++ src/sys/arch/sparc64/sparc64/locore.s Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.334 2011/06/18 18:51:18 nakayama Exp $ */
+/* $NetBSD: locore.s,v 1.335 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -90,6 +90,9 @@
#include <machine/locore.h>
#include <sys/syscall.h>
+#define BLOCK_SIZE SPARC64_BLOCK_SIZE
+#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
+
#include "ksyms.h"
#if 1
Index: src/sys/arch/sparc64/sparc64/memcpyset.s
diff -u src/sys/arch/sparc64/sparc64/memcpyset.s:1.2 src/sys/arch/sparc64/sparc64/memcpyset.s:1.3
--- src/sys/arch/sparc64/sparc64/memcpyset.s:1.2 Sun Mar 7 00:42:58 2010
+++ src/sys/arch/sparc64/sparc64/memcpyset.s Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpyset.s,v 1.2 2010/03/07 00:42:58 mrg Exp $ */
+/* $NetBSD: memcpyset.s,v 1.3 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -37,6 +37,9 @@
#ifdef USE_BLOCK_STORE_LOAD
+#define BLOCK_SIZE SPARC64_BLOCK_SIZE
+#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
+
/*
* The following routines allow fpu use in the kernel.
*
Index: src/sys/arch/sparc64/sparc64/mp_subr.S
diff -u src/sys/arch/sparc64/sparc64/mp_subr.S:1.2 src/sys/arch/sparc64/sparc64/mp_subr.S:1.3
--- src/sys/arch/sparc64/sparc64/mp_subr.S:1.2 Sat May 29 21:59:34 2010
+++ src/sys/arch/sparc64/sparc64/mp_subr.S Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mp_subr.S,v 1.2 2010/05/29 21:59:34 martin Exp $ */
+/* $NetBSD: mp_subr.S,v 1.3 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 2006-2010 Matthew R. Green
@@ -84,6 +84,8 @@
.register %g2,#scratch
.register %g3,#scratch
+#define BLOCK_SIZE SPARC64_BLOCK_SIZE
+#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
#if defined(MULTIPROCESSOR)
/*
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.274 src/sys/arch/sparc64/sparc64/pmap.c:1.275
--- src/sys/arch/sparc64/sparc64/pmap.c:1.274 Sat Jun 18 18:51:18 2011
+++ src/sys/arch/sparc64/sparc64/pmap.c Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.274 2011/06/18 18:51:18 nakayama Exp $ */
+/* $NetBSD: pmap.c,v 1.275 2011/07/12 07:51:34 mrg Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.274 2011/06/18 18:51:18 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.275 2011/07/12 07:51:34 mrg Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -1291,8 +1291,9 @@
/*
* initialize the pmap pools.
*/
- pool_cache_bootstrap(&pmap_cache, sizeof(struct pmap), BLOCK_SIZE, 0,
- 0, "pmappl", NULL, IPL_NONE, NULL, NULL, NULL);
+ pool_cache_bootstrap(&pmap_cache, sizeof(struct pmap),
+ SPARC64_BLOCK_SIZE, 0, 0, "pmappl", NULL, IPL_NONE, NULL, NULL,
+ NULL);
pool_cache_bootstrap(&pmap_pv_cache, sizeof(struct pv_entry), 0, 0,
PR_LARGECACHE, "pv_entry", NULL, IPL_NONE, NULL, NULL, NULL);
Index: src/sys/arch/sparc64/sparc64/svr4_sigcode64.s
diff -u src/sys/arch/sparc64/sparc64/svr4_sigcode64.s:1.3 src/sys/arch/sparc64/sparc64/svr4_sigcode64.s:1.4
--- src/sys/arch/sparc64/sparc64/svr4_sigcode64.s:1.3 Sun May 5 08:15:15 2002
+++ src/sys/arch/sparc64/sparc64/svr4_sigcode64.s Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_sigcode64.s,v 1.3 2002/05/05 08:15:15 thorpej Exp $ */
+/* $NetBSD: svr4_sigcode64.s,v 1.4 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 1996-2000 Eduardo Horvath
@@ -69,6 +69,9 @@
.register %g2,#scratch
.register %g3,#scratch
+#define BLOCK_SIZE SPARC64_BLOCK_SIZE
+#define BLOCK_ALIGN SPARC64_BLOCK_ALIGN
+
/*
* XXXXX Not implemented yet
*
Index: src/sys/arch/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.166 src/sys/arch/sparc64/sparc64/trap.c:1.167
--- src/sys/arch/sparc64/sparc64/trap.c:1.166 Thu Jun 23 13:39:40 2011
+++ src/sys/arch/sparc64/sparc64/trap.c Tue Jul 12 07:51:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.166 2011/06/23 13:39:40 nakayama Exp $ */
+/* $NetBSD: trap.c,v 1.167 2011/07/12 07:51:34 mrg Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.166 2011/06/23 13:39:40 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.167 2011/07/12 07:51:34 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -165,7 +165,7 @@
* set, no matter how it is interpreted. Appendix N of the Sparc V8 document
* seems to imply that we should do this, and it does make sense.
*/
-const struct fpstate64 initfpstate __aligned(BLOCK_SIZE) = {
+const struct fpstate64 initfpstate __aligned(SPARC64_BLOCK_SIZE) = {
.fs_regs =
{ ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0,
