Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a buserror handler that just tests for 'nofault' being set when the

Browse Source 
MMU is not yet initialized. This behaviour is necessary when probing
for the machine type - because we need the type before we can setup the
tables....
This commit is contained in:
leo 1997-07-30 15:37:48 +00:00
parent afc018f838
commit 89ac8e71d2
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/arch/atari/atari/atari_init.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atari_init.c,v 1.32 1997/07/05 20:50:41 leo Exp $ */
/* $NetBSD: atari_init.c,v 1.33 1997/07/30 15:37:48 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@ -209,17 +209,17 @@ char *esym_addr; /* Address of kernel '_esym' symbol */
PAGE_MASK = NBPG-1;
PAGE_SHIFT = PG_SHIFT;
/*
* Determine the type of machine we are running on. This needs
* to be done early (and before initcpu())!
*/
set_machtype();
/*
* Initialize cpu specific stuff
*/
initcpu();
/*
* Determine the type of machine we are running on. This needs
* to be done early!
*/
set_machtype();
/*
* We run the kernel from ST memory at the moment.
* The kernel segment table is put just behind the loaded image.
@ -968,6 +968,19 @@ initcpu()
}
break;
#endif /* defined(M68040) */
#if defined(M68030) || defined(M68020)
case CPU_68030:
case CPU_68020:
{
extern trapfun *vectab[256];
extern trapfun buserr2030, addrerr2030;
/* bus/addrerr vectors */
vectab[2] = buserr2030;
vectab[3] = addrerr2030;
}
break;
#endif /* defined(M68030) || defined(M68020) */
}
DCIS();

31
sys/arch/atari/atari/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.45 1997/07/09 14:32:09 leo Exp $ */
/* $NetBSD: locore.s,v 1.46 1997/07/30 15:37:49 leo Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -158,14 +158,10 @@ Lbe1stpg:
jra _ASM_LABEL(faultstkadj) | and deal with it
#endif /* defined(M68040) */
/*
* This is where the default vectors end-up!
*/
_buserr:
_addrerr:
#if !(defined(M68020) || defined(M68030))
jra _badtrap
#else
#if defined(M68020) || defined(M68030)
.globl _buserr2030, _addrerr2030
_buserr2030:
_addrerr2030:
clrl sp@- | stack adjust count
moveml #0xFFFF,sp@- | save user registers
movl usp,a0 | save the user SP
@ -256,6 +252,23 @@ LberrIsProbe:
movl #T_BUSERR,sp@- | mark bus error
jra _ASM_LABEL(faultstkadj) | and deal with it
/*
* This is where the default vectors end-up!
* At the time of the 'machine-type' probes, it seems necessary
* that the 'nofault' test is done first. Because the MMU is not
* yet setup at this point, the real fault handlers sometimes
* misinterpret the cause of the fault.
*/
_buserr:
_addrerr:
tstl _nofault | device probe?
jeq 1f | no, halt...
movl _nofault,sp@- | yes,
jbsr _longjmp | longjmp(nofault)
/* NOTREACHED */
1:
jra _badtrap | only catch probes!
/*
* FP exceptions.
*/