From 77278891d14e6ff888fee7dcb9ae47a9ec33422b Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 24 Apr 2004 01:03:11 +0000 Subject: [PATCH] expmed.c (expand_mult_highpart_adjust): Do not assume OP1 is a CONST_INT. * expmed.c (expand_mult_highpart_adjust): Do not assume OP1 is a CONST_INT. (expand_mult_highpart_optab): Call expand_mult_highpart_adjust with NARROW_OP1 instead of OP1. From-SVN: r81127 --- gcc/ChangeLog | 7 +++++++ gcc/expmed.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 49f94fefaeb..2b717ebb526 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-04-24 Ulrich Weigand + + * expmed.c (expand_mult_highpart_adjust): Do not assume OP1 + is a CONST_INT. + (expand_mult_highpart_optab): Call expand_mult_highpart_adjust + with NARROW_OP1 instead of OP1. + 2004-04-24 Ulrich Weigand * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for __s390__ diff --git a/gcc/expmed.c b/gcc/expmed.c index 3eb745465da..54959799411 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -2841,7 +2841,6 @@ expand_mult_highpart_adjust (enum machine_mode mode, rtx adj_operand, rtx op0, rtx tem; enum rtx_code adj_code = unsignedp ? PLUS : MINUS; - op1 = gen_int_mode (INTVAL (op1), mode); tem = expand_shift (RSHIFT_EXPR, mode, op0, build_int_2 (GET_MODE_BITSIZE (mode) - 1, 0), NULL_RTX, 0); @@ -2914,7 +2913,7 @@ expand_mult_highpart_optab (enum machine_mode mode, rtx op0, rtx op1, unsignedp, OPTAB_DIRECT); if (tem) /* We used the wrong signedness. Adjust the result. */ - return expand_mult_highpart_adjust (mode, tem, op0, op1, + return expand_mult_highpart_adjust (mode, tem, op0, narrow_op1, tem, unsignedp); } @@ -2954,7 +2953,7 @@ expand_mult_highpart_optab (enum machine_mode mode, rtx op0, rtx op1, { tem = extract_high_half (mode, tem); /* We used the wrong signedness. Adjust the result. */ - return expand_mult_highpart_adjust (mode, tem, op0, op1, + return expand_mult_highpart_adjust (mode, tem, op0, narrow_op1, target, unsignedp); } }