diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-08-26 17:45:50 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-08-26 17:45:50 +0000 |
| commit | 3d30f4e815a41fdf2d4a9bf37223281f5f8a06dc (patch) | |
| tree | ed379aa8cc0bbd5a36d24df5a7937cb60287e83c | |
| parent | 6144a8363cf4ced1145ae059466fbf6c8562c6d5 (diff) | |
| download | gcc-3d30f4e815a41fdf2d4a9bf37223281f5f8a06dc.zip gcc-3d30f4e815a41fdf2d4a9bf37223281f5f8a06dc.tar.gz gcc-3d30f4e815a41fdf2d4a9bf37223281f5f8a06dc.tar.bz2 | |
Remove VINSN_INSN_RTX scaffolding
gcc/
* sel-sched-ir.h (struct vinsn_def): Strengthen field "insn_rtx"
from rtx to rtx_insn *.
(VINSN_INSN_RTX): Eliminate rvalue function and...
(SET_VINSN_INSN): ...lvalue function in favor of...
(VINSN_INSN_RTX): reinstate this old macro.
* sel-sched-ir.c (vinsn_init): Eliminate use of SET_VINSN_INSN_RTX
in favor of VINSN_INSN_RTX.
(VINSN_INSN_RTX): Delete this function.
(SET_VINSN_INSN_RTX): Likewise.
/
* rtx-classes-status.txt (TODO): Remove SET_VINSN_INSN_RTX.
From-SVN: r214529
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/sel-sched-ir.c | 12 | ||||
| -rw-r--r-- | gcc/sel-sched-ir.h | 5 | ||||
| -rw-r--r-- | rtx-classes-status.txt | 1 |
5 files changed, 20 insertions, 15 deletions
@@ -1,5 +1,9 @@ 2014-08-26 David Malcolm <dmalcolm@redhat.com> + * rtx-classes-status.txt (TODO): Remove SET_VINSN_INSN_RTX. + +2014-08-26 David Malcolm <dmalcolm@redhat.com> + * rtx-classes-status.txt (TODO): Remove SET_BND_TO. 2014-08-25 David Malcolm <dmalcolm@redhat.com> diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d315fac..02220a1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,18 @@ 2014-08-26 David Malcolm <dmalcolm@redhat.com> + * sel-sched-ir.h (struct vinsn_def): Strengthen field "insn_rtx" + from rtx to rtx_insn *. + (VINSN_INSN_RTX): Eliminate rvalue function and... + (SET_VINSN_INSN): ...lvalue function in favor of... + (VINSN_INSN_RTX): reinstate this old macro. + + * sel-sched-ir.c (vinsn_init): Eliminate use of SET_VINSN_INSN_RTX + in favor of VINSN_INSN_RTX. + (VINSN_INSN_RTX): Delete this function. + (SET_VINSN_INSN_RTX): Likewise. + +2014-08-26 David Malcolm <dmalcolm@redhat.com> + * sel-sched-ir.h (insn_t): Strengthen from rtx to rtx_insn *. (BND_TO): Delete this function and... (SET_BND_TO): ...this functions in favor of... diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 8d69916..3cc51cb 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -1182,7 +1182,7 @@ vinsn_init (vinsn_t vi, insn_t insn, bool force_unique_p) hash_rtx_callback_function hrcf; int insn_class; - SET_VINSN_INSN_RTX (vi) = insn; + VINSN_INSN_RTX (vi) = insn; VINSN_COUNT (vi) = 0; vi->cost = -1; @@ -6449,14 +6449,4 @@ sel_remove_loop_preheader (void) preheader_blocks); } -rtx_insn *VINSN_INSN_RTX (vinsn_t vi) -{ - return safe_as_a <rtx_insn *> (vi->insn_rtx); -} - -rtx& SET_VINSN_INSN_RTX (vinsn_t vi) -{ - return vi->insn_rtx; -} - #endif diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index 118e001..9f1fb6b 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -655,7 +655,7 @@ struct idata_def struct vinsn_def { /* Associated insn. */ - rtx insn_rtx; + rtx_insn *insn_rtx; /* Its description. */ struct idata_def id; @@ -677,8 +677,7 @@ struct vinsn_def bool may_trap_p; }; -extern rtx_insn *VINSN_INSN_RTX (vinsn_t); -extern rtx& SET_VINSN_INSN_RTX (vinsn_t); +#define VINSN_INSN_RTX(VI) ((VI)->insn_rtx) #define VINSN_PATTERN(VI) (PATTERN (VINSN_INSN_RTX (VI))) #define VINSN_ID(VI) (&((VI)->id)) diff --git a/rtx-classes-status.txt b/rtx-classes-status.txt index e44e115..3d59a8c 100644 --- a/rtx-classes-status.txt +++ b/rtx-classes-status.txt @@ -18,4 +18,3 @@ TODO: "Scaffolding" to be removed * SET_BB_HEAD, SET_BB_END, SET_BB_HEADER * SET_DEP_PRO, SET_DEP_CON * SET_NEXT_INSN, SET_PREV_INSN -* SET_VINSN_INSN_RTX |