This is a tidy-up check in which creates an enum neon_cvt_flavour, and moves all the data which depends on it into one large 'table'. This was done to make the code understandable for adding the new VCVT variants. gas/ChangeLog: 2012-08-23 Matthew Gretton-Dann * config/tc-arm.c (CVT_FLAVOUR_VAR): New define. (CVT_VAR): New helper define. (neon_cvt_flavour): New enumeration, function renamed... (get_neon_cvt_flavour): ...to this. (do_vfp_nsyn_cvt): Update to use new neon_cvt_flavour. (do_vfp_nsyn_cvtz): Likewise. (do_neon_cvt_1): Likewise.