summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/m68k/m68k.c9
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3eb95e437d6..b30b8176d28 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15 Maxim Kuvyrkov <maxim@codesourcery.com>
+
+ * config/m68k/m68k.c (m68k_sched_variable_issue): Handle
+ -fsched-pressure.
+
2011-04-15 Georg-Johann Lay <avr@gjlay.de>
* config/avr/avr.md ("rotl<mode>3",mode=HIDI): Use match_dup
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 3953d01578c..654c0e5cfbc 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -6128,7 +6128,14 @@ m68k_sched_variable_issue (FILE *sched_dump ATTRIBUTE_UNUSED,
gcc_unreachable ();
}
- gcc_assert (insn_size <= sched_ib.filled);
+ if (insn_size > sched_ib.filled)
+ /* Scheduling for register pressure does not always take DFA into
+ account. Workaround instruction buffer not being filled enough. */
+ {
+ gcc_assert (sched_pressure_p);
+ insn_size = sched_ib.filled;
+ }
+
--can_issue_more;
}
else if (GET_CODE (PATTERN (insn)) == ASM_INPUT