procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert various INSN accessors in rtl.h to inline functions

Browse source 
gcc/
2014-08-27  David Malcolm  <dmalcolm@redhat.com>

	* rtl.h (INSN_UID): Convert from a macro to a pair of inline
	functions.  Require merely an rtx for now, not an rtx_insn *.
	(BLOCK_FOR_INSN): Likewise.
	(INSN_LOCATION): Likewise.
	(INSN_HAS_LOCATION): Convert from a macro to an inline function.

From-SVN: r214586
This commit is contained in:
David Malcolm 2014-08-27 19:40:43 +00:00 • committed by David Malcolm
parent bd59c195f6
commit f11723d8cb
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -1,3 +1,11 @@
2014-08-27 David Malcolm <dmalcolm@redhat.com>
* rtl.h (INSN_UID): Convert from a macro to a pair of inline
functions. Require merely an rtx for now, not an rtx_insn *.
(BLOCK_FOR_INSN): Likewise.
(INSN_LOCATION): Likewise.
(INSN_HAS_LOCATION): Convert from a macro to an inline function.
2014-08-27 David Malcolm <dmalcolm@redhat.com>
* rtl.h (PATTERN): Convert this macro into a pair of inline

38
gcc/rtl.h
View file

@ -1172,8 +1172,16 @@ extern void rtl_check_failed_flag (const char *, const_rtx, const char *,
/* Holds a unique number for each insn.
These are not necessarily sequentially increasing. */
#define INSN_UID(INSN) \
(RTL_INSN_CHAIN_FLAG_CHECK ("INSN_UID", (INSN))->u2.insn_uid)
inline int INSN_UID (const_rtx insn)
{
return RTL_INSN_CHAIN_FLAG_CHECK ("INSN_UID",
(insn))->u2.insn_uid;
}
inline int& INSN_UID (rtx insn)
{
return RTL_INSN_CHAIN_FLAG_CHECK ("INSN_UID",
(insn))->u2.insn_uid;
}
/* Chain insns together in sequence. */
@ -1204,7 +1212,15 @@ inline rtx& SET_NEXT_INSN (rtx insn)
return XEXP (insn, 1);
}
#define BLOCK_FOR_INSN(INSN) XBBDEF (INSN, 2)
inline basic_block BLOCK_FOR_INSN (const_rtx insn)
{
return XBBDEF (insn, 2);
}
inline basic_block& BLOCK_FOR_INSN (rtx insn)
{
return XBBDEF (insn, 2);
}
/* The body of an insn. */
inline rtx PATTERN (const_rtx insn)
@ -1217,10 +1233,20 @@ inline rtx& PATTERN (rtx insn)
return XEXP (insn, 3);
}
#define INSN_LOCATION(INSN) XUINT (INSN, 4)
inline unsigned int INSN_LOCATION (const_rtx insn)
{
return XUINT (insn, 4);
}
#define INSN_HAS_LOCATION(INSN) ((LOCATION_LOCUS (INSN_LOCATION (INSN)))\
!= UNKNOWN_LOCATION)
inline unsigned int& INSN_LOCATION (rtx insn)
{
return XUINT (insn, 4);
}
inline bool INSN_HAS_LOCATION (const_rtx insn)
{
return LOCATION_LOCUS (INSN_LOCATION (insn)) != UNKNOWN_LOCATION;
}
/* LOCATION of an RTX if relevant. */
#define RTL_LOCATION(X) (INSN_P (X) ? \