ARMv7-A: tweak arch_state()