Improve architectural compliance of mfspr and mtspr