Update several ports to at least work again without IPKDB

after the update of that.
Sorry for breaking this with my last changes :-(.
Fixes PR#9671 by Lennart Augustsson.
This commit is contained in:
ws 2000-03-24 17:05:30 +00:00
parent 725f8327fd
commit b7570cae85
16 changed files with 71 additions and 73 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: exception.S,v 1.13 1999/10/26 06:53:41 cgd Exp $ */
/* $NetBSD: exception.S,v 1.14 2000/03/24 17:05:30 ws Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@ -45,7 +45,7 @@
* Based on kate/display/abort.s
*/
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include <machine/asm.h>
#include <machine/cpu.h>
#include <machine/frame.h>
@ -227,7 +227,7 @@ do_swi_ast:
*/
ASENTRY_NP(undefined_entry)
#if NIPKDB > 0
#ifdef IPKDB
/*
* IPKDB must be hooked in at the earliest possible entry point.
*
@ -350,7 +350,7 @@ Lpull_r0r7:
str r1, [r0, #0x0004]
ldmia r0, {r0, r1, pc}
#if NIPKDB > 0
#ifdef IPKDB
Lipkdb_trap_return:
.word Lipkdb_trap_return_data
#endif
@ -374,7 +374,7 @@ ENTRY_NP(undefinedinstruction_bounce)
.data
.align 0
#if NIPKDB > 0
#ifdef IPKDB
Lipkdb_trap_return_data:
.word 0
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.33 1999/10/26 06:53:41 cgd Exp $ */
/* $NetBSD: locore.S,v 1.34 2000/03/24 17:05:30 ws Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@ -31,7 +31,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "assym.h"
#include <sys/syscall.h>
#include <sys/errno.h>
@ -235,7 +235,7 @@ ENTRY_NP(sigcode)
.global _C_LABEL(esigcode)
_C_LABEL(esigcode):
#if NIPKDB > 0
#ifdef IPKDB
#if 0
/*
* ipkdbfbyte and ipkdbsbyte are now in ipkdb_glue.c and do not tweak

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.75 2000/03/06 03:15:47 mark Exp $ */
/* $NetBSD: machdep.c,v 1.76 2000/03/24 17:05:30 ws Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -78,7 +78,7 @@
#include <machine/pte.h>
#include <machine/bootconfig.h>
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "md.h"
#include "opt_mdsize.h"

View File

@ -1,4 +1,4 @@
/* $NetBSD: ebsa285_machdep.c,v 1.10 2000/01/10 07:43:07 mark Exp $ */
/* $NetBSD: ebsa285_machdep.c,v 1.11 2000/03/24 17:05:31 ws Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@ -72,7 +72,7 @@
#include <arm32/footbridge/dc21285mem.h>
#include <arm32/footbridge/dc21285reg.h>
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "isa.h"
#if NISA > 0
@ -95,7 +95,7 @@ u_int dc21285_fclk = FCLK;
/* Define various stack sizes in pages */
#define IRQ_STACK_SIZE 1
#define ABT_STACK_SIZE 1
#if NIPKDB > 0
#ifdef IPKDB
#define UND_STACK_SIZE 2
#else
#define UND_STACK_SIZE 1
@ -734,7 +734,7 @@ initarm(bootinfo)
irq_init();
printf("done.\n");
#if NIPKDB > 0
#ifdef IPKDB
/* Initialise ipkdb */
ipkdb_init();
if (boothowto & RB_KDB)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ofwgencfg_machdep.c,v 1.10 1999/01/03 02:23:28 mark Exp $ */
/* $NetBSD: ofwgencfg_machdep.c,v 1.11 2000/03/24 17:05:31 ws Exp $ */
/*
* Copyright 1997
@ -63,7 +63,7 @@
#include <machine/pte.h>
#include <machine/undefined.h>
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include <dev/ofw/openfirm.h>
#include <machine/ofw.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: rc7500_machdep.c,v 1.26 2000/03/13 23:52:27 soren Exp $ */
/* $NetBSD: rc7500_machdep.c,v 1.27 2000/03/24 17:05:31 ws Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -79,7 +79,7 @@
#include <machine/rtc.h>
#include <arm32/iomd/iomdreg.h>
#include "ipkdb.h"
#include "opt_ipkdb.h"
#ifdef RC7500
#include <arm32/rc7500/rc7500_prom.h>
@ -97,7 +97,7 @@ u_int cpu_reset_address = 0;
#define FIQ_STACK_SIZE 1
#define IRQ_STACK_SIZE 1
#define ABT_STACK_SIZE 1
#if NIPKDB > 0
#ifdef IPKDB
#define UND_STACK_SIZE 2
#else
#define UND_STACK_SIZE 1
@ -920,7 +920,7 @@ initarm(prom_id)
irq_init();
printf("done.\n");
#if NIPKDB > 0
#ifdef IPKDB
/* Initialise ipkdb */
ipkdb_init();
if (boothowto & RB_KDB)

View File

@ -1,4 +1,4 @@
/* $NetBSD: rpc_machdep.c,v 1.32 2000/03/13 23:52:27 soren Exp $ */
/* $NetBSD: rpc_machdep.c,v 1.33 2000/03/24 17:05:32 ws Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -80,7 +80,7 @@
#include <machine/rtc.h>
#include <arm32/iomd/iomdreg.h>
#include "ipkdb.h"
#include "opt_ipkdb.h"
#ifdef HYDRA
#include "hydrabus.h"
#endif /* HYDRA */
@ -96,7 +96,7 @@ u_int cpu_reset_address = 0;
/* Define various stack sizes in pages */
#define IRQ_STACK_SIZE 1
#define ABT_STACK_SIZE 1
#if NIPKDB > 0
#ifdef IPKDB
#define UND_STACK_SIZE 2
#else
#define UND_STACK_SIZE 1
@ -1130,7 +1130,7 @@ initarm(bootconf)
rpc_sa110_cc_setup();
#endif /* CPU_SA110 */
#if NIPKDB > 0
#ifdef IPKDB
/* Initialise ipkdb */
ipkdb_init();
if (boothowto & RB_KDB)

View File

@ -1,4 +1,4 @@
/* $NetBSD: shark_machdep.c,v 1.14 1999/03/19 05:13:17 cgd Exp $ */
/* $NetBSD: shark_machdep.c,v 1.15 2000/03/24 17:05:32 ws Exp $ */
/*
* Copyright 1997
@ -65,7 +65,7 @@
#include <machine/pte.h>
#include <machine/undefined.h>
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include <dev/ofw/openfirm.h>
#include <machine/ofw.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.13 2000/01/19 03:28:23 danw Exp $ */
/* $NetBSD: locore.s,v 1.14 2000/03/24 17:05:32 ws Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@ -34,7 +34,7 @@
#include "opt_ddb.h"
#include "fs_kernfs.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "assym.h"
#include <sys/syscall.h>
@ -761,7 +761,7 @@ _C_LABEL(ddblow):
_C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
#define ipkdbsave 0xde0 /* primary save area for IPKDB */
/*
* In case of IPKDB we want a separate trap catcher for it
@ -780,7 +780,7 @@ _C_LABEL(ipkdblow):
addi 1,1,ipkdbstk+INTSTK@l
bla ipkdbtrap
_C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* FRAME_SETUP assumes:
@ -1189,7 +1189,7 @@ ddbleave:
rfi
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
/*
* Deliberate entry to ipkdbtrap
*/
@ -1299,7 +1299,7 @@ _C_LABEL(ipkdbsbyte):
sync
icbi 0,9 /* and instruction caches */
blr
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* int setfault()

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.49 2000/02/21 20:38:47 erh Exp $ */
/* $NetBSD: machdep.c,v 1.50 2000/03/24 17:05:32 ws Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -37,7 +37,7 @@
#include "opt_ccitt.h"
#include "opt_iso.h"
#include "opt_ns.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/buf.h>
@ -155,7 +155,7 @@ initppc(startkernel, endkernel, args, btinfo)
extern ddblow, ddbsize;
extern void *startsym, *endsym;
#endif
#if NIPKDB > 0
#ifdef IPKDB
extern ipkdblow, ipkdbsize;
#endif
extern void consinit __P((void));
@ -305,7 +305,7 @@ initppc(startkernel, endkernel, args, btinfo)
case EXC_DSMISS:
bcopy(&tlbdsmiss, (void *)EXC_DSMISS, (size_t)&tlbdsmsize);
break;
#if defined(DDB) || NIPKDB > 0
#if defined(DDB) || defined(IPKDB)
case EXC_PGM:
case EXC_TRC:
case EXC_BPT:
@ -315,7 +315,7 @@ initppc(startkernel, endkernel, args, btinfo)
bcopy(&ipkdblow, (void *)exc, (size_t)&ipkdbsize);
#endif
break;
#endif /* DDB || NIPKDB > 0 */
#endif /* DDB || IPKDB */
}
__syncicache((void *)EXC_RST, EXC_LAST - EXC_RST + 0x100);
@ -344,7 +344,7 @@ initppc(startkernel, endkernel, args, btinfo)
#ifdef DDB
ddb_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
#endif
#if NIPKDB > 0
#ifdef IPKDB
/*
* Now trap to IPKDB
*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.20 2000/02/08 12:49:07 tsubai Exp $ */
/* $NetBSD: locore.S,v 1.21 2000/03/24 17:05:32 ws Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include "opt_ddb.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "assym.h"
#include <sys/syscall.h>
@ -913,7 +913,7 @@ _C_LABEL(ddblow):
_C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
#define ipkdbsave 0xde0 /* primary save area for IPKDB */
/*
* In case of IPKDB we want a separate trap catcher for it
@ -932,7 +932,7 @@ _C_LABEL(ipkdblow):
addi 1,1,ipkdbstk+INTSTK@l
bla ipkdbtrap
_C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* FRAME_SETUP assumes:
@ -1341,7 +1341,7 @@ ddbleave:
rfi
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
/*
* Deliberate entry to ipkdbtrap
*/
@ -1451,7 +1451,7 @@ _C_LABEL(ipkdbsbyte):
sync
icbi 0,9 /* and instruction caches */
blr
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* int setfault()

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.70 2000/03/09 18:59:27 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.71 2000/03/24 17:05:33 ws Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -40,7 +40,7 @@
#include "opt_ns.h"
#include "opt_natm.h"
#include "adb.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/buf.h>
@ -143,7 +143,7 @@ initppc(startkernel, endkernel, args)
#ifdef DDB
extern ddblow, ddbsize;
#endif
#if NIPKDB > 0
#ifdef IPKDB
extern ipkdblow, ipkdbsize;
#endif
extern void consinit __P((void));
@ -253,7 +253,7 @@ initppc(startkernel, endkernel, args)
case EXC_DSMISS:
bcopy(&tlbdsmiss, (void *)EXC_DSMISS, (size_t)&tlbdsmsize);
break;
#if defined(DDB) || NIPKDB > 0
#if defined(DDB) || defined(IPKDB)
case EXC_PGM:
case EXC_TRC:
case EXC_BPT:
@ -263,7 +263,7 @@ initppc(startkernel, endkernel, args)
bcopy(&ipkdblow, (void *)exc, (size_t)&ipkdbsize);
#endif
break;
#endif /* DDB || NIPKDB > 0 */
#endif /* DDB || IPKDB */
}
/*
@ -314,7 +314,7 @@ initppc(startkernel, endkernel, args)
#ifdef DDB
ddb_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
#endif
#if NIPKDB > 0
#ifdef IPKDB
/*
* Now trap to IPKDB
*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.14 2000/01/19 03:28:23 danw Exp $ */
/* $NetBSD: locore.S,v 1.15 2000/03/24 17:05:33 ws Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include "opt_ddb.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "assym.h"
#include <sys/syscall.h>
@ -823,7 +823,7 @@ _C_LABEL(ddblow):
_C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
#define ipkdbsave 0xde0 /* primary save area for IPKDB */
/*
* In case of IPKDB we want a separate trap catcher for it
@ -842,7 +842,7 @@ _C_LABEL(ipkdblow):
addi 1,1,ipkdbstk+INTSTK@l
bla ipkdbtrap
_C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* FRAME_SETUP assumes:
@ -1254,7 +1254,7 @@ ddbleave:
rfi
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
/*
* Deliberate entry to ipkdbtrap
*/
@ -1364,7 +1364,7 @@ _C_LABEL(ipkdbsbyte):
sync
icbi 0,9 /* and instruction caches */
blr
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* int setfault()

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.52 2000/02/21 20:38:50 erh Exp $ */
/* $NetBSD: machdep.c,v 1.53 2000/03/24 17:05:33 ws Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -37,7 +37,7 @@
#include "opt_ccitt.h"
#include "opt_iso.h"
#include "opt_ns.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include <sys/param.h>
#include <sys/buf.h>
@ -133,7 +133,7 @@ initppc(startkernel, endkernel, args)
extern ddblow, ddbsize;
extern void *startsym, *endsym;
#endif
#if NIPKDB > 0
#ifdef IPKDB
extern ipkdblow, ipkdbsize;
#endif
extern void consinit __P((void));
@ -223,7 +223,7 @@ initppc(startkernel, endkernel, args)
case EXC_DSMISS:
bcopy(&tlbdsmiss, (void *)EXC_DSMISS, (size_t)&tlbdsmsize);
break;
#if defined(DDB) || NIPKDB > 0
#if defined(DDB) || defined(IPKDB)
case EXC_PGM:
case EXC_TRC:
case EXC_BPT:
@ -233,7 +233,7 @@ initppc(startkernel, endkernel, args)
bcopy(&ipkdblow, (void *)exc, (size_t)&ipkdbsize);
#endif
break;
#endif /* DDB || NIPKDB > 0 */
#endif /* DDB || IPKDB */
}
__syncicache((void *)EXC_RST, EXC_LAST - EXC_RST + 0x100);
@ -269,7 +269,7 @@ initppc(startkernel, endkernel, args)
#ifdef DDB
/* ddb_init((int)(endsym - startsym), startsym, endsym); */
#endif
#if NIPKDB > 0
#ifdef IPKDB
/*
* Now trap to IPKDB
*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.1 2000/02/29 15:21:46 nonaka Exp $ */
/* $NetBSD: locore.s,v 1.2 2000/03/24 17:05:33 ws Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@ -34,7 +34,7 @@
#include "opt_ddb.h"
#include "fs_kernfs.h"
#include "ipkdb.h"
#include "opt_ipkdb.h"
#include "assym.h"
#include <sys/syscall.h>
@ -768,7 +768,7 @@ _C_LABEL(ddblow):
_C_LABEL(ddbsize) = .-_C_LABEL(ddblow)
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
#define ipkdbsave 0xde0 /* primary save area for IPKDB */
/*
* In case of IPKDB we want a separate trap catcher for it
@ -787,7 +787,7 @@ _C_LABEL(ipkdblow):
addi 1,1,ipkdbstk+INTSTK@l
bla ipkdbtrap
_C_LABEL(ipkdbsize) = .-_C_LABEL(ipkdblow)
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* FRAME_SETUP assumes:
@ -1196,7 +1196,7 @@ ddbleave:
rfi
#endif /* DDB */
#if NIPKDB > 0
#ifdef IPKDB
/*
* Deliberate entry to ipkdbtrap
*/
@ -1306,7 +1306,7 @@ _C_LABEL(ipkdbsbyte):
sync
icbi 0,9 /* and instruction caches */
blr
#endif /* NIPKDB > 0 */
#endif /* IPKDB */
/*
* int setfault()

View File

@ -1,4 +1,4 @@
# $NetBSD: files.ofw,v 1.9 1998/07/22 22:04:14 thorpej Exp $
# $NetBSD: files.ofw,v 1.10 2000/03/24 17:05:34 ws Exp $
#
# First cut on Openfirmware interface
#
@ -16,11 +16,9 @@ attach ofdisk at ofbus
file dev/ofw/ofdisk.c ofdisk needs-flag
# Generic net support
define ipkdbofn { [ disable = 0 ] }
device ofnet: ether, ifnet, ipkdbofn, arp
device ofnet: ether, ifnet, arp
attach ofnet at ofbus
file dev/ofw/ofnet.c ofnet | ipkdb_ofn needs-flag
attach ipkdbif at ipkdbofn with ipkdb_ofn
file dev/ofw/ofnet.c ofnet needs-flag
# Generic console support
device ofcons: tty