aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKazu Hirata <kazu@cs.umass.edu>2005-04-09 16:51:48 +0000
committerKazu Hirata <kazu@gcc.gnu.org>2005-04-09 16:51:48 +0000
commit728522c390aba945fe4474b99ee35fb5c72590a9 (patch)
tree2f5f63585e2071d9a7b2da73307d6ae0810f635d /gcc
parentf3b569ca7e724b2fc9b8393af5ede3ab9e8a46ea (diff)
downloadgcc-728522c390aba945fe4474b99ee35fb5c72590a9.zip
gcc-728522c390aba945fe4474b99ee35fb5c72590a9.tar.gz
gcc-728522c390aba945fe4474b99ee35fb5c72590a9.tar.bz2
sched-int.h (haifa_insn_data): Remove blockage and units.
* sched-int.h (haifa_insn_data): Remove blockage and units. (INSN_UNIT, INSN_BLOCKAGE, UNIT_BITS, BLOCKAGE_MASK, ENCODE_BLOCKAGE, UNIT_BLOCKED, BLOCKAGE_RANGE, MIN_BLOCKAGE_COST, MAX_BLOCKAGE_COST): Remove. From-SVN: r97905
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/sched-int.h25
2 files changed, 5 insertions, 25 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1a09539..1211bc9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,6 +5,11 @@
config/alpha/alpha.c, config/arm/arm.c, config/m32r/m32r.h,
config/rs6000/predicates.md: Fix comment typos.
+ * sched-int.h (haifa_insn_data): Remove blockage and units.
+ (INSN_UNIT, INSN_BLOCKAGE, UNIT_BITS, BLOCKAGE_MASK,
+ ENCODE_BLOCKAGE, UNIT_BLOCKED, BLOCKAGE_RANGE,
+ MIN_BLOCKAGE_COST, MAX_BLOCKAGE_COST): Remove.
+
2005-04-09 Jan Hubicka <jh@suse.cz>
Steven Bosscher <stevenb@suse.de>
diff --git a/gcc/sched-int.h b/gcc/sched-int.h
index 777adac..7f3805b 100644
--- a/gcc/sched-int.h
+++ b/gcc/sched-int.h
@@ -208,10 +208,6 @@ struct haifa_insn_data
the ready queue when its counter reaches zero. */
int dep_count;
- /* An encoding of the blockage range function. Both unit and range
- are coded. This member is used only for old pipeline interface. */
- unsigned int blockage;
-
/* Number of instructions referring to this insn. */
int ref_count;
@@ -221,10 +217,6 @@ struct haifa_insn_data
short cost;
- /* An encoding of the function units used. This member is used only
- for old pipeline interface. */
- short units;
-
/* This weight is an estimation of the insn's contribution to
register pressure. */
short reg_weight;
@@ -252,25 +244,8 @@ extern struct haifa_insn_data *h_i_d;
#define INSN_PRIORITY(INSN) (h_i_d[INSN_UID (INSN)].priority)
#define INSN_PRIORITY_KNOWN(INSN) (h_i_d[INSN_UID (INSN)].priority_known)
#define INSN_COST(INSN) (h_i_d[INSN_UID (INSN)].cost)
-#define INSN_UNIT(INSN) (h_i_d[INSN_UID (INSN)].units)
#define INSN_REG_WEIGHT(INSN) (h_i_d[INSN_UID (INSN)].reg_weight)
-#define INSN_BLOCKAGE(INSN) (h_i_d[INSN_UID (INSN)].blockage)
-#define UNIT_BITS 5
-#define BLOCKAGE_MASK ((1 << BLOCKAGE_BITS) - 1)
-#define ENCODE_BLOCKAGE(U, R) \
- (((U) << BLOCKAGE_BITS \
- | MIN_BLOCKAGE_COST (R)) << BLOCKAGE_BITS \
- | MAX_BLOCKAGE_COST (R))
-#define UNIT_BLOCKED(B) ((B) >> (2 * BLOCKAGE_BITS))
-#define BLOCKAGE_RANGE(B) \
- (((((B) >> BLOCKAGE_BITS) & BLOCKAGE_MASK) << (HOST_BITS_PER_INT / 2)) \
- | ((B) & BLOCKAGE_MASK))
-
-/* Encodings of the `<name>_unit_blockage_range' function. */
-#define MIN_BLOCKAGE_COST(R) ((R) >> (HOST_BITS_PER_INT / 2))
-#define MAX_BLOCKAGE_COST(R) ((R) & ((1 << (HOST_BITS_PER_INT / 2)) - 1))
-
extern FILE *sched_dump;
extern int sched_verbose;