* config/tc-arm.c (enum wreg_type): Delete. (IWMMXT_REG_WR, IWMMXT_REG_WC, IWMMXT_REG_WCG): All occurrences replaced with REG_TYPE_MMXWR, REG_TYPE_MMXWC, REG_TYPE_MMXWCG respectively. (arm_reg_parse_multi): New function. (arm_reg_parse, wreg_required_here, mav_reg_required_here) (s_arm_unwind_save): Rewrite in terms of arm_reg_parse_multi.