merge armv7/thumb fixed semantics, x86 fpu added