From 18d7916e393bbc7f8213f07a31a7220cdbbb284b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 27 Jul 2004 15:43:31 +0000 Subject: [PATCH] m32r.c: Include integrate.h in order to get the prototype for get_hard_reg_initial_val(). * config/m32r/m32r.c: Include integrate.h in order to get the prototype for get_hard_reg_initial_val(). * config/m32r/m32r.md (m32rpipeline): Remove unused value "m32r" and tidy up indentation. (final_presence_set): Use absence_set instead, so that if there is nothing in the "o" pipe the "s" pipe can be scheduled. From-SVN: r85221 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/m32r/m32r.c | 1 + gcc/config/m32r/m32r.md | 16 ++++++++-------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5c877bf0db7..504a2da84a3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2004-07-27 Nick Clifton + + * config/m32r/m32r.c: Include integrate.h in order to get the + prototype for get_hard_reg_initial_val(). + + * config/m32r/m32r.md (m32rpipeline): Remove unused value "m32r" + and tidy up indentation. + (final_presence_set): Use absence_set instead, so that if there is + nothing in the "o" pipe the "s" pipe can be scheduled. + 2004-07-27 Diego Novillo * tree-ssa-alias.c (create_name_tags): Ignore pointers that diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index a35c394cfa0..52dbb770555 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -38,6 +38,7 @@ #include "recog.h" #include "toplev.h" #include "ggc.h" +#include "integrate.h" #include "tm_p.h" #include "target.h" #include "target-def.h" diff --git a/gcc/config/m32r/m32r.md b/gcc/config/m32r/m32r.md index c32327ab60f..46c6a339aad 100644 --- a/gcc/config/m32r/m32r.md +++ b/gcc/config/m32r/m32r.md @@ -77,20 +77,20 @@ ;; Defines the pipeline where an instruction can be executed on. ;; For the M32R, a short instruction can execute one of the two pipes. ;; For the M32Rx, the restrictions are modelled in the second -;; condition of this attribute definition. -(define_attr "m32r_pipeline" "either,s,o,long,m32r" +;; condition of this attribute definition. +(define_attr "m32r_pipeline" "either,s,o,long" (cond [(and (eq_attr "cpu" "m32r") (eq_attr "insn_size" "short")) (const_string "either") (eq_attr "insn_size" "!short") (const_string "long")] - (cond [(eq_attr "type" "int2") + (cond [(eq_attr "type" "int2") (const_string "either") - (eq_attr "type" "load2,store2,shift2,uncond_branch,branch,call") + (eq_attr "type" "load2,store2,shift2,uncond_branch,branch,call") (const_string "o") - (eq_attr "type" "mul2") + (eq_attr "type" "mul2") (const_string "s")] - (const_string "long")))) + (const_string "long")))) ;; :::::::::::::::::::: ;; :: @@ -125,8 +125,8 @@ (define_cpu_unit "o_IF,s_IF,o_E,s_E,memory" "m32r") ;; Prevent the s pipe from being reserved before the o pipe. -(final_presence_set "s_IF" "o_IF") -(final_presence_set "s_E" "o_E") +(absence_set "s_IF" "o_IF") +(absence_set "s_E" "o_E") ;; On the M32Rx, long instructions execute on both pipes, so reserve ;; both fetch slots and both pipes. -- 2.30.2