mstatus.{FS, VS} should be mirrored into xpistatus to assist context saving.
Additionally, the push instruction should set both VS and FS to 0 after saving the context, to ensure an ISR using the FPU or vector unit without saving the context prior (and setting these flags to clean) will cause an illegal instruction exception.
No modification needed for pop instruction.