+2002-02-27 Ulrich Weigand <uweigand@de.ibm.com>
+
+ * config/s390/s390.c (s390_chunkify_pool): Do not confuse
+ insn UIDs with insn addresses.
+
2002-02-27 Zack Weinberg <zack@codesourcery.com>
* c-common.c, c-common.h, c-decl.c, c-lex.c, c-parse.in,
static void
s390_chunkify_pool (void)
{
- int *ltorg_uids, max_ltorg, chunk, last_addr;
+ int *ltorg_uids, max_ltorg, chunk, last_addr, next_addr;
rtx insn;
/* Do we need to chunkify the literal pool? */
}
}
- ltorg_uids[max_ltorg] = insn_current_address + 1;
+ ltorg_uids[max_ltorg] = -1;
/* Find and mark all labels that are branched into
from an insn belonging to a different chunk. */
chunk = last_addr = 0;
+ next_addr = ltorg_uids[chunk] == -1 ? insn_current_address + 1
+ : INSN_ADDRESSES (ltorg_uids[chunk]);
+
for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
{
if (GET_CODE (insn) == JUMP_INSN)
if (label)
{
if (INSN_ADDRESSES (INSN_UID (label)) <= last_addr
- || INSN_ADDRESSES (INSN_UID (label)) > ltorg_uids[chunk])
- SYMBOL_REF_USED (label) = 1;
+ || INSN_ADDRESSES (INSN_UID (label)) > next_addr)
+ SYMBOL_REF_USED (label) = 1;
}
}
else if (GET_CODE (pat) == ADDR_VEC
rtx label = XEXP (XVECEXP (pat, diff_p, i), 0);
if (INSN_ADDRESSES (INSN_UID (label)) <= last_addr
- || INSN_ADDRESSES (INSN_UID (label)) > ltorg_uids[chunk])
+ || INSN_ADDRESSES (INSN_UID (label)) > next_addr)
SYMBOL_REF_USED (label) = 1;
}
}
if (INSN_UID (insn) == ltorg_uids[chunk])
{
- last_addr = ltorg_uids[chunk++];
+ last_addr = INSN_ADDRESSES (ltorg_uids[chunk++]);
+ next_addr = ltorg_uids[chunk] == -1 ? insn_current_address + 1
+ : INSN_ADDRESSES (ltorg_uids[chunk]);
}
}