expr.c (expand_assignment): Extend offset_rtx with convert_to_mode not with convert_memory_address.

* expr.c (expand_assignment): Extend offset_rtx with convert_to_mode
	not with convert_memory_address.
	(store_constructor): Ditto, and same for copy_size_rtx.
	(expand_expr): Ditto.

From-SVN: r65433
This commit is contained in:
Steve Ellcey 2003-04-10 19:39:07 +00:00 committed by Steve Ellcey
parent 1e099144a5
commit 267b28bd11
2 changed files with 14 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2003-04-10 Steve Ellcey <sje@cup.hp.com>
* expr.c (expand_assignment): Extend offset_rtx with convert_to_mode
not with convert_memory_address.
(store_constructor): Ditto, and same for copy_size_rtx.
(expand_expr): Ditto.
2003-04-10 Douglas B Rupp <rupp@gnat.com>
* config/i386/i386.c (ix86_ms_bitfield_layout_p): Fix formatting.

View File

@ -4122,7 +4122,7 @@ expand_assignment (to, from, want_value, suggest_reg)
#ifdef POINTERS_EXTEND_UNSIGNED
if (GET_MODE (offset_rtx) != Pmode)
offset_rtx = convert_memory_address (Pmode, offset_rtx);
offset_rtx = convert_to_mode (Pmode, offset_rtx, 0);
#else
if (GET_MODE (offset_rtx) != ptr_mode)
offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0);
@ -4630,7 +4630,8 @@ store_expr (exp, target, want_value)
rtx label = 0;
/* Copy that much. */
copy_size_rtx = convert_to_mode (ptr_mode, copy_size_rtx, 0);
copy_size_rtx = convert_to_mode (ptr_mode, copy_size_rtx,
TREE_UNSIGNED (sizetype));
emit_block_move (target, temp, copy_size_rtx,
(want_value & 2
? BLOCK_OP_CALL_PARM : BLOCK_OP_NORMAL));
@ -4651,8 +4652,8 @@ store_expr (exp, target, want_value)
#ifdef POINTERS_EXTEND_UNSIGNED
if (GET_MODE (copy_size_rtx) != Pmode)
copy_size_rtx = convert_memory_address (Pmode,
copy_size_rtx);
copy_size_rtx = convert_to_mode (Pmode, copy_size_rtx,
TREE_UNSIGNED (sizetype));
#endif
target = offset_address (target, copy_size_rtx,
@ -4957,7 +4958,7 @@ store_constructor (exp, target, cleared, size)
#ifdef POINTERS_EXTEND_UNSIGNED
if (GET_MODE (offset_rtx) != Pmode)
offset_rtx = convert_memory_address (Pmode, offset_rtx);
offset_rtx = convert_to_mode (Pmode, offset_rtx, 0);
#else
if (GET_MODE (offset_rtx) != ptr_mode)
offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0);
@ -7448,7 +7449,7 @@ expand_expr (exp, target, tmode, modifier)
#ifdef POINTERS_EXTEND_UNSIGNED
if (GET_MODE (offset_rtx) != Pmode)
offset_rtx = convert_memory_address (Pmode, offset_rtx);
offset_rtx = convert_to_mode (Pmode, offset_rtx, 0);
#else
if (GET_MODE (offset_rtx) != ptr_mode)
offset_rtx = convert_to_mode (ptr_mode, offset_rtx, 0);