Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Catch up with -current. (common...
details: https://anonhg.NetBSD.org/src/rev/3debe6bfcc6a
branches: sommerfeld_i386mp_1
changeset: 482531:3debe6bfcc6a
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sat May 18 17:27:30 2002 +0000
description:
Catch up with -current. (commons elimination, changes to MI pci framework)
diffstat:
sys/arch/i386/MP-UPDATING | 5 +++++
sys/arch/i386/i386/db_interface.c | 6 +++---
sys/arch/i386/i386/genassym.cf | 4 ++--
sys/arch/i386/i386/machdep.c | 15 ++++++++++++---
sys/arch/i386/i386/mainbus.c | 5 +++--
sys/arch/i386/i386/process_machdep.c | 33 ++++++++++++---------------------
sys/arch/i386/i386/procfs_machdep.c | 19 +++++++++++++++++--
sys/arch/i386/include/cpu.h | 8 +++++---
sys/arch/i386/include/db_machdep.h | 4 ++--
sys/arch/i386/include/intr.h | 8 ++++----
sys/arch/i386/pci/pchb.c | 7 +++++--
11 files changed, 70 insertions(+), 44 deletions(-)
diffs (truncated from 374 to 300 lines):
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/MP-UPDATING Sat May 18 17:27:30 2002 +0000
@@ -1,3 +1,8 @@
+Last Synchronized: Sat May 18 12:48:18 EDT 2002
+
+merged with -current as of today.
+Merged with mainline common elimination, new MI pci framework.
+
Last Synchronized: Sat Apr 27 11:54:52 EDT 2002
merged with -current as of today.
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/i386/db_interface.c
--- a/sys/arch/i386/i386/db_interface.c Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/i386/db_interface.c Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.30.2.9 2002/04/27 14:39:34 sommerfeld Exp $ */
+/* $NetBSD: db_interface.c,v 1.30.2.10 2002/05/18 17:27:31 sommerfeld Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.30.2.9 2002/04/27 14:39:34 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.30.2.10 2002/05/18 17:27:31 sommerfeld Exp $");
#include "opt_ddb.h"
@@ -61,11 +61,11 @@
#include <ddb/db_output.h>
#include <ddb/ddbvar.h>
-extern label_t *db_recover;
extern char *trap_type[];
extern int trap_types;
int db_active = 0;
+db_regs_t ddb_regs; /* register state */
void db_mach_cpu (db_expr_t, int, db_expr_t, char *);
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/i386/genassym.cf Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.17.10.15 2002/04/27 14:39:34 sommerfeld Exp $
+# $NetBSD: genassym.cf,v 1.17.10.16 2002/05/18 17:27:31 sommerfeld Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
# @(#)genassym.c 5.11 (Berkeley) 5/10/91
#
-if defined(_KERNEL) && !defined(_LKM)
+if defined(_KERNEL_OPT)
include "opt_compat_svr4.h"
include "opt_compat_freebsd.h"
include "opt_compat_linux.h"
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/i386/machdep.c Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.376.2.35 2002/04/27 20:24:46 sommerfeld Exp $ */
+/* $NetBSD: machdep.c,v 1.376.2.36 2002/05/18 17:27:31 sommerfeld Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.376.2.35 2002/04/27 20:24:46 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.376.2.36 2002/05/18 17:27:31 sommerfeld Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -177,8 +177,18 @@
char machine[] = "i386"; /* cpu "architecture" */
char machine_arch[] = "i386"; /* machine == machine_arch */
+volatile u_int32_t ipending;
+
+int imasks[NIPL];
+int iunmask[NIPL];
+
+u_int cpu_serial[3];
+
char bootinfo[BOOTINFO_MAXSIZE];
+/* Our exported CPU info; we have only one right now. */
+struct cpu_info cpu_info_store;
+
struct bi_devmatch *i386_alldisks = NULL;
int i386_ndisks = 0;
@@ -196,7 +206,6 @@
int physmem;
int dumpmem_low;
int dumpmem_high;
-int boothowto;
int cpu_class;
int i386_fpu_present;
int i386_fpu_exception;
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/i386/mainbus.c
--- a/sys/arch/i386/i386/mainbus.c Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/i386/mainbus.c Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.29.2.7 2002/04/27 20:24:47 sommerfeld Exp $ */
+/* $NetBSD: mainbus.c,v 1.29.2.8 2002/05/18 17:27:32 sommerfeld Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29.2.7 2002/04/27 20:24:47 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29.2.8 2002/05/18 17:27:32 sommerfeld Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -223,6 +223,7 @@
mba.mba_pba.pba_pc = NULL;
mba.mba_pba.pba_flags = pci_bus_flags();
mba.mba_pba.pba_bus = 0;
+ mba.mba_pba.pba_bridgetag = NULL;
config_found(self, &mba.mba_pba, mainbus_print);
}
#endif
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/i386/process_machdep.c
--- a/sys/arch/i386/i386/process_machdep.c Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/i386/process_machdep.c Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.30.10.8 2001/12/29 21:09:07 sommerfeld Exp $ */
+/* $NetBSD: process_machdep.c,v 1.30.10.9 2002/05/18 17:27:32 sommerfeld Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.30.10.8 2001/12/29 21:09:07 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.30.10.9 2002/05/18 17:27:32 sommerfeld Exp $");
#include "opt_vm86.h"
#include "npx.h"
@@ -75,8 +75,6 @@
#include <uvm/uvm_extern.h>
-#include <miscfs/procfs/procfs.h>
-
#include <machine/psl.h>
#include <machine/reg.h>
#include <machine/segments.h>
@@ -410,10 +408,8 @@
}
#ifdef __HAVE_PTRACE_MACHDEP
-int
-process_machdep_read_xmmregs(p, regs)
- struct proc *p;
- struct xmmregs *regs;
+static int
+process_machdep_read_xmmregs(struct proc *p, struct xmmregs *regs)
{
union savefpu *frame = process_fpframe(p);
@@ -448,10 +444,8 @@
return (0);
}
-int
-process_machdep_write_xmmregs(p, regs)
- struct proc *p;
- struct xmmregs *regs;
+static int
+process_machdep_write_xmmregs(struct proc *p, struct xmmregs *regs)
{
union savefpu *frame = process_fpframe(p);
@@ -489,7 +483,7 @@
case PT_GETXMMREGS:
/* write = 0 done above. */
- if (!procfs_machdep_validxmmregs(t, NULL))
+ if (!process_machdep_validxmmregs(t))
return (EINVAL);
else {
iov.iov_base = addr;
@@ -501,7 +495,7 @@
uio.uio_segflg = UIO_USERSPACE;
uio.uio_rw = write ? UIO_WRITE : UIO_READ;
uio.uio_procp = p;
- return (procfs_machdep_doxmmregs(p, t, NULL, &uio));
+ return (process_machdep_doxmmregs(p, t, &uio));
}
}
@@ -513,15 +507,13 @@
}
/*
- * The following functions have procfs-centric names, but are in
- * fact used by both ptrace(2) and procfs.
+ * The following functions are used by both ptrace(2) and procfs.
*/
int
-procfs_machdep_doxmmregs(curp, p, pfs, uio)
+process_machdep_doxmmregs(curp, p, uio)
struct proc *curp; /* tracer */
struct proc *p; /* traced */
- struct pfsnode *pfs;
struct uio *uio;
{
int error;
@@ -529,7 +521,7 @@
char *kv;
int kl;
- if ((error = procfs_checkioperm(curp, p)) != 0)
+ if ((error = process_checkioperm(curp, p)) != 0)
return (error);
kl = sizeof(r);
@@ -562,9 +554,8 @@
}
int
-procfs_machdep_validxmmregs(p, mp)
+process_machdep_validxmmregs(p)
struct proc *p;
- struct mount *mp;
{
if (p->p_flag & P_SYSTEM)
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/i386/procfs_machdep.c
--- a/sys/arch/i386/i386/procfs_machdep.c Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/i386/procfs_machdep.c Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.5.2.4 2001/12/29 21:09:08 sommerfeld Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.5.2.5 2002/05/18 17:27:33 sommerfeld Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5.2.4 2001/12/29 21:09:08 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.5.2.5 2002/05/18 17:27:33 sommerfeld Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -213,4 +213,19 @@
return (0);
}
+
+int
+procfs_machdep_doxmmregs(struct proc *curp, struct proc *p,
+ struct pfsnode *pfs, struct uio *uio)
+{
+
+ return (process_machdep_doxmmregs(curp, p, uio));
+}
+
+int
+procfs_machdep_validxmmregs(struct proc *p, struct mount *mp)
+{
+
+ return (process_machdep_validxmmregs(p));
+}
#endif
diff -r 75e0e0026ecf -r 3debe6bfcc6a sys/arch/i386/include/cpu.h
--- a/sys/arch/i386/include/cpu.h Sat May 18 16:20:08 2002 +0000
+++ b/sys/arch/i386/include/cpu.h Sat May 18 17:27:30 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.59.2.31 2002/04/27 14:39:39 sommerfeld Exp $ */
+/* $NetBSD: cpu.h,v 1.59.2.32 2002/05/18 17:27:33 sommerfeld Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -251,12 +251,14 @@
* encapsulate the previous machine state in an opaque
* clockframe; for now, use generic intrframe.
*
- * XXX intrframe has a lot of gunk we don't need.
+ * Note: Since spllowersoftclock() does not actually unmask the currently
+ * running (hardclock) interrupt, CLKF_BASEPRI() *must* always be 0; otherwise
+ * we could stall hardclock ticks if another interrupt takes too long.
*/
#define clockframe intrframe
#define CLKF_USERMODE(frame) USERMODE((frame)->if_cs, (frame)->if_eflags)
Home |
Main Index |
Thread Index |
Old Index