From acc677e9003c7f13698c9294e7032b3616390a67 Mon Sep 17 00:00:00 2001 From: pbrook Date: Wed, 15 Mar 2006 20:22:56 +0000 Subject: [PATCH] 2006-03-15 Paul Brook * config/arm/arm.c (minipool_pad): New. (add_minipool_forward_ref): Unclude pool alignment padding in address calculation. (push_minipool_fix): Set minipool_pad. (minipool_pad): Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112099 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/config/arm/arm.c | 13 +++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a05ddb43f1..e0ffaa36d81 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2006-03-15 Paul Brook + + * config/arm/arm.c (minipool_pad): New. + (add_minipool_forward_ref): Unclude pool alignment padding in address + calculation. + (push_minipool_fix): Set minipool_pad. + (minipool_pad): Ditto. + 2006-03-15 Jan-Benedict Glaw * config/vax/vax.c (split_quadword_operands): Use MEM_P() diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 4e9ae1b6e3f..2e5c9c43bb8 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -7308,6 +7308,7 @@ struct minipool_fixup static Mnode * minipool_vector_head; static Mnode * minipool_vector_tail; static rtx minipool_vector_label; +static int minipool_pad; /* The linked list of all minipool fixes required for this function. */ Mfix * minipool_fix_head; @@ -7419,7 +7420,7 @@ add_minipool_forward_ref (Mfix *fix) /* If set, max_mp is the first pool_entry that has a lower constraint than the one we are trying to add. */ Mnode * max_mp = NULL; - HOST_WIDE_INT max_address = fix->address + fix->forwards; + HOST_WIDE_INT max_address = fix->address + fix->forwards - minipool_pad; Mnode * mp; /* If this fix's address is greater than the address of the first @@ -7997,12 +7998,11 @@ push_minipool_fix (rtx insn, HOST_WIDE_INT address, rtx *loc, to generate duff assembly code. */ gcc_assert (fix->forwards || fix->backwards); - /* With AAPCS/iWMMXt enabled, the pool is aligned to an 8-byte boundary. - So there might be an empty word before the start of the pool. - Hence we reduce the forward range by 4 to allow for this - possibility. */ + /* If an entry requires 8-byte alignment then assume all constant pools + require 4 bytes of padding. Trying to do this later on a per-pool + basis is awkward becuse existing pool entries have to be modified. */ if (ARM_DOUBLEWORD_ALIGN && fix->fix_size == 8) - fix->forwards -= 4; + minipool_pad = 4; if (dump_file) { @@ -8179,6 +8179,7 @@ arm_reorg (void) scan it properly. */ insn = get_insns (); gcc_assert (GET_CODE (insn) == NOTE); + minipool_pad = 0; /* Scan all the insns and record the operands that will need fixing. */ for (insn = next_nonnote_insn (insn); insn; insn = next_nonnote_insn (insn)) -- 2.11.4.GIT