diff options
| author | Bernd Schmidt <bernds@codesourcery.com> | 2010-07-27 21:52:39 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2010-07-27 21:52:39 +0000 |
| commit | 418e920fc6c08a3f9b20a6996980c7380cbac67c (patch) | |
| tree | c3ffb1e215f4907529c744c4900ca89040e35856 /gcc/rtl.h | |
| parent | 5f20c6574d02381a0d928beda3eff69dc00af1cb (diff) | |
| download | gcc-418e920fc6c08a3f9b20a6996980c7380cbac67c.zip gcc-418e920fc6c08a3f9b20a6996980c7380cbac67c.tar.gz gcc-418e920fc6c08a3f9b20a6996980c7380cbac67c.tar.bz2 | |
rtl.def (DEBUG_INSN, [...]): Swap operands 4 and 5.
* rtl.def (DEBUG_INSN, INSN, JUMP_INSN, CALL_INSN, NOTE): Swap operands
4 and 5.
* rtl.h (PATTERN, INSN_LOCATOR, NOTE_DATA, NOTE_DELETED_LABEL_NAME,
NOTE_BLOCK, NOTE_EH_HANDLER, NOTE_BASIC_BLOCK, NOTE_VAR_LOCATION,
NOTE_KIND, LABEL_NUSES, LABEL_REFS): Adjust accordingly.
* gengtype.c (adjust_field_rtx_def): Swap operands 4 and 5 of
CODE_LABELs and NOTEs.
* caller-save.c (init_caller_save): Fix up gen_rtx_INSN call.
* combine.c (try_combine): Likewise.
* ira.c (setup_prohibited_mode_move_regs): Likewise.
* print-rtl.c (print_rtx): Start REG_NOTES on a new line.
From-SVN: r162602
Diffstat (limited to 'gcc/rtl.h')
| -rw-r--r-- | gcc/rtl.h | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -757,15 +757,17 @@ extern void rtl_check_failed_flag (const char *, const_rtx, const char *, #define NEXT_INSN(INSN) XEXP (INSN, 2) #define BLOCK_FOR_INSN(INSN) XBBDEF (INSN, 3) -#define INSN_LOCATOR(INSN) XINT (INSN, 4) + +/* The body of an insn. */ +#define PATTERN(INSN) XEXP (INSN, 4) + +#define INSN_LOCATOR(INSN) XINT (INSN, 5) /* LOCATION of an RTX if relevant. */ #define RTL_LOCATION(X) (INSN_P (X) ? \ locator_location (INSN_LOCATOR (X)) \ : UNKNOWN_LOCATION) /* LOCATION of current INSN. */ #define CURR_INSN_LOCATION (locator_location (curr_insn_locator ())) -/* The body of an insn. */ -#define PATTERN(INSN) XEXP (INSN, 5) /* Code number of instruction, from when it was recognized. -1 means this instruction has not been recognized yet. */ @@ -869,17 +871,17 @@ extern const char * const reg_note_name[]; */ /* Opaque data. */ -#define NOTE_DATA(INSN) RTL_CHECKC1 (INSN, 4, NOTE) -#define NOTE_DELETED_LABEL_NAME(INSN) XCSTR (INSN, 4, NOTE) +#define NOTE_DATA(INSN) RTL_CHECKC1 (INSN, 5, NOTE) +#define NOTE_DELETED_LABEL_NAME(INSN) XCSTR (INSN, 5, NOTE) #define SET_INSN_DELETED(INSN) set_insn_deleted (INSN); -#define NOTE_BLOCK(INSN) XCTREE (INSN, 4, NOTE) -#define NOTE_EH_HANDLER(INSN) XCINT (INSN, 4, NOTE) -#define NOTE_BASIC_BLOCK(INSN) XCBBDEF (INSN, 4, NOTE) -#define NOTE_VAR_LOCATION(INSN) XCEXP (INSN, 4, NOTE) +#define NOTE_BLOCK(INSN) XCTREE (INSN, 5, NOTE) +#define NOTE_EH_HANDLER(INSN) XCINT (INSN, 5, NOTE) +#define NOTE_BASIC_BLOCK(INSN) XCBBDEF (INSN, 5, NOTE) +#define NOTE_VAR_LOCATION(INSN) XCEXP (INSN, 5, NOTE) /* In a NOTE that is a line number, this is the line number. Other kinds of NOTEs are identified by negative numbers here. */ -#define NOTE_KIND(INSN) XCINT (INSN, 5, NOTE) +#define NOTE_KIND(INSN) XCINT (INSN, 4, NOTE) /* Nonzero if INSN is a note marking the beginning of a basic block. */ #define NOTE_INSN_BASIC_BLOCK_P(INSN) \ @@ -971,7 +973,7 @@ extern const char * const note_insn_name[NOTE_INSN_MAX]; /* In jump.c, each label contains a count of the number of LABEL_REFs that point at it, so unused labels can be deleted. */ -#define LABEL_NUSES(RTX) XCINT (RTX, 4, CODE_LABEL) +#define LABEL_NUSES(RTX) XCINT (RTX, 5, CODE_LABEL) /* Labels carry a two-bit field composed of the ->jump and ->call bits. This field indicates whether the label is an alternate @@ -1031,7 +1033,7 @@ enum label_kind /* Once basic blocks are found, each CODE_LABEL starts a chain that goes through all the LABEL_REFs that jump to that label. The chain eventually winds up at the CODE_LABEL: it is circular. */ -#define LABEL_REFS(LABEL) XCEXP (LABEL, 5, CODE_LABEL) +#define LABEL_REFS(LABEL) XCEXP (LABEL, 4, CODE_LABEL) /* For a REG rtx, REGNO extracts the register number. REGNO can only be used on RHS. Use SET_REGNO to change the value. */ |