Module Name: src
Committed By: matt
Date: Mon Sep 7 23:20:29 UTC 2009
Modified Files:
src/sys/arch/evbmips/adm5120 [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/alchemy [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/atheros [matt-nb5-mips64]: machdep.c
src/sys/arch/evbmips/malta [matt-nb5-mips64]: machdep.c
Log Message:
Update to deal with pcb_context being a label_t (this should be a common
routine).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 src/sys/arch/evbmips/adm5120/machdep.c
cvs rdiff -u -r1.37 -r1.37.10.1 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.13 -r1.13.10.1 src/sys/arch/evbmips/atheros/machdep.c
cvs rdiff -u -r1.28.10.1 -r1.28.10.2 src/sys/arch/evbmips/malta/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/evbmips/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.6 src/sys/arch/evbmips/adm5120/machdep.c:1.6.10.1
--- src/sys/arch/evbmips/adm5120/machdep.c:1.6 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/evbmips/adm5120/machdep.c Mon Sep 7 23:20:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.6 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.6.10.1 2009/09/07 23:20:28 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6.10.1 2009/09/07 23:20:28 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -440,7 +440,13 @@
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] =
+#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/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.37 src/sys/arch/evbmips/alchemy/machdep.c:1.37.10.1
--- src/sys/arch/evbmips/alchemy/machdep.c:1.37 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/evbmips/alchemy/machdep.c Mon Sep 7 23:20:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.37 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.37.10.1 2009/09/07 23:20:28 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37.10.1 2009/09/07 23:20:28 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -366,7 +366,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
+ 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/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.13 src/sys/arch/evbmips/atheros/machdep.c:1.13.10.1
--- src/sys/arch/evbmips/atheros/machdep.c:1.13 Wed Jul 2 17:28:55 2008
+++ src/sys/arch/evbmips/atheros/machdep.c Mon Sep 7 23:20:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2008/07/02 17:28:55 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.13.10.1 2009/09/07 23:20:29 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -147,7 +147,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2008/07/02 17:28:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13.10.1 2009/09/07 23:20:29 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -312,7 +312,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
+ 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/evbmips/malta/machdep.c
diff -u src/sys/arch/evbmips/malta/machdep.c:1.28.10.1 src/sys/arch/evbmips/malta/machdep.c:1.28.10.2
--- src/sys/arch/evbmips/malta/machdep.c:1.28.10.1 Fri Aug 21 17:52:16 2009
+++ src/sys/arch/evbmips/malta/machdep.c Mon Sep 7 23:20:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.28.10.1 2009/08/21 17:52:16 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.28.10.2 2009/09/07 23:20:29 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28.10.1 2009/08/21 17:52:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28.10.2 2009/09/07 23:20:29 matt Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -326,7 +326,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_KX |
+#endif
MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
/*
