t-score-elf (MULTILIB_OPTIONS): Change.

	* config/score/t-score-elf (MULTILIB_OPTIONS): Change.
	* config/score/predicates.md (const_uimm5, sr0_operand, const_simm12,
	const_simm15, const_pow2, const_npow2): Added.
	* config/score/misc.md (insv, extv, extzv, movmemsi, 
	move_lbu_a/b, mov_lhu_a/b etc): Added and fix some bug.
	* config/score/score.c (score_address_cost, score_select_cc_mode): 
	Added.
	Change CONST_OK_FOR_LETTER_P/EXTRA_CONSTRAINT define.
	Update score_rtx_costs for MACRO TARGET_RTX_COSTS.
	Update score_print_operand.
	* config/score/score.h (DATA_ALIGNMENT, SELECT_CC_MODE): Added.
	Adjust register allocate order and update some macro define.
	* config/score/score-mdaux.c (mdx_unaligned_load, mdx_unsigned_store,
	mdx_block_move_straight, mdx_block_move_loop_head,
	mdx_block_move_loop_body, mdx_block_move_loop_foot, mdx_block_move_loop,
	mdx_block_move): Added.
	(mdx_movsicc, mdp_select_add_imm, mdp_select, mds_zero_extract_andi,
	mdp_limm): Updated and fix some bug and typo.
	* config/score/score.md (movqi/hi/si, add/sub/zero/ext): Updated.
	(movsf, movdf, doloop_end): Added.

From-SVN: r120570

gcc/ChangeLog

+2007-01-08  Chen Liqin  <liqin@sunnorth.com.cn>
+	* config/score/t-score-elf (MULTILIB_OPTIONS): Change.
+	* config/score/predicates.md (const_uimm5, sr0_operand, const_simm12,
+	const_simm15, const_pow2, const_npow2): Added.
+	* config/score/misc.md (insv, extv, extzv, movmemsi, 
+	move_lbu_a/b, mov_lhu_a/b etc): Added and fix some bug.
+	* config/score/score.c (score_address_cost, score_select_cc_mode): 
+	Added.
+	Change CONST_OK_FOR_LETTER_P/EXTRA_CONSTRAINT define.
+	Update score_rtx_costs for MACRO TARGET_RTX_COSTS.
+	Update score_print_operand.
+	* config/score/score.h (DATA_ALIGNMENT, SELECT_CC_MODE): Added.
+	Adjust register allocate order and update some macro define.
+	* config/score/score-mdaux.c (mdx_unaligned_load, mdx_unsigned_store,
+	mdx_block_move_straight, mdx_block_move_loop_head,
+	mdx_block_move_loop_body, mdx_block_move_loop_foot, mdx_block_move_loop,
+	mdx_block_move): Added.
+	(mdx_movsicc, mdp_select_add_imm, mdp_select, mds_zero_extract_andi,
+	mdp_limm): Updated and fix some bug and typo.
+	* config/score/score.md (movqi/hi/si, add/sub/zero/ext): Updated.
+	(movsf, movdf, doloop_end): Added.
+
 2007-01-08  Kazu Hirata  <kazu@codesourcery.com>
 
 	* config/arm/arm.c, config/arm/arm.h, config/arm/arm.md,

gcc/config/score/crti.asm

@@ -43,8 +43,8 @@
         .mask   0x00000000, 0
 _start:
         la      r28, _gp
-        la      r8, __bss_start
-        la      r9, __bss_end__
+        la      r8, _bss_start
+        la      r9, _bss_end__
         sub!    r9, r8
         srli!   r9, 2
         addi    r9, -1
@@ -91,8 +91,8 @@ _fini:
         .mask   0x00000000,0
 _start:
         la      r28, _gp
-        la      r8, __bss_start
-        la      r9, __bss_end__
+        la      r8, _bss_start
+        la      r9, _bss_end__
         sub!    r9, r8
         srli!   r9, 2
         addi    r9, -1
@@ -102,15 +102,10 @@ _start:
         sw      r9, [r8]+, 4
         bcnz    1b
         la      r0, _stack
-#       jl      _init
-#       la      r4, _end
-#       jl      _init_argv
         ldiu!   r4, 0
         ldiu!   r5, 0
-#       jl      main
         la      r29, main
         brl     r29
-#       jl      exit
         la      r29, exit
         brl     r29
         .end    _start

gcc/config/score/crtn.asm

@@ -59,4 +59,3 @@
         br      r3
 #endif
 
-

gcc/config/score/mul-div.S

@@ -242,7 +242,7 @@ _flush_cache:
         #nop!
         addi    r8, 16
         bcnz    2b
-        .cprestore      12              # pic used
+        .cprestore r0, 12               # pic used
         addi    r0, 8                   # pic used
         br      r3
 #endif
@@ -278,7 +278,7 @@ __mulsi3_loop2:
         cmpi.c  a1, 0
         bne     __mulsi3_loop
         mv      r4, t1
-        .cprestore 12                   # pic used
+        .cprestore r0, 12               # pic used
         addi    r0, 8                   # pic used
         br      ra
         .end    __mulsi3
@@ -334,7 +334,7 @@ __uds_loop3:
 __uds_exit:
         mv      a1, a0
         mv      r4, t4
-        .cprestore 12                   # pic used
+        .cprestore r0, 12               # pic used
         addi    r0, 8                   # pic used
         br      ra
         .end    __udivsi3
@@ -350,7 +350,7 @@ __umodsi3:
         la      r29, __udivsi3
         brl     r29
         mv      r4, a1
-        .cprestore 12                   # pic used
+        .cprestore r0, 12               # pic used
         addi    r0, 8                   # pic used
         br      t3
         .end    __umodsi3
@@ -383,7 +383,7 @@ __divsi3_adjust:
         bge     __divsi3_exit
         neg     r4, r4
 __divsi3_exit:
-        .cprestore 12                   # pic used
+        .cprestore r0, 12               # pic used
         addi    r0, 8                   # pic used
         br      t3
         .end    __divsi3

gcc/config/score/predicates.md

@@ -35,13 +35,11 @@
   (ior (match_operand 0 "const_call_insn_operand")
        (match_operand 0 "register_operand")))
 
-(define_predicate "const_bi_operand"
-  (and (match_code "const_int")
-       (match_test "CONST_OK_FOR_LETTER_P (INTVAL (op), 'J')")))
-
-(define_predicate "pindex_off_operand"
-  (and (match_code "const_int")
-       (match_test "CONST_OK_FOR_LETTER_P (INTVAL (op), 'P')")))
+(define_predicate "const_uimm5"
+  (match_code "const_int")
+{
+  return IMM_IN_RANGE (INTVAL (op), 5, 0);
+})
 
 (define_predicate "hireg_operand"
   (and (match_code "reg")
@@ -51,6 +49,10 @@
   (and (match_code "reg")
        (match_test "REGNO (op) == LO_REGNUM")))
 
+(define_predicate "sr0_operand"
+  (and (match_code "reg")
+       (match_test "REGNO (op) == CN_REGNUM")))
+
 (define_predicate "g32reg_operand"
   (and (match_code "reg")
        (match_test "GP_REG_P (REGNO (op))")))
@@ -61,3 +63,26 @@
 (define_predicate "branch_nz_operator"
   (match_code "eq,ne,lt,ge"))
 
+(define_predicate "const_simm12"
+  (match_code "const_int")
+{
+  return IMM_IN_RANGE (INTVAL (op), 12, 1);
+})
+
+(define_predicate "const_simm15"
+  (match_code "const_int")
+{
+  return IMM_IN_RANGE (INTVAL (op), 15, 1);
+})
+
+(define_predicate "const_pow2"
+  (match_code "const_int")
+{
+  return IMM_IS_POW_OF_2 ((unsigned HOST_WIDE_INT) INTVAL (op), 0, 31);
+})
+
+(define_predicate "const_npow2"
+  (match_code "const_int")
+{
+  return IMM_IS_POW_OF_2 (~(unsigned HOST_WIDE_INT) INTVAL (op), 0, 31);
+})

gcc/config/score/score-conv.h

@@ -45,7 +45,7 @@ extern int target_flags;
 
 #define CE_REG_P(REGNO)        REG_CONTAIN (REGNO, CE_REG_FIRST, CE_REG_NUM)
 
-#define UIMM_IN_RANGE(V, W)  ((V) >= 0 && (V) < ((HOST_WIDE_INT)1 << (W)))
+#define UIMM_IN_RANGE(V, W)  ((V) >= 0 && (V) < ((HOST_WIDE_INT) 1 << (W)))
 
 #define SIMM_IN_RANGE(V, W)                            \
   ((V) >= (-1 * ((HOST_WIDE_INT) 1 << ((W) - 1)))      \
@@ -54,6 +54,11 @@ extern int target_flags;
 #define IMM_IN_RANGE(V, W, S) \
   ((S) ? SIMM_IN_RANGE (V, W) : UIMM_IN_RANGE (V, W))
 
+#define IMM_IS_POW_OF_2(V, E1, E2)                \
+  ((V) >= ((unsigned HOST_WIDE_INT) 1 << (E1))     \
+   && (V) <= ((unsigned HOST_WIDE_INT) 1 << (E2))  \
+   && ((V) & ((V) - 1)) == 0)
+
 #define SCORE_STACK_ALIGN(LOC)          (((LOC) + 3) & ~3)
 
 #define SCORE_MAX_FIRST_STACK_STEP      (0x3ff0)

gcc/config/score/score-mdaux.h

@@ -69,8 +69,6 @@ void mda_gen_cmp (enum machine_mode mode);
 
 int mda_symbolic_constant_p (rtx x, enum score_symbol_type *symbol_type);
 
-bool mda_pindex_mem (rtx addr);
-
 int mda_bp (void);
 
 /* Machine Expand.  */
@@ -87,8 +85,6 @@ void mdx_call_value (rtx *ops, bool sibcall);
 /* Machine Split.  */
 void mds_movdi (rtx *ops);
 
-void mds_addsi (rtx *ops);
-
 void mds_zero_extract_andi (rtx *ops);
 
 /* Machine Print.  */
@@ -100,14 +96,21 @@ const char * mdp_linsn (rtx *ops, enum mda_mem_unit unit, bool sign);
 
 const char * mdp_sinsn (rtx *ops, enum mda_mem_unit unit);
 
-const char * mdp_add_imm_ucc (rtx *ops);
+const char * mdp_select_add_imm (rtx *ops, bool set_cc);
 
 const char * mdp_select (rtx *ops, const char *inst_pre,
-                        bool comu, const char *let);
+                        bool commu, const char *letter, bool set_cc);
 
 const char * mdp_limm (rtx *ops);
 
 const char * mdp_move (rtx *ops);
 
+/* Machine unaligned memory load/store. */
+bool mdx_unaligned_load (rtx* ops);
+
+bool mdx_unaligned_store (rtx* ops);
+
+bool mdx_block_move (rtx* ops);
+
 #endif
 

gcc/config/score/score-modes.def

@@ -21,6 +21,5 @@
 /* CC_NZmode should be used if the N (sign) and Z (zero) flag is set correctly.
    CC_Nmode should be used if only the N flag is set correctly.  */
 
-CC_MODE (CC_NZ);
 CC_MODE (CC_N);
-
+CC_MODE (CC_NZ);

gcc/config/score/score-protos.h

@@ -36,7 +36,7 @@ enum reg_class score_preferred_reload_class (rtx x, enum reg_class class);
 enum reg_class score_secondary_reload_class (enum reg_class class,
                                              enum machine_mode mode, rtx x);
 
-int score_const_ok_for_letter_p (int value, char c);
+int score_const_ok_for_letter_p (HOST_WIDE_INT value, char c);
 
 int score_extra_constraint (rtx op, char c);
 

gcc/config/score/score-version.h

@@ -18,4 +18,4 @@
    the Free Software Foundation, 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.  */
 
-#define SCORE_GCC_VERSION "1.1"
+#define SCORE_GCC_VERSION "1.2"

gcc/config/score/score.h

@@ -28,12 +28,13 @@ extern GTY(()) rtx cmp_op0;
 extern GTY(()) rtx cmp_op1;
 
 /* Controlling the Compilation Driver.  */
+#undef SWITCH_TAKES_ARG
 #define SWITCH_TAKES_ARG(CHAR) \
   (DEFAULT_SWITCH_TAKES_ARG (CHAR) || (CHAR) == 'G')
 
 /* CC1_SPEC is the set of arguments to pass to the compiler proper.  */
 #undef CC1_SPEC
-#define CC1_SPEC                 "%{!mel:-meb}"
+#define CC1_SPEC                 "%{G*} %{!mel:-meb}"
 
 #undef ASM_SPEC
 #define ASM_SPEC \
@@ -96,7 +97,7 @@ extern GTY(()) rtx cmp_op1;
 
 /* Allocation boundary (in *bits*) for storing arguments in argument list.  */
 #define PARM_BOUNDARY                  BITS_PER_WORD
-#define STACK_BOUNDARY                 64
+#define STACK_BOUNDARY                 BITS_PER_WORD
 
 /* Allocation boundary (in *bits*) for the code of a function.  */
 #define FUNCTION_BOUNDARY              BITS_PER_WORD
@@ -121,6 +122,35 @@ extern GTY(()) rtx cmp_op1;
         || TREE_CODE (TYPE) == UNION_TYPE                                \
         || TREE_CODE (TYPE) == RECORD_TYPE)) ? BITS_PER_WORD : (ALIGN))
 
+/* If defined, a C expression to compute the alignment given to a
+   constant that is being placed in memory.  EXP is the constant
+   and ALIGN is the alignment that the object would ordinarily have.
+   The value of this macro is used instead of that alignment to align
+   the object.
+
+   If this macro is not defined, then ALIGN is used.
+
+   The typical use of this macro is to increase alignment for string
+   constants to be word aligned so that `strcpy' calls that copy
+   constants can be done inline.  */
+#define CONSTANT_ALIGNMENT(EXP, ALIGN)                                  \
+  ((TREE_CODE (EXP) == STRING_CST  || TREE_CODE (EXP) == CONSTRUCTOR)   \
+   && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN))
+
+/* If defined, a C expression to compute the alignment for a local
+   variable.  TYPE is the data type, and ALIGN is the alignment that
+   the object would ordinarily have.  The value of this macro is used
+   instead of that alignment to align the object.
+
+   If this macro is not defined, then ALIGN is used.
+
+   One use of this macro is to increase alignment of medium-size
+   data to make it all fit in fewer cache lines.  */
+#define LOCAL_ALIGNMENT(TYPE, ALIGN)                                    \
+  ((TREE_CODE (TYPE) == ARRAY_TYPE                                      \
+    && TYPE_MODE (TREE_TYPE (TYPE)) == QImode                           \
+    && (ALIGN) < BITS_PER_WORD) ? BITS_PER_WORD : (ALIGN))
+
 /* Alignment of field after `int : 0' in a structure.  */
 #define EMPTY_FIELD_BOUNDARY           32
 
@@ -209,7 +239,7 @@ extern GTY(()) rtx cmp_op1;
 {                                                        \
   /* General Purpose Registers  */                       \
   1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,        \
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1,        \
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1,        \
   /* Control Registers  */                               \
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,        \
   /* CEH/ CEL/ CNT/ LCR/ SCR / ARG_POINTER_REGNUM/ FRAME_POINTER_REGNUM */\
@@ -245,8 +275,8 @@ extern GTY(()) rtx cmp_op1;
 }
 
 #define REG_ALLOC_ORDER                                                   \
-{   0,  1,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17,        \
-   18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  2,  3,        \
+{   0,  1,  6,  7,  8,  9, 10, 11,  4,  5, 22, 23, 24, 25, 26, 27,        \
+   12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 28, 29, 30, 31,  2,  3,        \
    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,        \
    48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,        \
    64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,        \
@@ -607,8 +637,8 @@ typedef struct score_args
 #define HAVE_PRE_DECREMENT              1
 #define HAVE_POST_INCREMENT             1
 #define HAVE_POST_DECREMENT             1
-#define HAVE_PRE_MODIFY_DISP            0
-#define HAVE_POST_MODIFY_DISP           0
+#define HAVE_PRE_MODIFY_DISP            1
+#define HAVE_POST_MODIFY_DISP           1
 #define HAVE_PRE_MODIFY_REG             0
 #define HAVE_POST_MODIFY_REG            0
 
@@ -660,6 +690,13 @@ typedef struct score_args
 
 #define LEGITIMATE_CONSTANT_P(X)        1
 
+/* Condition Code Status.  */
+#define SELECT_CC_MODE(OP, X, Y)        score_select_cc_mode (OP, X, Y)
+
+/* Return nonzero if SELECT_CC_MODE will never return MODE for a
+   floating point inequality comparison.  */
+#define REVERSIBLE_CC_MODE(MODE)        1
+
 /* Describing Relative Costs of Operations  */
 /* Compute extra cost of moving data between one register class and another.  */
 #define REGISTER_MOVE_COST(MODE, FROM, TO) \
@@ -767,18 +804,18 @@ typedef struct score_args
                                                                           \
   "c1r0", "c1r1", "c1r2", "c1r3", "c1r4", "c1r5", "c1r6", "c1r7",         \
   "c1r8", "c1r9", "c1r10", "c1r11", "c1r12", "c1r13", "c1r14", "c1r15",   \
-  "c1r16", "c1r17", "c1r18", "c1r19", "c1r20", "c1r21", "c1r22", "c1r23",\
-  "c1r24", "c1r25", "c1r26", "c1r27", "c1r28", "c1r29", "c1r30", "c1r31",\
+  "c1r16", "c1r17", "c1r18", "c1r19", "c1r20", "c1r21", "c1r22", "c1r23", \
+  "c1r24", "c1r25", "c1r26", "c1r27", "c1r28", "c1r29", "c1r30", "c1r31", \
                                                                           \
   "c2r0", "c2r1", "c2r2", "c2r3", "c2r4", "c2r5", "c2r6", "c2r7",         \
   "c2r8", "c2r9", "c2r10", "c2r11", "c2r12", "c2r13", "c2r14", "c2r15",   \
-  "c2r16", "c2r17", "c2r18", "c2r19", "c2r20", "c2r21", "c2r22", "c2r23",\
-  "c2r24", "c2r25", "c2r26", "c2r27", "c2r28", "c2r29", "c2r30", "c2r31",\
+  "c2r16", "c2r17", "c2r18", "c2r19", "c2r20", "c2r21", "c2r22", "c2r23", \
+  "c2r24", "c2r25", "c2r26", "c2r27", "c2r28", "c2r29", "c2r30", "c2r31", \
                                                                           \
   "c3r0", "c3r1", "c3r2", "c3r3", "c3r4", "c3r5", "c3r6", "c3r7",         \
   "c3r8", "c3r9", "c3r10", "c3r11", "c3r12", "c3r13", "c3r14", "c3r15",   \
-  "c3r16", "c3r17", "c3r18", "c3r19", "c3r20", "c3r21", "c3r22", "c3r23",\
-  "c3r24", "c3r25", "c3r26", "c3r27", "c3r28", "c3r29", "c3r30", "c3r31",\
+  "c3r16", "c3r17", "c3r18", "c3r19", "c3r20", "c3r21", "c3r22", "c3r23", \
+  "c3r24", "c3r25", "c3r26", "c3r27", "c3r28", "c3r29", "c3r30", "c3r31", \
 }
 
 /* Print operand X (an rtx) in assembler syntax to file FILE.  */
@@ -907,4 +944,4 @@ struct extern_list GTY ((chain_next ("%h.next")))
   int size;                             /* size in bytes  */
 };
 
-extern GTY (()) struct extern_list      *extern_head ;
+extern GTY (()) struct extern_list      *extern_head;

gcc/config/score/t-score-elf

@@ -35,7 +35,7 @@ dp-bit.c: $(srcdir)/config/fp-bit.c
 # without the $gp register.
 TARGET_LIBGCC2_CFLAGS = -G 0
 
-MULTILIB_OPTIONS = fPIC mel mscore7
+MULTILIB_OPTIONS = mmac mel fPIC
 MULTILIB_MATCHES = fPIC=fpic
 
 EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
@@ -43,4 +43,3 @@ EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
 
-