Module Name: src
Committed By: matt
Date: Mon Sep 7 23:46:46 UTC 2009
Modified Files:
src/sys/arch/arc/arc [matt-nb5-mips64]: machdep.c
src/sys/arch/cobalt/cobalt [matt-nb5-mips64]: machdep.c
src/sys/arch/ews4800mips/ews4800mips [matt-nb5-mips64]: machdep.c
src/sys/arch/hpcmips/hpcmips [matt-nb5-mips64]: machdep.c
src/sys/arch/mipsco/mipsco [matt-nb5-mips64]: machdep.c
src/sys/arch/newsmips/newsmips [matt-nb5-mips64]: machdep.c
src/sys/arch/playstation2/playstation2 [matt-nb5-mips64]: machdep.c
src/sys/arch/pmax/pmax [matt-nb5-mips64]: machdep.c
src/sys/arch/sgimips/sgimips [matt-nb5-mips64]: machdep.c
Log Message:
Deal with pcb_context being a label_t
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.112.10.1 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.98 -r1.98.10.1 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.14 -r1.14.10.1 \
src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.96.10.1 -r1.96.10.2 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.58 -r1.58.10.1 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.98 -r1.98.10.1 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.23 -r1.23.10.1 \
src/sys/arch/playstation2/playstation2/machdep.c
cvs rdiff -u -r1.223.8.1 -r1.223.8.1.2.1 src/sys/arch/pmax/pmax/machdep.c
cvs rdiff -u -r1.121 -r1.121.8.1 src/sys/arch/sgimips/sgimips/machdep.c
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/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.112 src/sys/arch/arc/arc/machdep.c:1.112.10.1
--- src/sys/arch/arc/arc/machdep.c:1.112 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/arc/arc/machdep.c Mon Sep 7 23:46:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.112 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.112.10.1 2009/09/07 23:46:45 matt Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -78,7 +78,7 @@
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112.10.1 2009/09/07 23:46:45 matt Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -498,7 +498,7 @@
v = uvm_pageboot_alloc(USPACE);
lwp0.l_addr = proc0paddr = (struct user *)v;
lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] =
+ lwp0.l_addr->u_pcb.pcb_context.val[_L_SR] =
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
}
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.98 src/sys/arch/cobalt/cobalt/machdep.c:1.98.10.1
--- src/sys/arch/cobalt/cobalt/machdep.c:1.98 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/cobalt/cobalt/machdep.c Mon Sep 7 23:46:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.98.10.1 2009/09/07 23:46:45 matt Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.1 2009/09/07 23:46:45 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -320,7 +320,13 @@
v = (char *)uvm_pageboot_alloc(USPACE);
lwp0.l_addr = proc0paddr = (struct user *)v;
lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] =
+#ifdef _LP64
+ lwp0.l_md.md_regs->f_regs[_R_SR] = MIPS_SR_KX;
+#endif
+ lwp0.l_addr->u_pcb.pcb_context.val[_L_SR] =
+#ifdef _LP64
+ MIPS_SR_KX |
+#endif
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
}
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14.10.1
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.14 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.14.10.1 2009/09/07 23:46:46 matt Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14.10.1 2009/09/07 23:46:46 matt Exp $");
#include "opt_ddb.h"
@@ -174,7 +174,7 @@
v = (void *)uvm_pageboot_alloc(USPACE); /* proc0 USPACE */
lwp0.l_addr = proc0paddr = (struct user *) v;
lwp0.l_md.md_regs = (struct frame *)((char *)v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] =
+ lwp0.l_addr->u_pcb.pcb_context.val[_L_SR] =
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
}
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.1 src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.2
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.96.10.1 Wed Aug 26 03:46:39 2009
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.96.10.1 2009/08/26 03:46:39 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.96.10.2 2009/09/07 23:46:46 matt Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96.10.1 2009/08/26 03:46:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96.10.2 2009/09/07 23:46:46 matt Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -458,7 +458,7 @@
lwp0.l_md.md_regs =
(struct frame *)((char *)kernend + UPAGES * PAGE_SIZE) - 1;
memset(kernend, 0, UPAGES * PAGE_SIZE);
- proc0paddr->u_pcb.pcb_context[11] =
+ lwp0.l_addr->u_pcb.pcb_context.val[11] =
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
kernend = (char *)kernend + UPAGES * PAGE_SIZE;
Index: src/sys/arch/mipsco/mipsco/machdep.c
diff -u src/sys/arch/mipsco/mipsco/machdep.c:1.58 src/sys/arch/mipsco/mipsco/machdep.c:1.58.10.1
--- src/sys/arch/mipsco/mipsco/machdep.c:1.58 Wed Jul 2 17:28:56 2008
+++ src/sys/arch/mipsco/mipsco/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.58 2008/07/02 17:28:56 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.58.10.1 2009/09/07 23:46:46 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58 2008/07/02 17:28:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58.10.1 2009/09/07 23:46:46 matt Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -376,7 +376,7 @@
v = (void *)uvm_pageboot_alloc(USPACE);
lwp0.l_addr = proc0paddr = (struct user *)v;
lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] =
+ lwp0.l_addr->u_pcb.pcb_context.val[_L_SR] =
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
/*
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.98 src/sys/arch/newsmips/newsmips/machdep.c:1.98.10.1
--- src/sys/arch/newsmips/newsmips/machdep.c:1.98 Wed Jul 2 17:28:56 2008
+++ src/sys/arch/newsmips/newsmips/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98 2008/07/02 17:28:56 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.98.10.1 2009/09/07 23:46:46 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2008/07/02 17:28:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98.10.1 2009/09/07 23:46:46 matt Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -381,7 +381,7 @@
v = (char *)uvm_pageboot_alloc(USPACE);
lwp0.l_addr = proc0paddr = (struct user *)v;
lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] =
+ lwp0.l_addr->u_pcb.pcb_context.val[_L_SR] =
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
/*
Index: src/sys/arch/playstation2/playstation2/machdep.c
diff -u src/sys/arch/playstation2/playstation2/machdep.c:1.23 src/sys/arch/playstation2/playstation2/machdep.c:1.23.10.1
--- src/sys/arch/playstation2/playstation2/machdep.c:1.23 Wed Jul 2 17:28:56 2008
+++ src/sys/arch/playstation2/playstation2/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.23 2008/07/02 17:28:56 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.23.10.1 2009/09/07 23:46:46 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 2008/07/02 17:28:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23.10.1 2009/09/07 23:46:46 matt Exp $");
#include "opt_ddb.h"
#include "opt_kloader.h"
@@ -157,9 +157,9 @@
v = (void *)uvm_pageboot_alloc(USPACE);
lwp0.l_addr = proc0paddr = (struct user *) v;
lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] = PSL_LOWIPL; /* SR */
+ lwp0.l_addr->u_pcb.pcb_context.val[11] = PSL_LOWIPL; /* SR */
#ifdef IPL_ICU_MASK
- proc0paddr->u_pcb.pcb_ppl = 0;
+ lwp0.l_addr->u_pcb.pcb_ppl = 0;
#endif
}
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.223.8.1 src/sys/arch/pmax/pmax/machdep.c:1.223.8.1.2.1
--- src/sys/arch/pmax/pmax/machdep.c:1.223.8.1 Sun Jul 26 18:45:01 2009
+++ src/sys/arch/pmax/pmax/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.223.8.1 2009/07/26 18:45:01 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.223.8.1.2.1 2009/09/07 23:46:46 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.223.8.1 2009/07/26 18:45:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.223.8.1.2.1 2009/09/07 23:46:46 matt Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -345,7 +345,13 @@
lwp0.l_addr = proc0paddr = (struct user *)kernend;
lwp0.l_md.md_regs = (struct frame *)(kernend + USPACE) - 1;
memset(lwp0.l_addr, 0, USPACE);
- proc0paddr->u_pcb.pcb_context[11] =
+#ifdef _LP64
+ lwp0.l_md.md_regs->f_regs[_R_SR] = MIPS_SR_KX;
+#endif
+ lwp0.l_addr->u_pcb.pcb_context.val[_L_SR] =
+#ifdef _LP64
+ MIPS_SR_KX |
+#endif
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
kernend += USPACE;
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.121 src/sys/arch/sgimips/sgimips/machdep.c:1.121.8.1
--- src/sys/arch/sgimips/sgimips/machdep.c:1.121 Sun Aug 3 00:35:03 2008
+++ src/sys/arch/sgimips/sgimips/machdep.c Mon Sep 7 23:46:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.121 2008/08/03 00:35:03 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.121.8.1 2009/09/07 23:46:46 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2008/08/03 00:35:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121.8.1 2009/09/07 23:46:46 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -696,7 +696,13 @@
v = (void *)uvm_pageboot_alloc(USPACE);
lwp0.l_addr = proc0paddr = (struct user *)v;
lwp0.l_md.md_regs = (struct frame *)((char *)v + USPACE) - 1;
- proc0paddr->u_pcb.pcb_context[11] =
+#ifdef _LP64
+ lwp0.l_md.md_regs->f_regs[_R_SR] = MIPS_SR_KX;
+#endif
+ proc0paddr->u_pcb.pcb_context.val[_L_SR] =
+#ifdef _LP64
+ MIPS_SR_KZ |
+#endif
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
}
