OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert: rtl.def (NOTE): Swap operands 4 and 5.

Browse Source 
Revert:
	* rtl.def (NOTE): Swap operands 4 and 5.
        * rtl.h (NOTE_DATA, NOTE_DELETED_LABEL_NAME, NOTE_BLOCK,
	NOTE_EH_HANDLER, NOTE_BASIC_BLOCK, NOTE_VAR_LOCATION, NOTE_KIND):
	Adjust accordingly.
        * gengtype.c (adjust_field_rtx_def): Swap operands 4 and 5 of NOTEs.

From-SVN: r162692
This commit is contained in:
Jakub Jelinek 2010-07-29 21:48:03 +02:00 committed by Jakub Jelinek
parent 8b522befbf
commit 0f953f83c2
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2010-07-29 Jakub Jelinek <jakub@redhat.com>
Revert:
* rtl.def (NOTE): Swap operands 4 and 5.
* rtl.h (NOTE_DATA, NOTE_DELETED_LABEL_NAME, NOTE_BLOCK,
NOTE_EH_HANDLER, NOTE_BASIC_BLOCK, NOTE_VAR_LOCATION, NOTE_KIND):
Adjust accordingly.
* gengtype.c (adjust_field_rtx_def): Swap operands 4 and 5 of NOTEs.
2010-07-29 Jakub Jelinek <jakub@redhat.com>
PR debug/45110

4
gcc/gengtype.c
View File

@ -1112,9 +1112,9 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
else if (i == LABEL_REF
&& (aindex == 1 || aindex == 2))
t = rtx_tp, subname = "rt_rtx";
else if (i == NOTE && aindex == 5)
t = note_union_tp, subname = "";
else if (i == NOTE && aindex == 4)
t = note_union_tp, subname = "";
else if (i == NOTE && aindex == 5)
t = scalar_tp, subname = "rt_int";
else if (i == NOTE && aindex >= 7)
t = scalar_tp, subname = "rt_int";

2
gcc/rtl.def
View File

@ -155,7 +155,7 @@ DEF_RTL_EXPR(CODE_LABEL, "code_label", "iuuB00is", RTX_EXTRA)
4: note-specific data
5: enum insn_note
6: unique number if insn_note == note_insn_deleted_label. */
DEF_RTL_EXPR(NOTE, "note", "iuuBn0i", RTX_EXTRA)
DEF_RTL_EXPR(NOTE, "note", "iuuB0ni", RTX_EXTRA)
/* ----------------------------------------------------------------------
Top level constituents of INSN, JUMP_INSN and CALL_INSN.

14
gcc/rtl.h
View File

@ -871,17 +871,17 @@ extern const char * const reg_note_name[];
*/
/* Opaque data. */
#define NOTE_DATA(INSN) RTL_CHECKC1 (INSN, 5, NOTE)
#define NOTE_DELETED_LABEL_NAME(INSN) XCSTR (INSN, 5, NOTE)
#define NOTE_DATA(INSN) RTL_CHECKC1 (INSN, 4, NOTE)
#define NOTE_DELETED_LABEL_NAME(INSN) XCSTR (INSN, 4, NOTE)
#define SET_INSN_DELETED(INSN) set_insn_deleted (INSN);
#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)
#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)
/* 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, 4, NOTE)
#define NOTE_KIND(INSN) XCINT (INSN, 5, NOTE)
/* Nonzero if INSN is a note marking the beginning of a basic block. */
#define NOTE_INSN_BASIC_BLOCK_P(INSN) \