From: Trevor Saunders <tsaund...@mozilla.com>
Hi,
pretty trivial, but not quiet just changing the types of variables.
bootstrapped + regtested on x86_64-unknown-linux-gnu, and run through
config-list.mk with a couple other patches. ok?
Trev
gcc/ChangeLog:
2014-09-11 Trevor Saunders <tsaund...@mozilla.com>
* config/mn10300/mn10300.c (mn10300_insert_setlb_lcc): Assign the
result of emit_jump_insn_before to a new variable.
* jump.c (mark_jump_label): Change the type of insn to rtx_insn *.
(mark_jump_label_1): Likewise.
(mark_jump_label_asm): Likewise.
* reload1.c (gen_reload): Change type of tem to rtx_insn *.
* rtl.h (mark_jump_label): Adjust.
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 07cae5c..6296292 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -3200,11 +3200,11 @@ mn10300_insert_setlb_lcc (rtx label, rtx branch)
else
lcc = gen_Lcc (comparison, label);
- lcc = emit_jump_insn_before (lcc, branch);
- mark_jump_label (XVECEXP (PATTERN (lcc), 0, 0), lcc, 0);
- JUMP_LABEL (lcc) = label;
+ rtx_insn *jump = emit_jump_insn_before (lcc, branch);
+ mark_jump_label (XVECEXP (PATTERN (lcc), 0, 0), jump, 0);
+ JUMP_LABEL (jump) = label;
DUMP ("Replacing branch insn...", branch);
- DUMP ("... with Lcc insn:", lcc);
+ DUMP ("... with Lcc insn:", jump);
delete_insn (branch);
}
diff --git a/gcc/jump.c b/gcc/jump.c
index ef2f9e5..fc3f683 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -65,8 +65,8 @@ along with GCC; see the file COPYING3. If not see
static void init_label_info (rtx_insn *);
static void mark_all_labels (rtx_insn *);
-static void mark_jump_label_1 (rtx, rtx, bool, bool);
-static void mark_jump_label_asm (rtx, rtx);
+static void mark_jump_label_1 (rtx, rtx_insn *, bool, bool);
+static void mark_jump_label_asm (rtx, rtx_insn *);
static void redirect_exp_1 (rtx *, rtx, rtx, rtx);
static int invert_exp_1 (rtx, rtx);
@@ -1066,7 +1066,7 @@ sets_cc0_p (const_rtx x)
that loop-optimization is done with. */
void
-mark_jump_label (rtx x, rtx insn, int in_mem)
+mark_jump_label (rtx x, rtx_insn *insn, int in_mem)
{
rtx asmop = extract_asm_operands (x);
if (asmop)
@@ -1083,7 +1083,7 @@ mark_jump_label (rtx x, rtx insn, int in_mem)
note. */
static void
-mark_jump_label_1 (rtx x, rtx insn, bool in_mem, bool is_target)
+mark_jump_label_1 (rtx x, rtx_insn *insn, bool in_mem, bool is_target)
{
RTX_CODE code = GET_CODE (x);
int i;
@@ -1192,7 +1192,7 @@ mark_jump_label_1 (rtx x, rtx insn, bool in_mem, bool
is_target)
int eltnum = code == ADDR_DIFF_VEC ? 1 : 0;
for (i = 0; i < XVECLEN (x, eltnum); i++)
- mark_jump_label_1 (XVECEXP (x, eltnum, i), NULL_RTX, in_mem,
+ mark_jump_label_1 (XVECEXP (x, eltnum, i), NULL, in_mem,
is_target);
}
return;
@@ -1227,7 +1227,7 @@ mark_jump_label_1 (rtx x, rtx insn, bool in_mem, bool
is_target)
need to be considered targets. */
static void
-mark_jump_label_asm (rtx asmop, rtx insn)
+mark_jump_label_asm (rtx asmop, rtx_insn *insn)
{
int i;
diff --git a/gcc/reload1.c b/gcc/reload1.c
index c18ee67..02a30f7 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -8594,7 +8594,7 @@ static rtx_insn *
gen_reload (rtx out, rtx in, int opnum, enum reload_type type)
{
rtx_insn *last = get_last_insn ();
- rtx tem;
+ rtx_insn *tem;
#ifdef SECONDARY_MEMORY_NEEDED
rtx tem1, tem2;
#endif
diff --git a/gcc/rtl.h b/gcc/rtl.h
index ddf89b0..0173fe4 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2656,7 +2656,7 @@ extern enum rtx_code reverse_condition_maybe_unordered
(enum rtx_code);
extern enum rtx_code swap_condition (enum rtx_code);
extern enum rtx_code unsigned_condition (enum rtx_code);
extern enum rtx_code signed_condition (enum rtx_code);
-extern void mark_jump_label (rtx, rtx, int);
+extern void mark_jump_label (rtx, rtx_insn *, int);
/* In jump.c */
extern rtx_insn *delete_related_insns (rtx);
--
2.1.0
