Backport r3854
r3855 - fpu.sw is 16bit (jmarsh)