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

userret() if the user process will be killed. 

Now the NetBSD/sh3 works very stable!
This commit is contained in:
msaitoh 2000-01-03 02:55:25 +00:00
parent b0b4797dfb
commit 518cfb0bde
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/arch/sh3/sh3/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.4 1999/12/05 11:56:35 ragge Exp $ */ /* $NetBSD: trap.c,v 1.5 2000/01/03 02:55:25 msaitoh Exp $ */
/*- /*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -603,6 +603,8 @@ tlb_handler(p1, p2, p3, p4, frame)
struct vmspace *vm; struct vmspace *vm;
vm_map_t map; vm_map_t map;
int rv; int rv;
u_quad_t sticks = 0;
int type = 0;
vm_prot_t ftype; vm_prot_t ftype;
extern vm_map_t kernel_map; extern vm_map_t kernel_map;
unsigned nss; unsigned nss;
@ -610,6 +612,8 @@ tlb_handler(p1, p2, p3, p4, frame)
unsigned long pteh_save; unsigned long pteh_save;
int exptype; int exptype;
uvmexp.traps++;
va = (vaddr_t)SHREG_TEA; va = (vaddr_t)SHREG_TEA;
va = trunc_page(va); va = trunc_page(va);
pde_index = pdei(va); pde_index = pdei(va);
@ -646,7 +650,20 @@ tlb_handler(p1, p2, p3, p4, frame)
if (p == NULL) { if (p == NULL) {
rv = KERN_FAILURE; rv = KERN_FAILURE;
goto nogo; goto nogo;
} else {
#if 1
if (!KERNELMODE(frame.tf_r15)) {
#else
if (!KERNELMODE(frame.tf_spc, frame.tf_ssr)) {
#endif
type = T_USER;
sticks = p->p_sticks;
p->p_md.md_regs = &frame;
}
else
sticks = 0;
} }
vm = p->p_vmspace; vm = p->p_vmspace;
/* /*
* It is only a kernel address space fault iff: * It is only a kernel address space fault iff:
@ -727,4 +744,10 @@ tlb_handler(p1, p2, p3, p4, frame)
trapsignal(p, SIGKILL, T_TLBINVALIDR); trapsignal(p, SIGKILL, T_TLBINVALIDR);
} else } else
trapsignal(p, SIGSEGV, T_TLBINVALIDR); trapsignal(p, SIGSEGV, T_TLBINVALIDR);
if ((type & T_USER) == 0)
return;
if (p != NULL)
userret(p, frame.tf_spc, sticks);
} }