Module Name: src
Committed By: skrll
Date: Mon Mar 8 07:42:47 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: locore.S
src/sys/arch/hppa/hppa: trap.S
src/sys/arch/hppa/include: asm.h
Log Message:
Fix and use the BSS macro.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hppa/hppa/trap.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/include/asm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.42 src/sys/arch/hp700/hp700/locore.S:1.43
--- src/sys/arch/hp700/hp700/locore.S:1.42 Sat Mar 6 21:22:42 2010
+++ src/sys/arch/hp700/hp700/locore.S Mon Mar 8 07:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.42 2010/03/06 21:22:42 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.43 2010/03/08 07:42:47 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */
/*
@@ -155,25 +155,9 @@
.import fpu_cur_uspace, data
.import hp700_int_regs, data
-#if 0
BSS(pdc_stack, 4) /* temp stack for PDC call */
BSS(kernelmapped, 4) /* set when kernel is mapped */
BSS(hppa_vtop, 4) /* a vtop translation table addr (pa=va) */
-#else
- .section .bss
-
- .export pdc_stack, data
-pdc_stack: /* temp stack for PDC call */
- .block 4
-
- .export kernelmapped, data
-kernelmapped: /* set when kernel is mapped */
- .block 4
-
- .export hppa_vtop, data
-hppa_vtop: /* a vtop translation table addr (pa=va) */
- .block 4
-#endif
.text
.import kernel_setup, entry
Index: src/sys/arch/hppa/hppa/trap.S
diff -u src/sys/arch/hppa/hppa/trap.S:1.40 src/sys/arch/hppa/hppa/trap.S:1.41
--- src/sys/arch/hppa/hppa/trap.S:1.40 Sat Feb 13 10:39:39 2010
+++ src/sys/arch/hppa/hppa/trap.S Mon Mar 8 07:42:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.S,v 1.40 2010/02/13 10:39:39 skrll Exp $ */
+/* $NetBSD: trap.S,v 1.41 2010/03/08 07:42:47 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -1234,23 +1234,9 @@
depi 1, 0, 1, t /* and set the valid bit */
#if 0
- .section .bss
- .export dtlb_c, data
- .export tlbd_c, data
- .export itlb_c, data
-#if 0
BSS(dtlb_c, 8)
BSS(tlbd_c, 8)
BSS(itlb_c, 8)
-#else
-dtlb_c:
- .block 8
-tlbd_c:
- .block 8
-itlb_c:
- .block 8
-#endif
- .text
/* XXX this touches tr5, which it should not, perhaps */
#define TLB_STATS_PRE(t) \
Index: src/sys/arch/hppa/include/asm.h
diff -u src/sys/arch/hppa/include/asm.h:1.10 src/sys/arch/hppa/include/asm.h:1.11
--- src/sys/arch/hppa/include/asm.h:1.10 Mon Aug 11 21:52:10 2008
+++ src/sys/arch/hppa/include/asm.h Mon Mar 8 07:42:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: asm.h,v 1.10 2008/08/11 21:52:10 skrll Exp $ */
+/* $NetBSD: asm.h,v 1.11 2010/03/08 07:42:46 skrll Exp $ */
/* $OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $ */
@@ -143,7 +143,7 @@
.stabs __STRING(sym),1,0,0,0
#endif
-#define BSS(n,s) ! .data ! .label n ! .comm s
+#define BSS(n,s) .comm n, s
#define SZREG 4
#endif /* _HPPA_ASM_H_ */
