Skip to content

R
riscv-gcc-1
Commit 9ce88f5e by Gabriel Dos Reis Committed by Gabriel Dos Reis
Options

rtl.h (union rtunion_def): Have all members start with the prefix "rt_". 

        * rtl.h (union rtunion_def): Have all members  start with the
        prefix "rt_".
        (XINT, XSTR, XEXP, XVEC, XMODE, XBITMAP, XTREE, XBBDEF, XTMPL,
        X0INT, X0UINT, X0STR, X0EXP, X0VEC, X0MODE, X0BITMAP, X0TREE,
        X0MEMATTR, X0BBDEF, X0REGATTR, XCINT, XCUINT, XCSTR, XCEXP,
        XCVEC, XCMODE, XCBITMAP, XCTREE, XCBBDEF, XC2EXP): Adjust
        members
        access.
        * gengtype.c (adjust_field_rtx_def): Likewise.
        * rtlanal.c (loc_mentioned_in_p): Likewise.

From-SVN: r85434
parent b1cc95ce
Showing with 81 additions and 69 deletions
gcc/ChangeLog
2004-08-02 Gabriel Dos Reis <gdr@integrable-solutions.net>
* rtl.h (union rtunion_def): Have all members start with the
prefix "rt_".
(XINT, XSTR, XEXP, XVEC, XMODE, XBITMAP, XTREE, XBBDEF, XTMPL,
X0INT, X0UINT, X0STR, X0EXP, X0VEC, X0MODE, X0BITMAP, X0TREE,
X0MEMATTR, X0BBDEF, X0REGATTR, XCINT, XCUINT, XCSTR, XCEXP,
XCVEC, XCMODE, XCBITMAP, XCTREE, XCBBDEF, XC2EXP): Adjust members
access.
* gengtype.c (adjust_field_rtx_def): Likewise.
* rtlanal.c (loc_mentioned_in_p): Likewise.
2004-08-02 Richard Sandiford <rsandifo@redhat.com> 2004-08-02 Richard Sandiford <rsandifo@redhat.com>
* config.gcc (mips*-*-elf*, mips*-*-rtems*): Add elfos.h to tm_file. * config.gcc (mips*-*-elf*, mips*-*-rtems*): Add elfos.h to tm_file.
......
gcc/gengtype.c
...@@ -449,24 +449,24 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) ...@@ -449,24 +449,24 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
number notes. */ number notes. */
case NOTE_INSN_MAX: case NOTE_INSN_MAX:
note_flds->opt->name = "default"; note_flds->opt->name = "default";
note_flds->name = "rtstr"; note_flds->name = "rt_str";
note_flds->type = &string_type; note_flds->type = &string_type;
break; break;
case NOTE_INSN_BLOCK_BEG: case NOTE_INSN_BLOCK_BEG:
case NOTE_INSN_BLOCK_END: case NOTE_INSN_BLOCK_END:
note_flds->name = "rttree"; note_flds->name = "rt_tree";
note_flds->type = tree_tp; note_flds->type = tree_tp;
break; break;
case NOTE_INSN_EXPECTED_VALUE: case NOTE_INSN_EXPECTED_VALUE:
case NOTE_INSN_VAR_LOCATION: case NOTE_INSN_VAR_LOCATION:
note_flds->name = "rtx"; note_flds->name = "rt_rtx";
note_flds->type = rtx_tp; note_flds->type = rtx_tp;
break; break;
default: default:
note_flds->name = "rtint"; note_flds->name = "rt_int";
note_flds->type = scalar_tp; note_flds->type = scalar_tp;
break; break;
} }
...@@ -497,48 +497,48 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) ...@@ -497,48 +497,48 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
case 'n': case 'n':
case 'w': case 'w':
t = scalar_tp; t = scalar_tp;
subname = "rtint"; subname = "rt_int";
break; break;
case '0': case '0':
if (i == MEM && aindex == 1) if (i == MEM && aindex == 1)
t = mem_attrs_tp, subname = "rtmem"; t = mem_attrs_tp, subname = "rt_mem";
else if (i == JUMP_INSN && aindex == 9) else if (i == JUMP_INSN && aindex == 9)
t = rtx_tp, subname = "rtx"; t = rtx_tp, subname = "rt_rtx";
else if (i == CODE_LABEL && aindex == 4) else if (i == CODE_LABEL && aindex == 4)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == CODE_LABEL && aindex == 5) else if (i == CODE_LABEL && aindex == 5)
t = rtx_tp, subname = "rtx"; t = rtx_tp, subname = "rt_rtx";
else if (i == LABEL_REF else if (i == LABEL_REF
&& (aindex == 1 || aindex == 2)) && (aindex == 1 || aindex == 2))
t = rtx_tp, subname = "rtx"; t = rtx_tp, subname = "rt_rtx";
else if (i == NOTE && aindex == 4) else if (i == NOTE && aindex == 4)
t = note_union_tp, subname = ""; t = note_union_tp, subname = "";
else if (i == NOTE && aindex >= 7) else if (i == NOTE && aindex >= 7)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == ADDR_DIFF_VEC && aindex == 4) else if (i == ADDR_DIFF_VEC && aindex == 4)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == VALUE && aindex == 0) else if (i == VALUE && aindex == 0)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == REG && aindex == 1) else if (i == REG && aindex == 1)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == REG && aindex == 2) else if (i == REG && aindex == 2)
t = reg_attrs_tp, subname = "rtreg"; t = reg_attrs_tp, subname = "rt_reg";
else if (i == SCRATCH && aindex == 0) else if (i == SCRATCH && aindex == 0)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == SYMBOL_REF && aindex == 1) else if (i == SYMBOL_REF && aindex == 1)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else if (i == SYMBOL_REF && aindex == 2) else if (i == SYMBOL_REF && aindex == 2)
t = tree_tp, subname = "rttree"; t = tree_tp, subname = "rt_tree";
else if (i == BARRIER && aindex >= 3) else if (i == BARRIER && aindex >= 3)
t = scalar_tp, subname = "rtint"; t = scalar_tp, subname = "rt_int";
else else
{ {
error_at_line (&lexer_line, error_at_line (&lexer_line,
"rtx type `%s' has `0' in position %lu, can't handle", "rtx type `%s' has `0' in position %lu, can't handle",
rtx_name[i], (unsigned long) aindex); rtx_name[i], (unsigned long) aindex);
t = &string_type; t = &string_type;
subname = "rtint"; subname = "rt_int";
} }
break; break;
...@@ -546,34 +546,34 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) ...@@ -546,34 +546,34 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
case 'S': case 'S':
case 'T': case 'T':
t = &string_type; t = &string_type;
subname = "rtstr"; subname = "rt_str";
break; break;
case 'e': case 'e':
case 'u': case 'u':
t = rtx_tp; t = rtx_tp;
subname = "rtx"; subname = "rt_rtx";
break; break;
case 'E': case 'E':
case 'V': case 'V':
t = rtvec_tp; t = rtvec_tp;
subname = "rtvec"; subname = "rt_rtvec";
break; break;
case 't': case 't':
t = tree_tp; t = tree_tp;
subname = "rttree"; subname = "rt_tree";
break; break;
case 'b': case 'b':
t = bitmap_tp; t = bitmap_tp;
subname = "rtbit"; subname = "rt_bit";
break; break;
case 'B': case 'B':
t = basic_block_tp; t = basic_block_tp;
subname = "bb"; subname = "rt_bb";
break; break;
default: default:
...@@ -582,7 +582,7 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) ...@@ -582,7 +582,7 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
rtx_name[i], rtx_format[i][aindex], rtx_name[i], rtx_format[i][aindex],
(unsigned long)aindex); (unsigned long)aindex);
t = &string_type; t = &string_type;
subname = "rtint"; subname = "rt_int";
break; break;
} }
......
gcc/rtl.h
...@@ -161,19 +161,19 @@ typedef struct reg_attrs GTY(()) ...@@ -161,19 +161,19 @@ typedef struct reg_attrs GTY(())
union rtunion_def union rtunion_def
{ {
int rtint; int rt_int;
unsigned int rtuint; unsigned int rt_uint;
const char *rtstr; const char *rt_str;
rtx rtx; rtx rt_rtx;
rtvec rtvec; rtvec rt_rtvec;
enum machine_mode rttype; enum machine_mode rt_type;
addr_diff_vec_flags rt_addr_diff_vec_flags; addr_diff_vec_flags rt_addr_diff_vec_flags;
struct cselib_val_struct *rt_cselib; struct cselib_val_struct *rt_cselib;
struct bitmap_head_def *rtbit; struct bitmap_head_def *rt_bit;
tree rttree; tree rt_tree;
struct basic_block_def *bb; struct basic_block_def *rt_bb;
mem_attrs *rtmem; mem_attrs *rt_mem;
reg_attrs *rtreg; reg_attrs *rt_reg;
}; };
typedef union rtunion_def rtunion; typedef union rtunion_def rtunion;
...@@ -602,15 +602,15 @@ do { \ ...@@ -602,15 +602,15 @@ do { \
_rtx->return_val = 0; \ _rtx->return_val = 0; \
} while (0) } while (0)
#define XINT(RTX, N) (RTL_CHECK2 (RTX, N, 'i', 'n').rtint) #define XINT(RTX, N) (RTL_CHECK2 (RTX, N, 'i', 'n').rt_int)
#define XSTR(RTX, N) (RTL_CHECK2 (RTX, N, 's', 'S').rtstr) #define XSTR(RTX, N) (RTL_CHECK2 (RTX, N, 's', 'S').rt_str)
#define XEXP(RTX, N) (RTL_CHECK2 (RTX, N, 'e', 'u').rtx) #define XEXP(RTX, N) (RTL_CHECK2 (RTX, N, 'e', 'u').rt_rtx)
#define XVEC(RTX, N) (RTL_CHECK2 (RTX, N, 'E', 'V').rtvec) #define XVEC(RTX, N) (RTL_CHECK2 (RTX, N, 'E', 'V').rt_rtvec)
#define XMODE(RTX, N) (RTL_CHECK1 (RTX, N, 'M').rttype) #define XMODE(RTX, N) (RTL_CHECK1 (RTX, N, 'M').rt_type)
#define XBITMAP(RTX, N) (RTL_CHECK1 (RTX, N, 'b').rtbit) #define XBITMAP(RTX, N) (RTL_CHECK1 (RTX, N, 'b').rt_bit)
#define XTREE(RTX, N) (RTL_CHECK1 (RTX, N, 't').rttree) #define XTREE(RTX, N) (RTL_CHECK1 (RTX, N, 't').rt_tree)
#define XBBDEF(RTX, N) (RTL_CHECK1 (RTX, N, 'B').bb) #define XBBDEF(RTX, N) (RTL_CHECK1 (RTX, N, 'B').rt_bb)
#define XTMPL(RTX, N) (RTL_CHECK1 (RTX, N, 'T').rtstr) #define XTMPL(RTX, N) (RTL_CHECK1 (RTX, N, 'T').rt_str)
#define XVECEXP(RTX, N, M) RTVEC_ELT (XVEC (RTX, N), M) #define XVECEXP(RTX, N, M) RTVEC_ELT (XVEC (RTX, N), M)
#define XVECLEN(RTX, N) GET_NUM_ELEM (XVEC (RTX, N)) #define XVECLEN(RTX, N) GET_NUM_ELEM (XVEC (RTX, N))
...@@ -618,39 +618,39 @@ do { \ ...@@ -618,39 +618,39 @@ do { \
/* These are like XINT, etc. except that they expect a '0' field instead /* These are like XINT, etc. except that they expect a '0' field instead
of the normal type code. */ of the normal type code. */
#define X0INT(RTX, N) (RTL_CHECK1 (RTX, N, '0').rtint) #define X0INT(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_int)
#define X0UINT(RTX, N) (RTL_CHECK1 (RTX, N, '0').rtuint) #define X0UINT(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_uint)
#define X0STR(RTX, N) (RTL_CHECK1 (RTX, N, '0').rtstr) #define X0STR(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_str)
#define X0EXP(RTX, N) (RTL_CHECK1 (RTX, N, '0').rtx) #define X0EXP(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_rtx)
#define X0VEC(RTX, N) (RTL_CHECK1 (RTX, N, '0').rtvec) #define X0VEC(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_rtvec)
#define X0MODE(RTX, N) (RTL_CHECK1 (RTX, N, '0').rttype) #define X0MODE(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_type)
#define X0BITMAP(RTX, N) (RTL_CHECK1 (RTX, N, '0').rtbit) #define X0BITMAP(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_bit)
#define X0TREE(RTX, N) (RTL_CHECK1 (RTX, N, '0').rttree) #define X0TREE(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_tree)
#define X0BBDEF(RTX, N) (RTL_CHECK1 (RTX, N, '0').bb) #define X0BBDEF(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_bb)
#define X0ADVFLAGS(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_addr_diff_vec_flags) #define X0ADVFLAGS(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_addr_diff_vec_flags)
#define X0CSELIB(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_cselib) #define X0CSELIB(RTX, N) (RTL_CHECK1 (RTX, N, '0').rt_cselib)
#define X0MEMATTR(RTX, N) (RTL_CHECKC1 (RTX, N, MEM).rtmem) #define X0MEMATTR(RTX, N) (RTL_CHECKC1 (RTX, N, MEM).rt_mem)
#define X0REGATTR(RTX, N) (RTL_CHECKC1 (RTX, N, REG).rtreg) #define X0REGATTR(RTX, N) (RTL_CHECKC1 (RTX, N, REG).rt_reg)
/* Access a '0' field with any type. */ /* Access a '0' field with any type. */
#define X0ANY(RTX, N) RTL_CHECK1 (RTX, N, '0') #define X0ANY(RTX, N) RTL_CHECK1 (RTX, N, '0')
#define XCINT(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rtint) #define XCINT(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_int)
#define XCUINT(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rtuint) #define XCUINT(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_uint)
#define XCSTR(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rtstr) #define XCSTR(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_str)
#define XCEXP(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rtx) #define XCEXP(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_rtx)
#define XCVEC(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rtvec) #define XCVEC(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_rtvec)
#define XCMODE(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rttype) #define XCMODE(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_type)
#define XCBITMAP(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rtbit) #define XCBITMAP(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_bit)
#define XCTREE(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rttree) #define XCTREE(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_tree)
#define XCBBDEF(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).bb) #define XCBBDEF(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_bb)
#define XCADVFLAGS(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_addr_diff_vec_flags) #define XCADVFLAGS(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_addr_diff_vec_flags)
#define XCCSELIB(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_cselib) #define XCCSELIB(RTX, N, C) (RTL_CHECKC1 (RTX, N, C).rt_cselib)
#define XCVECEXP(RTX, N, M, C) RTVEC_ELT (XCVEC (RTX, N, C), M) #define XCVECEXP(RTX, N, M, C) RTVEC_ELT (XCVEC (RTX, N, C), M)
#define XCVECLEN(RTX, N, C) GET_NUM_ELEM (XCVEC (RTX, N, C)) #define XCVECLEN(RTX, N, C) GET_NUM_ELEM (XCVEC (RTX, N, C))
#define XC2EXP(RTX, N, C1, C2) (RTL_CHECKC2 (RTX, N, C1, C2).rtx) #define XC2EXP(RTX, N, C1, C2) (RTL_CHECKC2 (RTX, N, C1, C2).rt_rtx)
/* ACCESS MACROS for particular fields of insns. */ /* ACCESS MACROS for particular fields of insns. */
......
gcc/rtlanal.c
...@@ -3155,7 +3155,7 @@ loc_mentioned_in_p (rtx *loc, rtx in) ...@@ -3155,7 +3155,7 @@ loc_mentioned_in_p (rtx *loc, rtx in)
for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
{ {
if (loc == &in->u.fld[i].rtx) if (loc == &in->u.fld[i].rt_rtx)
return 1; return 1;
if (fmt[i] == 'e') if (fmt[i] == 'e')
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment