ppro.md (ppro_complex_insn): Add missing check for cpu==pentiumpro.

	* config/i386/ppro.md (ppro_complex_insn): Add missing check
	for cpu==pentiumpro.

	* combine.c (struct reg_stat): Fix comment typo.

From-SVN: r86380

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d44f19c9155c234f19ccdfc1f0fcf92231db4583..26615a869cd2e1812272017bbfefe8a9a0a26c86 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-22  Steven Bosscher  <stevenb@suse.de>
+
+       * config/i386/ppro.md (ppro_complex_insn): Add missing check
+       for cpu==pentiumpro.
+
+       * combine.c (struct reg_stat): Fix comment typo.
+
 2004-08-22  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        * c-tree.h (c_sizeof_nowarn): Remove.
@@ -115,7 +122,7 @@
 
 2004-08-20  Dale Johannesen  <dalej@apple.com>
 
-        * config/rs6000/rs6000.c (rs6000_rtx_costs): Improve DIV/MOD.
+       * config/rs6000/rs6000.c (rs6000_rtx_costs): Improve DIV/MOD.
 
 2004-08-20  Daniel Jacobowitz  <dan@debian.org>
 
@@ -139,10 +146,10 @@
 2004-08-20  Zack Weinberg  <zack@codesourcery.com>
            John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
-        * config/pa/pa-protos.h (readonly_data, one_only_readonly_data_section,
+       * config/pa/pa-protos.h (readonly_data, one_only_readonly_data_section,
        one_only_data_section): Rename to som_readonly_data_section,
        som_one_only_readonly_data_section and som_one_only_data_section.
-        * config/pa/pa.c (ONE_ONLY_TEXT_SECTION_ASM_OP,
+       * config/pa/pa.c (ONE_ONLY_TEXT_SECTION_ASM_OP,
        NEW_TEXT_SECTION_ASM_OP, DEFAULT_TEXT_SECTION_ASM_OP): Delete
        conditional defines.
        (som_text_section_asm_op): Replace ONE_ONLY_TEXT_SECTION_ASM_OP,
@@ -150,16 +157,16 @@
        string values.
        (pa_select_section): Use renamed section functions.
        * config/pa/pa.h (EXTRA_SECTIONS, EXTRA_SECTION_FUNCTIONS,
-        SOM_READONLY_DATA_SECTION_FUNCTION,
+       SOM_READONLY_DATA_SECTION_FUNCTION,
        SOM_ONE_ONLY_READONLY_DATA_SECTION_FUNCTION,
-        SOM_ONE_ONLY_DATA_SECTION_FUNCTION, FORGET_SECTION_FUNCTION):
-        Define here ...
-        * config/pa/som.h: ... not here.
-        (DEFAULT_TEXT_SECTION_ASM_OP, NEW_TEXT_SECTION_ASM_OP,
+       SOM_ONE_ONLY_DATA_SECTION_FUNCTION, FORGET_SECTION_FUNCTION):
+       Define here ...
+       * config/pa/som.h: ... not here.
+       (DEFAULT_TEXT_SECTION_ASM_OP, NEW_TEXT_SECTION_ASM_OP,
        ONE_ONLY_TEXT_SECTION_ASM_OP, READONLY_DATA_ASM_OP,
        ONE_ONLY_READONLY_DATA_SECTION_ASM_OP,
-        ONE_ONLY_DATA_SECTION_ASM_OP): Delete.
-        (READONLY_DATA_SECTION): Use som_readonly_data_section.
+       ONE_ONLY_DATA_SECTION_ASM_OP): Delete.
+       (READONLY_DATA_SECTION): Use som_readonly_data_section.
 
 2004-08-20  Nathan Sidwell  <nathan@codesourcery.com>
 
@@ -354,8 +361,8 @@
 
 2004-08-19  Caroline Tice  <ctice@apple.com>
 
-       * config/i386/cygming.h (switch_to_section):  Fix typo (change
-       in_unlikely_text_section to in_unlikely_executed_text).
+       * config/i386/cygming.h (switch_to_section):  Fix typo (change
+       in_unlikely_text_section to in_unlikely_executed_text).
 
 2004-08-19  Daniel Berlin  <dberlin@dberlin.org>
 
@@ -524,7 +531,7 @@
 2004-08-18  Robert Bowdidge <bowdidge@apple.com>
 
        * config/rs6000/x-darwin: Remove XCFLAGS -mdynamic-no-pic to
-        get regression tester working again.
+       get regression tester working again.
 
 2004-08-18  Zack Weinberg  <zack@codesourcery.com>
 

diff --git a/gcc/combine.c b/gcc/combine.c
index a116f81360c09c1cb50972529b4c8da9171893cd..4bd1555b1eda89cd7a5d9b418609b269ab5f0466 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -205,7 +205,7 @@ struct reg_stat {
   int                          last_set_label;
 
   /* These fields are maintained in parallel with last_set_value and are
-     used to store the mode in which the register was last set, te bits
+     used to store the mode in which the register was last set, the bits
      that were known to be zero when it was last set, and the number of
      sign bits copies it was known to have when it was last set.  */
 

diff --git a/gcc/config/i386/ppro.md b/gcc/config/i386/ppro.md
index c8bd5b45b728c2c12c3209e0efff05e95d7de647..ec82977d8d25352a969c1e3f5179bd5f102f45bf 100644 (file)
--- a/gcc/config/i386/ppro.md
+++ b/gcc/config/i386/ppro.md
@@ -137,7 +137,8 @@
 ;; on decoder 0, and say that it takes a little while before the result
 ;; is available.
 (define_insn_reservation "ppro_complex_insn" 6
-                        (eq_attr "type" "other,multi,call,callv,str")
+                        (and (eq_attr "cpu" "pentiumpro")
+                             (eq_attr "type" "other,multi,call,callv,str"))
                         "decoder0")
 
 ;; imov with memory operands does not use the integer units.