- Clean up the comments slightly here to make them more readable.

- Set the type and trapframe number for the F00F workaround since type
  can be used later by sv_transtrap().  Debuggers might also want to look
  at the type in the trapframe.

Submitted by:	bde (mostly)

1 files changed, 7 insertions, 3 deletions

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index c08fc58..fd4c8fe 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -286,10 +286,14 @@ trap(frame)
 #if defined(I586_CPU) && !defined(NO_F00F_HACK)
 			if (i == -2) {
 				/*
-				 * f00f hack workaround has triggered, treat
-				 * as illegal instruction not page fault.
+				 * The f00f hack workaround has triggered, so
+				 * treat the fault as an illegal instruction 
+				 * (T_PRIVINFLT) instead of a page fault.
 				 */
-				ucode = T_PRIVINFLT;
+				type = frame.tf_trapno = T_PRIVINFLT;
+
+				/* Proceed as in that case. */
+				ucode = type;
 				i = SIGILL;
 				break;
 			}