Re: [trans-mem] rms-tm bug report

[Patrick Marlier <patrick dot marlier at unine dot ch>]

> +/* TM vector builtins.  */
> +static const struct builtin_description bdesc_tm[] =
> +{
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_WM64", BUILT_IN_TM_STORE_M64, UNKNOWN, VOID_FTYPE_PV2SI_V2SI },
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_WaRM64", BUILT_IN_TM_STORE_WAR_M64, UNKNOWN, VOID_FTYPE_PV2SI_V2SI },
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_WaWM64", BUILT_IN_TM_STORE_WAW_M64, UNKNOWN, VOID_FTYPE_PV2SI_V2SI },
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_RM64", BUILT_IN_TM_LOAD_M64, UNKNOWN, V2SI_FTYPE_PCV2SI },
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_RaRM64", BUILT_IN_TM_LOAD_RAR_M64, UNKNOWN, V2SI_FTYPE_PCV2SI },
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_RaWM64", BUILT_IN_TM_LOAD_RAW_M64, UNKNOWN, V2SI_FTYPE_PCV2SI },
> +  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_RfWM64", BUILT_IN_TM_LOAD_RFW_M64, UNKNOWN, V2SI_FTYPE_PCV2SI },
> +
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_WM128", BUILT_IN_TM_STORE_M128, UNKNOWN, VOID_FTYPE_PV4SF_V4SF },
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_WaRM128", BUILT_IN_TM_STORE_WAR_M128, UNKNOWN, VOID_FTYPE_PV4SF_V4SF },
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_WaWM128", BUILT_IN_TM_STORE_WAW_M128, UNKNOWN, VOID_FTYPE_PV4SF_V4SF },
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_RM128", BUILT_IN_TM_LOAD_M128, UNKNOWN, V4SF_FTYPE_PCV4SF },
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_RaRM128", BUILT_IN_TM_LOAD_RAR_M128, UNKNOWN, V4SF_FTYPE_PCV4SF },
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_RaWM128", BUILT_IN_TM_LOAD_RAW_M128, UNKNOWN, V4SF_FTYPE_PCV4SF },
> +  { OPTION_MASK_ISA_SSE, 0, "__builtin__ITM_RfWM128", BUILT_IN_TM_LOAD_RFW_M128, UNKNOWN, V4SF_FTYPE_PCV4SF },
> +
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_WM256", BUILT_IN_TM_STORE_M256, UNKNOWN, VOID_FTYPE_PV8SF_V8SF },
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_WaRM256", BUILT_IN_TM_STORE_WAR_M256, UNKNOWN, VOID_FTYPE_PV8SF_V8SF },
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_WaWM256", BUILT_IN_TM_STORE_WAW_M256, UNKNOWN, VOID_FTYPE_PV8SF_V8SF },
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_RM256", BUILT_IN_TM_LOAD_M256, UNKNOWN, V8SF_FTYPE_PCV8SF },
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_RaRM256", BUILT_IN_TM_LOAD_RAR_M256, UNKNOWN, V8SF_FTYPE_PCV8SF },
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_RaWM256", BUILT_IN_TM_LOAD_RAW_M256, UNKNOWN, V8SF_FTYPE_PCV8SF },
> +  { OPTION_MASK_ISA_AVX, 0, "__builtin__ITM_RfWM256", BUILT_IN_TM_LOAD_RFW_M256, UNKNOWN, V8SF_FTYPE_PCV8SF },
> +};

I had "error: enum conversion in initialization is invalid in C++".

I corrected this by adding a explicit cast (enum ix86_builtins). I don't 
know if BUILT_IN_TM_STORE_M64 must be define in the enum ix86_builtins 
definition.

example:
  { OPTION_MASK_ISA_MMX, 0, "__builtin__ITM_WM64", (enum 
ix86_builtins)BUILT_IN_TM_STORE_M64, UNKNOWN, VOID_FTYPE_PV2SI_V2SI },


Another error was "error: ISO C90 forbids mixed declarations and code"

> +      if ((d->mask&  ix86_isa_flags) != 0
> +         || (lang_hooks.builtin_function
> +             == lang_hooks.builtin_function_ext_scope))
> +       {
> +         ftype = (enum ix86_builtin_func_type) d->flag;
> +         tree type = ix86_get_builtin_func_type (ftype);
> +         tree attrs, attrs_type;
> +
> +         if (BUILTIN_TM_LOAD_P ((enum built_in_function) d->code))
> +           {
> +             attrs = attrs_load;
> +             attrs_type = attrs_type_load;
> +           }

Should be changed to
+         tree attrs, attrs_type, type;
+         ftype = (enum ix86_builtin_func_type) d->flag;
+         type = ix86_get_builtin_func_type (ftype);

Patrick.