i386 page fault clobbers error code in trap frame

I'm refering to the following two lines in sys/i386/i386/trap.c

/* kludge to pass faulting virtual address to sendsig */
frame->tf_err = eva;

Isn't there some other way to do this? Wouldn't the address still be
available in %cr2 inside sendsig? Or could there have been other page
faults by then?

The reason I'm asking this is that Wine wants to know the error code in
case of a page fault (the No eXec bit (AMD) and the read/write bit
specifically).

Attachment: pgpzJvtxZBLZQ.pgp
Description: PGP signature