+2005-06-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * machmode.h (to_machine_mode): New.
+ * rtl.h (to_rtx_code): Likewise.
+ * read-rtl.c (apply_mode_macro): Convert mode to machine_mode.
+ (print_c_condition): Convert return value of htab_find().
+ (apply_code_macro): Add explicit cast when convertin to enums.
+ (apply_mode_maps): Likewise.
+ (check_code_macro): Likewise.
+ (read_rtx_1): Likewise.
+
2005-06-09 Richard Henderson <rth@redhat.com>
* config/ia64/ia64.c (update_set_flags): Just return for IF_THEN_ELSE.
static void
apply_mode_macro (rtx x, int mode)
{
- PUT_MODE (x, mode);
+ PUT_MODE (x, to_machine_mode (mode));
}
/* Implementations of the macro_group callbacks for codes. */
static void
apply_code_macro (rtx x, int code)
{
- PUT_CODE (x, code);
+ PUT_CODE (x, to_rtx_code (code));
}
/* Map a code or mode attribute string P to the underlying string for
v = map_attr_string (pm->string, macro, value);
if (v)
- PUT_MODE (x, find_mode (v->string, infile));
+ PUT_MODE (x, to_machine_mode (find_mode (v->string, infile)));
else
*unknown = pm->string;
return;
void
print_c_condition (const char *cond)
{
- const void **halves = htab_find (joined_conditions, &cond);
+ const char **halves = (const char **) htab_find (joined_conditions, &cond);
if (halves != 0)
{
printf ("(");
struct map_value *v;
enum rtx_code bellwether;
- bellwether = macro->values->number;
+ bellwether = to_rtx_code (macro->values->number);
for (v = macro->values->next; v != 0; v = v->next)
if (strcmp (GET_RTX_FORMAT (bellwether), GET_RTX_FORMAT (v->number)) != 0)
fatal_with_file_and_line (infile, "code macro `%s' combines "
check_code_macro (read_mapping (&codes, codes.macros, infile), infile);
goto again;
}
- real_code = find_macro (&codes, tmp_char, infile);
+ real_code = to_rtx_code (find_macro (&codes, tmp_char, infile));
bellwether_code = BELLWETHER_CODE (real_code);
/* If we end up with an insn expression then we free this space below. */
mode = find_macro (&modes, tmp_char, infile);
else
mode = mode_attr_index (mode_maps, tmp_char);
- PUT_MODE (return_rtx, mode);
+ PUT_MODE (return_rtx, to_machine_mode (mode));
if (GET_MODE (return_rtx) != mode)
fatal_with_file_and_line (infile, "mode too large");
}