Set the code and signal for the F00F hack fault directly instead of

changing the code in the trapframe and looping back to the top of trap
again.

Tested by:	cjc
This commit is contained in:
John Baldwin 2001-10-23 22:29:16 +00:00
parent 76792d87a8
commit a33cbf355e
2 changed files with 6 additions and 14 deletions

View File

@ -214,11 +214,6 @@ trap(frame)
}
eva = 0;
#if defined(I586_CPU) && !defined(NO_F00F_HACK)
restart:
#endif
type = frame.tf_trapno;
code = frame.tf_err;
@ -294,8 +289,9 @@ trap(frame)
* f00f hack workaround has triggered, treat
* as illegal instruction not page fault.
*/
frame.tf_trapno = T_PRIVINFLT;
goto restart;
ucode = T_PRIVINFLT;
i = SIGILL;
break;
}
#endif
if (i == -1)

View File

@ -214,11 +214,6 @@ trap(frame)
}
eva = 0;
#if defined(I586_CPU) && !defined(NO_F00F_HACK)
restart:
#endif
type = frame.tf_trapno;
code = frame.tf_err;
@ -294,8 +289,9 @@ trap(frame)
* f00f hack workaround has triggered, treat
* as illegal instruction not page fault.
*/
frame.tf_trapno = T_PRIVINFLT;
goto restart;
ucode = T_PRIVINFLT;
i = SIGILL;
break;
}
#endif
if (i == -1)