From 49166fc31e2764a27545c4522a21396ce2e5814b Mon Sep 17 00:00:00 2001
From: steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 11 Mar 2006 12:52:56 +0000
Subject: [PATCH] 2006-03-11 Steven Bosscher <stevenb.gcc@gmail.com>
* config/sh/sh.c: Include alloc-pool.h.
(label_ref_list_pool): New alloc pool.
(label_ref_list_t): New type for lists of labels.
(struct pool_node): Make wend a label_ref_list_t.
(add_constant): Use the new type, eradicate LABEL_NEXTREF
references.
(dump_table): Likewise.
(sh_reorg): Set up the alloc pool before using add_constant and
dump_table, and destroy it when finishing.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111963 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 12 +++++++++++
gcc/config/sh/sh.c | 53 ++++++++++++++++++++++++++++++----------------
2 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52272b4174f3..b28931d7ad81 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-11 Steven Bosscher <stevenb.gcc@gmail.com>
+
+ * config/sh/sh.c: Include alloc-pool.h.
+ (label_ref_list_pool): New alloc pool.
+ (label_ref_list_t): New type for lists of labels.
+ (struct pool_node): Make wend a label_ref_list_t.
+ (add_constant): Use the new type, eradicate LABEL_NEXTREF
+ references.
+ (dump_table): Likewise.
+ (sh_reorg): Set up the alloc pool before using add_constant and
+ dump_table, and destroy it when finishing.
+
2006-03-11 Richard Sandiford <richard@codesourcery.com>
* config/mips/mips.c: Remove redundant comment.
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 237da2619e7d..53b624403ab9 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -53,6 +53,7 @@ Boston, MA 02110-1301, USA. */
#include "ggc.h"
#include "tree-gimple.h"
#include "cfgloop.h"
+#include "alloc-pool.h"
int code_for_indirect_jump_scratch = CODE_FOR_indirect_jump_scratch;
@@ -2964,6 +2965,14 @@ gen_datalabel_ref (rtx sym)
}
+static alloc_pool label_ref_list_pool;
+
+typedef struct label_ref_list_d
+{
+ rtx label;
+ struct label_ref_list_d *next;
+} *label_ref_list_t;
+
/* The SH cannot load a large constant into a register, constants have to
come from a pc relative load. The reference of a pc relative load
instruction must be less than 1k in front of the instruction. This
@@ -3021,7 +3030,7 @@ typedef struct
{
rtx value; /* Value in table. */
rtx label; /* Label of value. */
- rtx wend; /* End of window. */
+ label_ref_list_t wend; /* End of window. */
enum machine_mode mode; /* Mode of value. */
/* True if this constant is accessed as part of a post-increment
@@ -3055,7 +3064,8 @@ static rtx
add_constant (rtx x, enum machine_mode mode, rtx last_value)
{
int i;
- rtx lab, new, ref, newref;
+ rtx lab, new;
+ label_ref_list_t ref, newref;
/* First see if we've already got it. */
for (i = 0; i < pool_size; i++)
@@ -3081,9 +3091,10 @@ add_constant (rtx x, enum machine_mode mode, rtx last_value)
}
if (lab && pool_window_label)
{
- newref = gen_rtx_LABEL_REF (VOIDmode, pool_window_label);
+ newref = (label_ref_list_t) pool_alloc (label_ref_list_pool);
+ newref->label = pool_window_label;
ref = pool_vector[pool_window_last].wend;
- LABEL_NEXTREF (newref) = ref;
+ newref->next = ref;
pool_vector[pool_window_last].wend = newref;
}
if (new)
@@ -3105,13 +3116,14 @@ add_constant (rtx x, enum machine_mode mode, rtx last_value)
lab = gen_label_rtx ();
pool_vector[pool_size].mode = mode;
pool_vector[pool_size].label = lab;
- pool_vector[pool_size].wend = NULL_RTX;
+ pool_vector[pool_size].wend = NULL;
pool_vector[pool_size].part_of_sequence_p = (lab == 0);
if (lab && pool_window_label)
{
- newref = gen_rtx_LABEL_REF (VOIDmode, pool_window_label);
+ newref = (label_ref_list_t) pool_alloc (label_ref_list_pool);
+ newref->label = pool_window_label;
ref = pool_vector[pool_window_last].wend;
- LABEL_NEXTREF (newref) = ref;
+ newref->next = ref;
pool_vector[pool_window_last].wend = newref;
}
if (lab)
@@ -3133,7 +3145,8 @@ dump_table (rtx start, rtx barrier)
rtx scan = barrier;
int i;
int need_align = 1;
- rtx lab, ref;
+ rtx lab;
+ label_ref_list_t ref;
int have_df = 0;
/* Do two passes, first time dump out the HI sized constants. */
@@ -3153,9 +3166,9 @@ dump_table (rtx start, rtx barrier)
scan = emit_label_after (lab, scan);
scan = emit_insn_after (gen_consttable_2 (p->value, const0_rtx),
scan);
- for (ref = p->wend; ref; ref = LABEL_NEXTREF (ref))
+ for (ref = p->wend; ref; ref = ref->next)
{
- lab = XEXP (ref, 0);
+ lab = ref->label;
scan = emit_insn_after (gen_consttable_window_end (lab), scan);
}
}
@@ -3203,9 +3216,9 @@ dump_table (rtx start, rtx barrier)
emit_label_before (lab, align_insn);
emit_insn_before (gen_consttable_4 (p->value, const0_rtx),
align_insn);
- for (ref = p->wend; ref; ref = LABEL_NEXTREF (ref))
+ for (ref = p->wend; ref; ref = ref->next)
{
- lab = XEXP (ref, 0);
+ lab = ref->label;
emit_insn_before (gen_consttable_window_end (lab),
align_insn);
}
@@ -3241,9 +3254,9 @@ dump_table (rtx start, rtx barrier)
if (p->mode != HImode)
{
- for (ref = p->wend; ref; ref = LABEL_NEXTREF (ref))
+ for (ref = p->wend; ref; ref = ref->next)
{
- lab = XEXP (ref, 0);
+ lab = ref->label;
scan = emit_insn_after (gen_consttable_window_end (lab),
scan);
}
@@ -3293,9 +3306,9 @@ dump_table (rtx start, rtx barrier)
if (p->mode != HImode)
{
- for (ref = p->wend; ref; ref = LABEL_NEXTREF (ref))
+ for (ref = p->wend; ref; ref = ref->next)
{
- lab = XEXP (ref, 0);
+ lab = ref->label;
scan = emit_insn_after (gen_consttable_window_end (lab), scan);
}
}
@@ -4517,9 +4530,12 @@ sh_reorg (void)
mdep_reorg_phase = SH_SHORTEN_BRANCHES0;
shorten_branches (first);
}
+
/* Scan the function looking for move instructions which have to be
changed to pc-relative loads and insert the literal tables. */
-
+ label_ref_list_pool = create_alloc_pool ("label references list",
+ sizeof (struct label_ref_list_d),
+ 30);
mdep_reorg_phase = SH_FIXUP_PCLOAD;
for (insn = first, num_mova = 0; insn; insn = NEXT_INSN (insn))
{
@@ -4700,7 +4716,8 @@ sh_reorg (void)
insn = barrier;
}
}
-
+ free_alloc_pool (label_ref_list_pool);
+
mdep_reorg_phase = SH_SHORTEN_BRANCHES1;
INSN_ADDRESSES_FREE ();
split_branches (first);
--
GitLab