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
This commit is contained in:
David Malcolm 2014-08-26 17:45:50 +00:00 committed by David Malcolm
parent 6144a8363c
commit 3d30f4e815
5 changed files with 20 additions and 15 deletions

View File

@ -1,3 +1,7 @@
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.

View File

@ -1,3 +1,16 @@
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 *.

View File

@ -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

View File

@ -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))

View File

@ -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