Module Name: src
Committed By: skrll
Date: Tue Dec 1 09:06:17 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: genassym.cf locore.S
src/sys/arch/hppa/hppa: copy.S trap.S
src/sys/lib/libkern/arch/hppa: bcopy.S
Log Message:
Remove U_PCB as requested by rmind.
Same code before and after.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp700/hp700/genassym.cf
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hp700/hp700/locore.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/hppa/copy.S
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hppa/hppa/trap.S
cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libkern/arch/hppa/bcopy.S
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/genassym.cf
diff -u src/sys/arch/hp700/hp700/genassym.cf:1.18 src/sys/arch/hp700/hp700/genassym.cf:1.19
--- src/sys/arch/hp700/hp700/genassym.cf:1.18 Thu May 7 15:34:49 2009
+++ src/sys/arch/hp700/hp700/genassym.cf Tue Dec 1 09:06:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.18 2009/05/07 15:34:49 skrll Exp $
+# $NetBSD: genassym.cf,v 1.19 2009/12/01 09:06:16 skrll Exp $
# $OpenBSD: genassym.cf,v 1.18 2001/09/20 18:31:14 mickey Exp $
@@ -193,9 +193,6 @@
member PCB_UVA pcb_uva
member PCB_KSP pcb_ksp
-struct user
-member U_PCB u_pcb
-
# system calls
export SYSCALLGATE
export SYS_exit
Index: src/sys/arch/hp700/hp700/locore.S
diff -u src/sys/arch/hp700/hp700/locore.S:1.37 src/sys/arch/hp700/hp700/locore.S:1.38
--- src/sys/arch/hp700/hp700/locore.S:1.37 Fri Nov 27 03:23:09 2009
+++ src/sys/arch/hp700/hp700/locore.S Tue Dec 1 09:06:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.37 2009/11/27 03:23:09 rmind Exp $ */
+/* $NetBSD: locore.S,v 1.38 2009/12/01 09:06:16 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */
/*
@@ -248,9 +248,9 @@
mtctl %t3, CR_UPADDR
/* initialize the pcb */
- stw %r0, U_PCB+PCB_ONFAULT(%t3)
- stw %r0, U_PCB+PCB_SPACE(%t3) /* XXX HPPA_SID_KERNEL == 0 */
- stw %t3, U_PCB+PCB_UVA(%t3)
+ stw %r0, PCB_ONFAULT(%t3)
+ stw %r0, PCB_SPACE(%t3) /* XXX HPPA_SID_KERNEL == 0 */
+ stw %t3, PCB_UVA(%t3)
/*
* Setup various pointers.
@@ -806,7 +806,7 @@
* Check that the stack is above this value for curl.
*/
ldw L_ADDR(%arg1), %arg2
- ldw U_PCB+PCB_KSP(%arg2), %t1 /* t1 for switch_error */
+ ldw PCB_KSP(%arg2), %t1 /* t1 for switch_error */
ldo NBPG(%arg2), %arg2
comb,>>,n %arg2, %t1, switch_error
nop
@@ -831,8 +831,8 @@
*/
ldw L_ADDR(%arg0), %t3 /* curl pcb */
- stw %sp, U_PCB+PCB_KSP(%t3)
- fdc %r0(%t3) /* flush curl pcb - surely fdc U_PCB+PCB_KSP(%t3) */
+ stw %sp, PCB_KSP(%t3)
+ fdc %r0(%t3) /* flush curl pcb - surely fdc PCB_KSP(%t3) */
/*
* Save the callee-save registers. We don't need to do
@@ -863,7 +863,7 @@
switch_exited:
ldw L_MD(%arg1), %t1
ldw L_ADDR(%arg1), %t3
- ldw U_PCB+PCB_KSP(%t3), %sp /* restore stack of newl */
+ ldw PCB_KSP(%t3), %sp /* restore stack of newl */
fdc %r0(%t3) /* Flush newl PCB - why? */
Index: src/sys/arch/hppa/hppa/copy.S
diff -u src/sys/arch/hppa/hppa/copy.S:1.13 src/sys/arch/hppa/hppa/copy.S:1.14
--- src/sys/arch/hppa/hppa/copy.S:1.13 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hppa/hppa/copy.S Tue Dec 1 09:06:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.S,v 1.13 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: copy.S,v 1.14 2009/12/01 09:06:17 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -102,27 +102,27 @@
ldw L_ADDR(%t1), %t1 ! \
ldil L%fusufault, %t2 ! \
ldo R%fusufault(%t2), %t2 ! \
- ldw U_PCB+PCB_ONFAULT(%t1), %t3 ! \
- stw %t2, U_PCB+PCB_ONFAULT(%t1) ! \
- ldw U_PCB+PCB_SPACE(%t1), %t2 ! \
+ ldw PCB_ONFAULT(%t1), %t3 ! \
+ stw %t2, PCB_ONFAULT(%t1) ! \
+ ldw PCB_SPACE(%t1), %t2 ! \
mtsp %t2, %sr1
#define FUX(name,insn) \
FUSUX(name) ! \
insn 0(%sr1, %arg0), %ret0 ! \
bv %r0(%rp) ! \
- stw %r0, U_PCB+PCB_ONFAULT(%t1) ! \
+ stw %r0, PCB_ONFAULT(%t1) ! \
EXIT(name)
#define SUX(name,insn) \
FUSUX(name) ! \
insn %arg1, 0(%sr1, %arg0) ! \
bv %r0(%rp) ! \
- stw %r0, U_PCB+PCB_ONFAULT(%t1) ! \
+ stw %r0, PCB_ONFAULT(%t1) ! \
EXIT(name)
LEAF_ENTRY_NOPROFILE(fusufault)
- stw %r0, U_PCB+PCB_ONFAULT(%t1)
+ stw %r0, PCB_ONFAULT(%t1)
ALTENTRY(fusubadaddr)
bv 0(%rp)
ldi -1, %ret0
@@ -141,7 +141,7 @@
LEAF_ENTRY_NOPROFILE(_copy_on_fault)
/* reset fault handler */
- stw %r0, PCB_ONFAULT+U_PCB(%r31)
+ stw %r0, PCB_ONFAULT(%r31)
ALTENTRY(copy_on_fault)
bv 0(%rp)
ldi EFAULT, %ret0
@@ -161,7 +161,7 @@
ldw L_ADDR(%r31), %r31
ldil L%_copy_on_fault, %t2
ldo R%_copy_on_fault(%t2), %t2
- stw %t2, PCB_ONFAULT+U_PCB(%r31)
+ stw %t2, PCB_ONFAULT(%r31)
ldw HPPA_FRAME_ARG(4)(%sp), %ret1 /* size */
mfsp %sr2, %ret0 /* XXX need this? */
@@ -178,7 +178,7 @@
L$spstrcpy_exit:
/* reset fault handler */
- stw %r0, PCB_ONFAULT+U_PCB(%r31)
+ stw %r0, PCB_ONFAULT(%r31)
mtsp %r0, %sr2 /* XXX need this? */
sub %arg1, %arg0, %arg1
ldw HPPA_FRAME_ARG(5)(%sp), %arg0 /* rsize */
@@ -230,7 +230,7 @@
#define SPACE_CURLWP(reg) \
mfctl CR_CURLWP, reg ! \
ldw L_ADDR(reg), reg ! \
- ldw U_PCB+PCB_SPACE(reg), reg
+ ldw PCB_SPACE(reg), reg
/* This loads the kernel's space into the given register. */
#define SPACE_KERNEL(reg) \
@@ -361,9 +361,9 @@
ldw L_ADDR(%r31), %r31
ldil L%_copy_on_fault, %t2
ldo R%_copy_on_fault(%t2), %t2
- stw %t2, PCB_ONFAULT+U_PCB(%r31)
+ stw %t2, PCB_ONFAULT(%r31)
- ldw U_PCB+PCB_SPACE(%r31), %t1
+ ldw PCB_SPACE(%r31), %t1
mtsp %t1, %sr1
ucas_ras_start:
Index: src/sys/arch/hppa/hppa/trap.S
diff -u src/sys/arch/hppa/hppa/trap.S:1.30 src/sys/arch/hppa/hppa/trap.S:1.31
--- src/sys/arch/hppa/hppa/trap.S:1.30 Sun May 24 09:17:59 2009
+++ src/sys/arch/hppa/hppa/trap.S Tue Dec 1 09:06:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.S,v 1.30 2009/05/24 09:17:59 skrll Exp $ */
+/* $NetBSD: trap.S,v 1.31 2009/12/01 09:06:17 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -1994,7 +1994,7 @@
mfctl CR_UPADDR, %t2
depi 1, T_USER_POS, 1, %r1
depi 1, TFF_LAST_POS, 1, %r1
- ldw U_PCB+PCB_UVA(%t2), %sp
+ ldw PCB_UVA(%t2), %sp
#ifdef DIAGNOSTIC
b L$trap_have_stack
#endif
Index: src/sys/lib/libkern/arch/hppa/bcopy.S
diff -u src/sys/lib/libkern/arch/hppa/bcopy.S:1.8 src/sys/lib/libkern/arch/hppa/bcopy.S:1.9
--- src/sys/lib/libkern/arch/hppa/bcopy.S:1.8 Thu Apr 30 07:01:27 2009
+++ src/sys/lib/libkern/arch/hppa/bcopy.S Tue Dec 1 09:06:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.S,v 1.8 2009/04/30 07:01:27 skrll Exp $ */
+/* $NetBSD: bcopy.S,v 1.9 2009/12/01 09:06:17 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <machine/reg.h>
#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: bcopy.S,v 1.8 2009/04/30 07:01:27 skrll Exp $")
+RCSID("$NetBSD: bcopy.S,v 1.9 2009/12/01 09:06:17 skrll Exp $")
#endif /* LIBC_SCCS and not lint */
/*
@@ -518,7 +518,7 @@
ldw L_ADDR(%r31), %r31
ldo R%spcopy_fault(%r1), %r1
ldi EFAULT, %ret0
- stw %r1, U_PCB+PCB_ONFAULT(%r31)
+ stw %r1, PCB_ONFAULT(%r31)
/* Setup the space registers. */
mfsp %sr2, %ret1
@@ -534,7 +534,7 @@
/* Return. */
copy %r0, %ret0
ALTENTRY(spcopy_fault)
- stw %r0, U_PCB+PCB_ONFAULT(%r31)
+ stw %r0, PCB_ONFAULT(%r31)
bv %r0(%rp)
mtsp %ret1, %sr2
EXIT(spcopy)
