d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix selector arg to match the (missing) prototype for sdtossd().

Browse Source 
Cosmetic.

Return from trap() if trap_fatal() returns.  trap_fatal() isn't
fatal if you have ddb.  Returning from trap() is usually the right
thing to do and much better than falling through.
This commit is contained in:
bde 1994-10-30 20:25:21 +00:00
parent 97f7bdc0a7
commit 31e87228f8
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/amd64/amd64/trap.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.39 1994/10/11 22:37:14 sos Exp $
* $Id: trap.c,v 1.40 1994/10/21 01:18:38 wollman Exp $
*/
/*
@ -214,6 +214,8 @@ trap(frame)
case T_PAGEFLT: /* page fault */
i = trap_pfault(&frame, TRUE);
if (i == -1)
return;
if (i == 0)
goto out;
@ -271,6 +273,7 @@ trap(frame)
default:
trap_fatal(&frame);
return;
}
} else {
/* kernel trap */
@ -316,6 +319,7 @@ trap(frame)
}
trap_fatal(&frame);
return;
}
trapsignal(p, i, ucode);
@ -449,6 +453,7 @@ nogo:
return (0);
}
trap_fatal(frame);
return (-1);
}
/* kludge to pass faulting virtual address to sendsig */
@ -467,7 +472,7 @@ trap_fatal(frame)
code = frame->tf_err;
type = frame->tf_trapno;
eva = rcr2();
sdtossd(gdt + IDXSEL(frame->tf_cs & 0xffff), &softseg);
sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)].sd, &softseg);
if (type <= MAX_TRAP_MSG)
printf("\n\nFatal trap %d: %s while in %s mode\n",

9
sys/i386/i386/trap.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.39 1994/10/11 22:37:14 sos Exp $
* $Id: trap.c,v 1.40 1994/10/21 01:18:38 wollman Exp $
*/
/*
@ -214,6 +214,8 @@ trap(frame)
case T_PAGEFLT: /* page fault */
i = trap_pfault(&frame, TRUE);
if (i == -1)
return;
if (i == 0)
goto out;
@ -271,6 +273,7 @@ trap(frame)
default:
trap_fatal(&frame);
return;
}
} else {
/* kernel trap */
@ -316,6 +319,7 @@ trap(frame)
}
trap_fatal(&frame);
return;
}
trapsignal(p, i, ucode);
@ -449,6 +453,7 @@ nogo:
return (0);
}
trap_fatal(frame);
return (-1);
}
/* kludge to pass faulting virtual address to sendsig */
@ -467,7 +472,7 @@ trap_fatal(frame)
code = frame->tf_err;
type = frame->tf_trapno;
eva = rcr2();
sdtossd(gdt + IDXSEL(frame->tf_cs & 0xffff), &softseg);
sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)].sd, &softseg);
if (type <= MAX_TRAP_MSG)
printf("\n\nFatal trap %d: %s while in %s mode\n",

9
sys/kern/subr_trap.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
* $Id: trap.c,v 1.39 1994/10/11 22:37:14 sos Exp $
* $Id: trap.c,v 1.40 1994/10/21 01:18:38 wollman Exp $
*/
/*
@ -214,6 +214,8 @@ trap(frame)
case T_PAGEFLT: /* page fault */
i = trap_pfault(&frame, TRUE);
if (i == -1)
return;
if (i == 0)
goto out;
@ -271,6 +273,7 @@ trap(frame)
default:
trap_fatal(&frame);
return;
}
} else {
/* kernel trap */
@ -316,6 +319,7 @@ trap(frame)
}
trap_fatal(&frame);
return;
}
trapsignal(p, i, ucode);
@ -449,6 +453,7 @@ nogo:
return (0);
}
trap_fatal(frame);
return (-1);
}
/* kludge to pass faulting virtual address to sendsig */
@ -467,7 +472,7 @@ trap_fatal(frame)
code = frame->tf_err;
type = frame->tf_trapno;
eva = rcr2();
sdtossd(gdt + IDXSEL(frame->tf_cs & 0xffff), &softseg);
sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)].sd, &softseg);
if (type <= MAX_TRAP_MSG)
printf("\n\nFatal trap %d: %s while in %s mode\n",