Commit 8f746f8c by Andreas Krebbel Committed by Andreas Krebbel

S/390: Adjust to the recent branch probability changes.

This fixes the bootstrap failure triggered by the recent changes wrt
branch probabilities aka emit_cmp_and_jump_insns does not accept
integers as branch probability anymore.

gcc/ChangeLog:

2017-06-30  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* config/s390/s390.c (s390_expand_setmem): Adjust to the new data
	type for branch probabilities.

From-SVN: r249829
parent 00c7c57f
2017-06-30 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* config/s390/s390.c (s390_expand_setmem): Adjust to the new data
type for branch probabilities.
2017-06-29 Julian Brown <julian@codesourcery.com> 2017-06-29 Julian Brown <julian@codesourcery.com>
Naveen H.S <Naveen.Hurugalawadi@cavium.com> Naveen H.S <Naveen.Hurugalawadi@cavium.com>
......
...@@ -5349,8 +5349,6 @@ s390_expand_movmem (rtx dst, rtx src, rtx len) ...@@ -5349,8 +5349,6 @@ s390_expand_movmem (rtx dst, rtx src, rtx len)
void void
s390_expand_setmem (rtx dst, rtx len, rtx val) s390_expand_setmem (rtx dst, rtx len, rtx val)
{ {
const int very_unlikely = REG_BR_PROB_BASE / 100 - 1;
if (GET_CODE (len) == CONST_INT && INTVAL (len) <= 0) if (GET_CODE (len) == CONST_INT && INTVAL (len) <= 0)
return; return;
...@@ -5424,7 +5422,7 @@ s390_expand_setmem (rtx dst, rtx len, rtx val) ...@@ -5424,7 +5422,7 @@ s390_expand_setmem (rtx dst, rtx len, rtx val)
convert_move (count, len, 1); convert_move (count, len, 1);
emit_cmp_and_jump_insns (count, const0_rtx, emit_cmp_and_jump_insns (count, const0_rtx,
EQ, NULL_RTX, mode, 1, zerobyte_end_label, EQ, NULL_RTX, mode, 1, zerobyte_end_label,
very_unlikely); profile_probability::very_unlikely ());
/* We need to make a copy of the target address since memset is /* We need to make a copy of the target address since memset is
supposed to return it unmodified. We have to make it here supposed to return it unmodified. We have to make it here
...@@ -5441,7 +5439,8 @@ s390_expand_setmem (rtx dst, rtx len, rtx val) ...@@ -5441,7 +5439,8 @@ s390_expand_setmem (rtx dst, rtx len, rtx val)
dstp1 = adjust_address (dst, VOIDmode, 1); dstp1 = adjust_address (dst, VOIDmode, 1);
emit_cmp_and_jump_insns (count, emit_cmp_and_jump_insns (count,
const1_rtx, EQ, NULL_RTX, mode, 1, const1_rtx, EQ, NULL_RTX, mode, 1,
onebyte_end_label, very_unlikely); onebyte_end_label,
profile_probability::very_unlikely ());
} }
/* There is one unconditional (mvi+mvc)/xc after the loop /* There is one unconditional (mvi+mvc)/xc after the loop
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment