Skip to content

R
riscv-gcc-1
Commit 7da26277 by Trevor Saunders Committed by Trevor Saunders
Options

more rtx_insn * in recog.c 

gcc/ChangeLog:

2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* ira.c (decrease_live_ranges_number): Changetype of local
	variable to rtx_insn *.
	* recog.c: Change argument types to rtx_insn *.
	* recog.h: Adjust.

From-SVN: r222952
parent 1d415e65
Showing with 33 additions and 26 deletions
gcc/ChangeLog
2015-05-08 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> 2015-05-08 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* ira.c (decrease_live_ranges_number): Changetype of local
variable to rtx_insn *.
* recog.c: Change argument types to rtx_insn *.
* recog.h: Adjust.
2015-05-08 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* reorg.c: Change argument types to rtx_insn *. * reorg.c: Change argument types to rtx_insn *.
2015-05-08 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> 2015-05-08 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
......
gcc/ira.c
...@@ -2045,8 +2045,8 @@ decrease_live_ranges_number (void) ...@@ -2045,8 +2045,8 @@ decrease_live_ranges_number (void)
{ {
basic_block bb; basic_block bb;
rtx_insn *insn; rtx_insn *insn;
rtx set, src, dest, dest_death, q, note; rtx set, src, dest, dest_death, note;
rtx_insn *p; rtx_insn *p, *q;
int sregno, dregno; int sregno, dregno;
if (! flag_expensive_optimizations) if (! flag_expensive_optimizations)
......
gcc/recog.c
...@@ -84,9 +84,9 @@ along with GCC; see the file COPYING3. If not see ...@@ -84,9 +84,9 @@ along with GCC; see the file COPYING3. If not see
#endif #endif
#endif #endif
static void validate_replace_rtx_1 (rtx *, rtx, rtx, rtx, bool); static void validate_replace_rtx_1 (rtx *, rtx, rtx, rtx_insn *, bool);
static void validate_replace_src_1 (rtx *, void *); static void validate_replace_src_1 (rtx *, void *);
static rtx split_insn (rtx_insn *); static rtx_insn *split_insn (rtx_insn *);
struct target_recog default_target_recog; struct target_recog default_target_recog;
#if SWITCHABLE_TARGET #if SWITCHABLE_TARGET
...@@ -319,7 +319,7 @@ validate_unshare_change (rtx object, rtx *loc, rtx new_rtx, bool in_group) ...@@ -319,7 +319,7 @@ validate_unshare_change (rtx object, rtx *loc, rtx new_rtx, bool in_group)
Return true if anything was changed. */ Return true if anything was changed. */
bool bool
canonicalize_change_group (rtx insn, rtx x) canonicalize_change_group (rtx_insn *insn, rtx x)
{ {
if (COMMUTATIVE_P (x) if (COMMUTATIVE_P (x)
&& swap_commutative_operands_p (XEXP (x, 0), XEXP (x, 1))) && swap_commutative_operands_p (XEXP (x, 0), XEXP (x, 1)))
...@@ -598,7 +598,7 @@ cancel_changes (int num) ...@@ -598,7 +598,7 @@ cancel_changes (int num)
rtx. */ rtx. */
static void static void
simplify_while_replacing (rtx *loc, rtx to, rtx object, simplify_while_replacing (rtx *loc, rtx to, rtx_insn *object,
machine_mode op0_mode) machine_mode op0_mode)
{ {
rtx x = *loc; rtx x = *loc;
...@@ -758,7 +758,7 @@ simplify_while_replacing (rtx *loc, rtx to, rtx object, ...@@ -758,7 +758,7 @@ simplify_while_replacing (rtx *loc, rtx to, rtx object,
validate_change passing OBJECT. */ validate_change passing OBJECT. */
static void static void
validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx object, validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx_insn *object,
bool simplify) bool simplify)
{ {
int i, j; int i, j;
...@@ -847,7 +847,7 @@ validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx object, ...@@ -847,7 +847,7 @@ validate_replace_rtx_1 (rtx *loc, rtx from, rtx to, rtx object,
if INSN is still valid. */ if INSN is still valid. */
int int
validate_replace_rtx_subexp (rtx from, rtx to, rtx insn, rtx *loc) validate_replace_rtx_subexp (rtx from, rtx to, rtx_insn *insn, rtx *loc)
{ {
validate_replace_rtx_1 (loc, from, to, insn, true); validate_replace_rtx_1 (loc, from, to, insn, true);
return apply_change_group (); return apply_change_group ();
...@@ -857,7 +857,7 @@ validate_replace_rtx_subexp (rtx from, rtx to, rtx insn, rtx *loc) ...@@ -857,7 +857,7 @@ validate_replace_rtx_subexp (rtx from, rtx to, rtx insn, rtx *loc)
changes have been made, validate by seeing if INSN is still valid. */ changes have been made, validate by seeing if INSN is still valid. */
int int
validate_replace_rtx (rtx from, rtx to, rtx insn) validate_replace_rtx (rtx from, rtx to, rtx_insn *insn)
{ {
validate_replace_rtx_1 (&PATTERN (insn), from, to, insn, true); validate_replace_rtx_1 (&PATTERN (insn), from, to, insn, true);
return apply_change_group (); return apply_change_group ();
...@@ -870,7 +870,7 @@ validate_replace_rtx (rtx from, rtx to, rtx insn) ...@@ -870,7 +870,7 @@ validate_replace_rtx (rtx from, rtx to, rtx insn)
validate_replace_rtx_part (from, to, &PATTERN (insn), insn). */ validate_replace_rtx_part (from, to, &PATTERN (insn), insn). */
int int
validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx insn) validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx_insn *insn)
{ {
validate_replace_rtx_1 (where, from, to, insn, true); validate_replace_rtx_1 (where, from, to, insn, true);
return apply_change_group (); return apply_change_group ();
...@@ -879,7 +879,7 @@ validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx insn) ...@@ -879,7 +879,7 @@ validate_replace_rtx_part (rtx from, rtx to, rtx *where, rtx insn)
/* Same as above, but do not simplify rtx afterwards. */ /* Same as above, but do not simplify rtx afterwards. */
int int
validate_replace_rtx_part_nosimplify (rtx from, rtx to, rtx *where, validate_replace_rtx_part_nosimplify (rtx from, rtx to, rtx *where,
rtx insn) rtx_insn *insn)
{ {
validate_replace_rtx_1 (where, from, to, insn, false); validate_replace_rtx_1 (where, from, to, insn, false);
return apply_change_group (); return apply_change_group ();
...@@ -890,7 +890,7 @@ validate_replace_rtx_part_nosimplify (rtx from, rtx to, rtx *where, ...@@ -890,7 +890,7 @@ validate_replace_rtx_part_nosimplify (rtx from, rtx to, rtx *where,
will replace in REG_EQUAL and REG_EQUIV notes. */ will replace in REG_EQUAL and REG_EQUIV notes. */
void void
validate_replace_rtx_group (rtx from, rtx to, rtx insn) validate_replace_rtx_group (rtx from, rtx to, rtx_insn *insn)
{ {
rtx note; rtx note;
validate_replace_rtx_1 (&PATTERN (insn), from, to, insn, true); validate_replace_rtx_1 (&PATTERN (insn), from, to, insn, true);
...@@ -936,7 +936,7 @@ validate_replace_src_group (rtx from, rtx to, rtx_insn *insn) ...@@ -936,7 +936,7 @@ validate_replace_src_group (rtx from, rtx to, rtx_insn *insn)
pattern and return true if something was simplified. */ pattern and return true if something was simplified. */
bool bool
validate_simplify_insn (rtx insn) validate_simplify_insn (rtx_insn *insn)
{ {
int i; int i;
rtx pat = NULL; rtx pat = NULL;
...@@ -976,7 +976,7 @@ validate_simplify_insn (rtx insn) ...@@ -976,7 +976,7 @@ validate_simplify_insn (rtx insn)
EQ and NE tests do not count. */ EQ and NE tests do not count. */
int int
next_insn_tests_no_inequality (rtx insn) next_insn_tests_no_inequality (rtx_insn *insn)
{ {
rtx_insn *next = next_cc0_user (insn); rtx_insn *next = next_cc0_user (insn);
...@@ -2517,7 +2517,7 @@ preprocess_insn_constraints (int icode) ...@@ -2517,7 +2517,7 @@ preprocess_insn_constraints (int icode)
The collected data is stored in recog_op_alt. */ The collected data is stored in recog_op_alt. */
void void
preprocess_constraints (rtx insn) preprocess_constraints (rtx_insn *insn)
{ {
int icode = INSN_CODE (insn); int icode = INSN_CODE (insn);
if (icode >= 0) if (icode >= 0)
...@@ -2911,7 +2911,7 @@ reg_fits_class_p (const_rtx operand, reg_class_t cl, int offset, ...@@ -2911,7 +2911,7 @@ reg_fits_class_p (const_rtx operand, reg_class_t cl, int offset,
split_all_insns_noflow. Return last insn in the sequence if successful, split_all_insns_noflow. Return last insn in the sequence if successful,
or NULL if unsuccessful. */ or NULL if unsuccessful. */
static rtx static rtx_insn *
split_insn (rtx_insn *insn) split_insn (rtx_insn *insn)
{ {
/* Split insns here to get max fine-grain parallelism. */ /* Split insns here to get max fine-grain parallelism. */
...@@ -2920,7 +2920,7 @@ split_insn (rtx_insn *insn) ...@@ -2920,7 +2920,7 @@ split_insn (rtx_insn *insn)
rtx insn_set, last_set, note; rtx insn_set, last_set, note;
if (last == insn) if (last == insn)
return NULL_RTX; return NULL;
/* If the original instruction was a single set that was known to be /* If the original instruction was a single set that was known to be
equivalent to a constant, see if we can say the same about the last equivalent to a constant, see if we can say the same about the last
......
gcc/recog.h
...@@ -88,7 +88,7 @@ extern int check_asm_operands (rtx); ...@@ -88,7 +88,7 @@ extern int check_asm_operands (rtx);
extern int asm_operand_ok (rtx, const char *, const char **); extern int asm_operand_ok (rtx, const char *, const char **);
extern bool validate_change (rtx, rtx *, rtx, bool); extern bool validate_change (rtx, rtx *, rtx, bool);
extern bool validate_unshare_change (rtx, rtx *, rtx, bool); extern bool validate_unshare_change (rtx, rtx *, rtx, bool);
extern bool canonicalize_change_group (rtx insn, rtx x); extern bool canonicalize_change_group (rtx_insn *insn, rtx x);
extern int insn_invalid_p (rtx_insn *, bool); extern int insn_invalid_p (rtx_insn *, bool);
extern int verify_changes (int); extern int verify_changes (int);
extern void confirm_change_group (void); extern void confirm_change_group (void);
...@@ -104,15 +104,15 @@ extern int strict_memory_address_addr_space_p (machine_mode, rtx, ...@@ -104,15 +104,15 @@ extern int strict_memory_address_addr_space_p (machine_mode, rtx,
addr_space_t); addr_space_t);
#define strict_memory_address_p(mode,addr) \ #define strict_memory_address_p(mode,addr) \
strict_memory_address_addr_space_p ((mode), (addr), ADDR_SPACE_GENERIC) strict_memory_address_addr_space_p ((mode), (addr), ADDR_SPACE_GENERIC)
extern int validate_replace_rtx_subexp (rtx, rtx, rtx, rtx *); extern int validate_replace_rtx_subexp (rtx, rtx, rtx_insn *, rtx *);
extern int validate_replace_rtx (rtx, rtx, rtx); extern int validate_replace_rtx (rtx, rtx, rtx_insn *);
extern int validate_replace_rtx_part (rtx, rtx, rtx *, rtx); extern int validate_replace_rtx_part (rtx, rtx, rtx *, rtx_insn *);
extern int validate_replace_rtx_part_nosimplify (rtx, rtx, rtx *, rtx); extern int validate_replace_rtx_part_nosimplify (rtx, rtx, rtx *, rtx_insn *);
extern void validate_replace_rtx_group (rtx, rtx, rtx); extern void validate_replace_rtx_group (rtx, rtx, rtx_insn *);
extern void validate_replace_src_group (rtx, rtx, rtx_insn *); extern void validate_replace_src_group (rtx, rtx, rtx_insn *);
extern bool validate_simplify_insn (rtx insn); extern bool validate_simplify_insn (rtx_insn *insn);
extern int num_changes_pending (void); extern int num_changes_pending (void);
extern int next_insn_tests_no_inequality (rtx); extern int next_insn_tests_no_inequality (rtx_insn *);
extern bool reg_fits_class_p (const_rtx, reg_class_t, int, machine_mode); extern bool reg_fits_class_p (const_rtx, reg_class_t, int, machine_mode);
extern int offsettable_memref_p (rtx); extern int offsettable_memref_p (rtx);
...@@ -138,7 +138,7 @@ extern void extract_insn_cached (rtx_insn *); ...@@ -138,7 +138,7 @@ extern void extract_insn_cached (rtx_insn *);
extern void preprocess_constraints (int, int, const char **, extern void preprocess_constraints (int, int, const char **,
operand_alternative *); operand_alternative *);
extern const operand_alternative *preprocess_insn_constraints (int); extern const operand_alternative *preprocess_insn_constraints (int);
extern void preprocess_constraints (rtx); extern void preprocess_constraints (rtx_insn *);
extern rtx peep2_next_insn (int); extern rtx peep2_next_insn (int);
extern int peep2_regno_dead_p (int, int); extern int peep2_regno_dead_p (int, int);
extern int peep2_reg_dead_p (int, rtx); extern int peep2_reg_dead_p (int, rtx);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment