From: David Edelsohn Date: Thu, 25 May 2000 18:17:46 +0000 (+0000) Subject: rs6000.c (expand_block_move): Add 64-bit PowerPC doubleword move to STRING case. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=acad7ed35f094e0456334422554ef2558851367c;p=gcc.git rs6000.c (expand_block_move): Add 64-bit PowerPC doubleword move to STRING case. * rs6000.c (expand_block_move): Add 64-bit PowerPC doubleword move to STRING case. Use doubleword STRING move for TARGET_POWERPC64 when unaligned. * rs6000.h (CONST_OK_FOR_LETTER_P, 'J'): unsigned HOST_WIDE_INT. (RETURN_ADDR_RTX): Use COUNT and FRAME, not count and frame. (LEGITIMIZE_RELOAD_ADDRESS): unsigned HOST_WIDE_INT high. * rs6000.md: Name various internal patterns. From-SVN: r34174 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 06186fba383..8fdf38df4fd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2000-05-25 David Edelsohn + + * rs6000.c (expand_block_move): Add 64-bit PowerPC doubleword move + to STRING case. Use doubleword STRING move for TARGET_POWERPC64 + when unaligned. + * rs6000.h (CONST_OK_FOR_LETTER_P, 'J'): unsigned HOST_WIDE_INT. + (RETURN_ADDR_RTX): Use COUNT and FRAME, not count and frame. + (LEGITIMIZE_RELOAD_ADDRESS): unsigned HOST_WIDE_INT high. + * rs6000.md: Name various internal patterns. + 2000-05-25 Jan Hubicka * jump.c (invert_exp_1): Remove first argument, use pc_set diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index a55461efdb1..f0ad8f3d5e6 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -2369,7 +2369,20 @@ expand_block_move (operands) GEN_INT (move_bytes), align_rtx)); } - else if (bytes > 4 && ! TARGET_POWERPC64) + else if (bytes >= 8 && TARGET_POWERPC64 + /* 64-bit loads and stores require word-aligned displacements. */ + && (align >= 8 || (! STRICT_ALIGNMENT && align >= 4))) + { + move_bytes = 8; + tmp_reg = gen_reg_rtx (DImode); + emit_move_insn (tmp_reg, + expand_block_move_mem (DImode, + src_addr, orig_src)); + emit_move_insn (expand_block_move_mem (DImode, + dest_addr, orig_dest), + tmp_reg); + } + else if (bytes > 4) { /* move up to 8 bytes at a time */ move_bytes = (bytes > 8) ? 8 : bytes; emit_insn (gen_movstrsi_2reg (expand_block_move_mem (BLKmode, @@ -3000,7 +3013,7 @@ addrs_ok_for_quad_peep (addr1, addr2) offset1 = 0; } - /* Make sure the second address is a (mem (plus (reg) (const_int). */ + /* Make sure the second address is a (mem (plus (reg) (const_int))). */ if (GET_CODE (addr2) != PLUS) return 0; diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index 7d48daf7cb0..87d01009036 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -1056,7 +1056,7 @@ enum reg_class #define CONST_OK_FOR_LETTER_P(VALUE, C) \ ( (C) == 'I' ? (unsigned HOST_WIDE_INT) ((VALUE) + 0x8000) < 0x10000 \ - : (C) == 'J' ? ((VALUE) & (~ (HOST_WIDE_INT) 0xffff0000u)) == 0 \ + : (C) == 'J' ? ((VALUE) & (~ (unsigned HOST_WIDE_INT) 0xffff0000u)) == 0 \ : (C) == 'K' ? ((VALUE) & (~ (HOST_WIDE_INT) 0xffff)) == 0 \ : (C) == 'L' ? (((VALUE) & 0xffff) == 0 \ && ((VALUE) >> 31 == -1 || (VALUE) >> 31 == 0)) \ @@ -1622,8 +1622,8 @@ typedef struct rs6000_args /* The current return address is in link register (65). The return address of anything farther back is accessed normally at an offset of 8 from the frame pointer. */ -#define RETURN_ADDR_RTX(count, frame) \ - ((count == -1) \ +#define RETURN_ADDR_RTX(COUNT, FRAME) \ + (((COUNT) == -1) \ ? gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM) \ : gen_rtx_MEM (Pmode, \ memory_address \ @@ -1631,7 +1631,7 @@ typedef struct rs6000_args plus_constant (copy_to_reg \ (gen_rtx_MEM (Pmode, \ memory_address (Pmode, \ - frame))), \ + (FRAME)))), \ RETURN_ADDRESS_OFFSET)))) /* Definitions for register eliminations. @@ -1935,8 +1935,8 @@ do { \ { \ HOST_WIDE_INT val = INTVAL (XEXP (X, 1)); \ HOST_WIDE_INT low = ((val & 0xffff) ^ 0x8000) - 0x8000; \ - HOST_WIDE_INT high \ - = (((val - low) & 0xffffffffu) ^ 0x80000000u) - 0x80000000u; \ + unsigned HOST_WIDE_INT high \ + = (((val - low) & 0xffffffffu) ^ 0x80000000u) - 0x80000000u; \ \ /* Check for 32-bit overflow. */ \ if (high + low != val) \ diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index f58e6a1ead5..561762ccf78 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -7552,7 +7552,7 @@ } }") -(define_insn "" +(define_insn "*movsi_internal1" [(set (match_operand:SI 0 "nonimmediate_operand" "=r,r,r,m,r,r,r,r,r,*q,*c*l,*h") (match_operand:SI 1 "input_operand" "r,U,m,r,I,L,n,R,*h,r,r,0"))] "gpc_reg_operand (operands[0], SImode) @@ -7592,7 +7592,7 @@ operands[3] = GEN_INT (INTVAL (operands[1]) & 0xffff); }") -(define_insn "" +(define_insn "*movsi_internal2" [(set (match_operand:CC 2 "cc_reg_operand" "=x,?y") (compare:CC (match_operand:SI 1 "gpc_reg_operand" "r,r") (const_int 0))) @@ -8182,7 +8182,7 @@ } }") -(define_insn "*movdi_32" +(define_insn "*movdi_internal32" [(set (match_operand:DI 0 "nonimmediate_operand" "=r,r,m,f,f,m,r,r,r,r,r") (match_operand:DI 1 "input_operand" "r,m,r,f,m,f,IJK,n,G,H,F"))] "! TARGET_POWERPC64 @@ -8264,7 +8264,7 @@ operands[5] = GEN_INT (CONST_DOUBLE_LOW (operands[1])); }") -(define_insn "*movdi_64" +(define_insn "*movdi_internal64" [(set (match_operand:DI 0 "nonimmediate_operand" "=r,r,m,r,r,r,r,f,f,m,r,*h,*h") (match_operand:DI 1 "input_operand" "r,m,r,I,L,nF,R,f,m,f,*h,r,0"))] "TARGET_POWERPC64 @@ -8494,7 +8494,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); #endif }") -(define_insn "" +(define_insn "*movdi_internal2" [(set (match_operand:CC 2 "cc_reg_operand" "=x,?y") (compare:CC (match_operand:DI 1 "gpc_reg_operand" "r,r") (const_int 0))) @@ -8505,7 +8505,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); #" [(set_attr "type" "compare") (set_attr "length" "4,8")]) - + (define_split [(set (match_operand:CC 2 "cc_reg_not_cr0_operand" "") (compare:CC (match_operand:DI 1 "gpc_reg_operand" "") @@ -8517,7 +8517,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); (compare:CC (match_dup 0) (const_int 0)))] "") - + ;; TImode is similar, except that we usually want to compute the address into ;; a register and use lsi/stsi (the exception is during reload). MQ is also ;; clobbered in stsi for POWER, so we need a SCRATCH for it. @@ -10682,7 +10682,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); }") ;; Here are the actual compare insns. -(define_insn "" +(define_insn "*cmpsi_internal1" [(set (match_operand:CC 0 "cc_reg_operand" "=y") (compare:CC (match_operand:SI 1 "gpc_reg_operand" "r") (match_operand:SI 2 "reg_or_short_operand" "rI")))] @@ -10690,7 +10690,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); "{cmp%I2|cmpw%I2} %0,%1,%2" [(set_attr "type" "compare")]) -(define_insn "" +(define_insn "*cmpdi_internal1" [(set (match_operand:CC 0 "cc_reg_operand" "=y") (compare:CC (match_operand:DI 1 "gpc_reg_operand" "r") (match_operand:DI 2 "reg_or_short_operand" "rI")))] @@ -10726,7 +10726,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); operands[5] = GEN_INT (sextc); }") -(define_insn "" +(define_insn "*cmpsi_internal2" [(set (match_operand:CCUNS 0 "cc_reg_operand" "=y") (compare:CCUNS (match_operand:SI 1 "gpc_reg_operand" "r") (match_operand:SI 2 "reg_or_u_short_operand" "rK")))] @@ -10734,7 +10734,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); "{cmpl%I2|cmplw%I2} %0,%1,%W2" [(set_attr "type" "compare")]) -(define_insn "" +(define_insn "*cmpdi_internal2" [(set (match_operand:CCUNS 0 "cc_reg_operand" "=y") (compare:CCUNS (match_operand:DI 1 "gpc_reg_operand" "r") (match_operand:DI 2 "reg_or_u_short_operand" "rK")))] @@ -10787,7 +10787,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); [(set (match_dup 3) (compare:CCUNS (match_dup 1) (match_dup 2))) (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 4)))]) -(define_insn "" +(define_insn "*cmpsf_internal1" [(set (match_operand:CCFP 0 "cc_reg_operand" "=y") (compare:CCFP (match_operand:SF 1 "gpc_reg_operand" "f") (match_operand:SF 2 "gpc_reg_operand" "f")))] @@ -10795,7 +10795,7 @@ operands[2] = GEN_INT (INTVAL (operands[1]) >> 32); "fcmpu %0,%1,%2" [(set_attr "type" "fpcompare")]) -(define_insn "" +(define_insn "*cmpdf_internal1" [(set (match_operand:CCFP 0 "cc_reg_operand" "=y") (compare:CCFP (match_operand:DF 1 "gpc_reg_operand" "f") (match_operand:DF 2 "gpc_reg_operand" "f")))]