[src/trunk]: src/sys/arch/dnard/include Use the common arm32/pcb.h. Rearrang...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40b70438b6c8
branches:  trunk
changeset: 509632:40b70438b6c8
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 09 15:17:45 2001 +0000

description:
Use the common arm32/pcb.h.  Rearrange db_machdep.h to get definitions
before declaring functions.

diffstat:

 sys/arch/dnard/include/db_machdep.h |  11 ++--
 sys/arch/dnard/include/pcb.h        |  80 +------------------------------------
 2 files changed, 8 insertions(+), 83 deletions(-)

diffs (107 lines):

diff -r 43113952834a -r 40b70438b6c8 sys/arch/dnard/include/db_machdep.h
--- a/sys/arch/dnard/include/db_machdep.h       Wed May 09 15:16:24 2001 +0000
+++ b/sys/arch/dnard/include/db_machdep.h       Wed May 09 15:17:45 2001 +0000
@@ -1,12 +1,13 @@
-/* $NetBSD: db_machdep.h,v 1.2 2001/03/04 05:55:43 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2001/05/09 15:17:45 matt Exp $ */
+
+#include <arm/db_machdep.h>
 
-void db_of_boot_cmd    (db_expr_t addr, int have_addr, db_expr_t count, char *modif);
-void db_of_enter_cmd   (db_expr_t addr, int have_addr, db_expr_t count, char *modif);
-void db_of_exit_cmd    (db_expr_t addr, int have_addr, db_expr_t count, char *modif);
+void db_of_boot_cmd (db_expr_t, int, db_expr_t, char *);
+void db_of_enter_cmd (db_expr_t, int, db_expr_t, char *);
+void db_of_exit_cmd (db_expr_t, int, db_expr_t, char *);
 
 #define ARM32_DB_COMMANDS \
        { "ofboot",     db_of_boot_cmd,         0, NULL }, \
        { "ofenter",    db_of_enter_cmd,        0, NULL }, \
        { "ofexit",     db_of_exit_cmd,         0, NULL }
 
-#include <arm/db_machdep.h>
diff -r 43113952834a -r 40b70438b6c8 sys/arch/dnard/include/pcb.h
--- a/sys/arch/dnard/include/pcb.h      Wed May 09 15:16:24 2001 +0000
+++ b/sys/arch/dnard/include/pcb.h      Wed May 09 15:17:45 2001 +0000
@@ -1,79 +1,3 @@
-/*     $NetBSD: pcb.h,v 1.1 2001/03/04 05:55:43 matt Exp $     */
-
-/*
- * Copyright (c) 1994 Mark Brinicombe.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the RiscBSD team.
- * 4. The name "RiscBSD" nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY RISCBSD ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL RISCBSD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef        _ARM32_PCB_H_
-#define        _ARM32_PCB_H_
-
-#include <machine/pte.h>
-#include <machine/fp.h>
+/*     $NetBSD: pcb.h,v 1.2 2001/05/09 15:17:45 matt Exp $     */
 
-struct pcb {
-       pd_entry_t      *pcb_pagedir;           /* PT hooks */
-       u_int   pcb_flags;                      /* Flags */
-       u_int   pcb_spsr;
-       u_int   pcb_r0;                         /* Space for register dump */
-       u_int   pcb_r1;
-       u_int   pcb_r2;
-       u_int   pcb_r3;
-       u_int   pcb_r4;
-       u_int   pcb_r5;
-       u_int   pcb_r6;
-       u_int   pcb_r7;
-       u_int   pcb_r8;                         /* used */
-       u_int   pcb_r9;                         /* used */
-       u_int   pcb_r10;                        /* used */
-       u_int   pcb_r11;                        /* used */
-       u_int   pcb_r12;                        /* used */
-       u_int   pcb_sp;                         /* used */
-       u_int   pcb_lr;
-       u_int   pcb_pc;
-       u_int   pcb_und_sp;
-       caddr_t pcb_onfault;                    /* On fault handler */
-       struct  fpe_sp_state pcb_fpstate;       /* Floating Point state */
-};
-
-/*
- * No additional data for core dumps.
- */
-struct md_coredump {
-       int     md_empty;
-};
-
-#ifdef _KERNEL
-extern struct pcb *curpcb;
-#endif /* _KERNEL */
-
-#endif /* _ARM32_PCB_H_ */
-
-/* End of pcb.h */
+#include <arm/arm32/pcb.h>