* configure.ac (gcc_cv_nm): Don't use an in-tree nm if

[pf3gnuchains/gcc-fork.git] / gcc / sched-int.h

diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index cdaca1b..bee8a98 100644 (file)
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -1,7 +1,7 @@
 /* Instruction scheduling pass.  This file contains definitions used
    internally in the scheduler.
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -36,8 +36,8 @@ extern state_t curr_state;
 /* Forward declaration.  */
 struct ready_list;
 
-/* Type to represent status of a dependence.  A convinient short alias.  */
-typedef HOST_WIDE_INT ds_t;
+/* Type to represent status of a dependence.  */
+typedef int ds_t;
 
 /* Type to represent weakness of speculative dependence.  */
 typedef int dw_t;
@@ -321,7 +321,7 @@ struct haifa_insn_data
      (e.g. add_dependence was invoked with (insn == elem)).  */
   unsigned int has_internal_dep : 1;
   
-  /* What speculations are neccessary to apply to schedule the instruction.  */
+  /* What speculations are necessary to apply to schedule the instruction.  */
   ds_t todo_spec;
   /* What speculations were already applied.  */
   ds_t done_spec; 
@@ -359,7 +359,7 @@ extern regset *glat_start, *glat_end;
 #define RECOVERY_BLOCK(INSN)    (h_i_d[INSN_UID (INSN)].recovery_block)
 #define ORIG_PAT(INSN)          (h_i_d[INSN_UID (INSN)].orig_pat)
 
-/* DEP_STATUS of the link incapsulates information, that is needed for
+/* DEP_STATUS of the link encapsulates information, that is needed for
    speculative scheduling.  Namely, it is 4 integers in the range
    [0, MAX_DEP_WEAK] and 3 bits.
    The integers correspond to the probability of the dependence to *not*
@@ -374,13 +374,13 @@ extern regset *glat_start, *glat_end;
    to know just the major type of all the dependence between two instructions,
    as only true dependence can be overcome.
    There also is the 4-th bit in the DEP_STATUS (HARD_DEP), that is reserved
-   for using to describe instruction's status.  It is set whenever instuction
+   for using to describe instruction's status.  It is set whenever instruction
    has at least one dependence, that cannot be overcome.
    See also: check_dep_status () in sched-deps.c .  */
-#define DEP_STATUS(LINK) XWINT (LINK, 2)
+#define DEP_STATUS(LINK) XINT (LINK, 2)
 
 /* We exclude sign bit.  */
-#define BITS_PER_DEP_STATUS (HOST_BITS_PER_WIDE_INT - 1)
+#define BITS_PER_DEP_STATUS (HOST_BITS_PER_INT - 1)
 
 /* First '4' stands for 3 dep type bits and HARD_DEP bit.
    Second '4' stands for BEGIN_{DATA, CONTROL}, BE_IN_{DATA, CONTROL}
@@ -421,27 +421,27 @@ enum SPEC_TYPES_OFFSETS {
 /* The following defines provide numerous constants used to distinguish between
    different types of speculative dependencies.  */
 
-/* Dependence can be overcomed with generation of new data speculative
+/* Dependence can be overcome with generation of new data speculative
    instruction.  */
 #define BEGIN_DATA (((ds_t) DEP_WEAK_MASK) << BEGIN_DATA_BITS_OFFSET)
 
 /* This dependence is to the instruction in the recovery block, that was
    formed to recover after data-speculation failure.
-   Thus, this dependence can overcomed with generating of the copy of
+   Thus, this dependence can overcome with generating of the copy of
    this instruction in the recovery block.  */
 #define BE_IN_DATA (((ds_t) DEP_WEAK_MASK) << BE_IN_DATA_BITS_OFFSET)
 
-/* Dependence can be overcomed with generation of new control speculative
+/* Dependence can be overcome with generation of new control speculative
    instruction.  */
 #define BEGIN_CONTROL (((ds_t) DEP_WEAK_MASK) << BEGIN_CONTROL_BITS_OFFSET)
 
 /* This dependence is to the instruction in the recovery block, that was
    formed to recover after control-speculation failure.
-   Thus, this dependence can overcomed with generating of the copy of
+   Thus, this dependence can be overcome with generating of the copy of
    this instruction in the recovery block.  */
 #define BE_IN_CONTROL (((ds_t) DEP_WEAK_MASK) << BE_IN_CONTROL_BITS_OFFSET)
 
-/* Few convinient combinations.  */
+/* A few convenient combinations.  */
 #define BEGIN_SPEC (BEGIN_DATA | BEGIN_CONTROL)
 #define DATA_SPEC (BEGIN_DATA | BE_IN_DATA)
 #define CONTROL_SPEC (BEGIN_CONTROL | BE_IN_CONTROL)
@@ -639,7 +639,7 @@ extern void add_block (basic_block, basic_block);
 extern void attach_life_info (void);
 
 #ifdef ENABLE_CHECKING
-extern void check_reg_live (void);
+extern void check_reg_live (bool);
 #endif
 
 #endif /* GCC_SCHED_INT_H */