Hi Steve. Why was the -mreorder option removed? This option saved me about 100 bytes of code space which was very important. Could you point me in the direction of the equivalent option.
-----Original Message----- From: Steve Underwood [mailto:copp...@users.sourceforge.net] Sent: Thursday, August 28, 2003 7:20 AM To: mspgcc-comm...@lists.sourceforge.net Subject: [Mspgcc-commits] CVS: gcc/gcc-3.3/gcc/config/msp430 libgcc.S,1.8,1.9 msp430.c,1.70,1.71 msp430.h,1.22,1.23 msp430.md,1.57,1.58 Update of /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430 In directory sc8-pr-cvs1:/tmp/cvs-serv6978/gcc/gcc-3.3/gcc/config/msp430 Modified Files: libgcc.S msp430.c msp430.h msp430.md Log Message: Cleanup of -m options to make the names more consistent -mhwmul-no-int -> -mnoint-hwmul -mforce-hw-mul -> -mforce-hwmul -mint8 removed -mreorder removed attribute hwmul_no_int -> noint_hwmul These will cause incompatibilities, but are unlucky to affect more than one or two people. Index: libgcc.S =================================================================== RCS file: /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430/libgcc.S,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -d -r1.8 -r1.9 --- libgcc.S 3 Feb 2003 11:28:56 -0000 1.8 +++ libgcc.S 28 Aug 2003 14:20:17 -0000 1.9 @@ -180,7 +180,7 @@ b - reg:SI 12 clobber res - reg: SI 14 */ -#ifndef MSP430_HAS_HW_MUL +#ifndef MSP430_HAS_HWMUL .global __mulsi3 .func __mulsi3 @@ -1012,7 +1012,7 @@ /************************************************************** * Multiplication 64 = 64 x 64 **************************************************************/ -#if defined(L_muldi3) && !defined(MSP430_HAS_HW_MUL) +#if defined(L_muldi3) && !defined(MSP430_HAS_HWMUL) #define r_reshh r11 /* res = arg1 * arg2 */ #define r_reshl r10 @@ -1097,7 +1097,7 @@ .endfunc #endif -#if defined(L_muldi3) && defined(MSP430_HAS_HW_MUL) +#if defined(L_muldi3) && defined(MSP430_HAS_HWMUL) __MPY=0x130 __MPYS=0x132 Index: msp430.c =================================================================== RCS file: /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430/msp430.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -w -d -r1.70 -r1.71 --- msp430.c 22 Aug 2003 11:25:08 -0000 1.70 +++ msp430.c 28 Aug 2003 14:20:17 -0000 1.71 @@ -78,7 +78,7 @@ /* aux functions */ static int msp430_cc_source PARAMS ((rtx, enum rtx_code, rtx, rtx)); static int msp430_func_num_saved_regs PARAMS ((void)); -static int hwmul_no_int_function_p PARAMS ((tree func)); +static int noint_hwmul_function_p PARAMS ((tree func)); static int interrupt_function_p PARAMS ((tree func)); static int msp430_naked_function_p PARAMS ((tree func)); static int signal_function_p PARAMS ((tree func)); @@ -229,7 +229,7 @@ {"critical", 0, 0, true, false, false, msp430_handle_fndecl_attribute}, {"reentrant", 0, 0, true, false, false, msp430_handle_fndecl_attribute}, {"saveprologue", 0, 0, true, false, false, msp430_handle_fndecl_attribute}, - {"hwmul_no_int", 0, 0, true, false, false, msp430_handle_fndecl_attribute}, + {"noint_hwmul", 0, 0, true, false, false, msp430_handle_fndecl_attribute}, {NULL, 0, 0, false, false, false, NULL} }; @@ -326,25 +326,25 @@ } static int -hwmul_no_int_function_p (func) +noint_hwmul_function_p (func) tree func; { tree a; if (TREE_CODE (func) != FUNCTION_DECL) abort (); - a = lookup_attribute ("hwmul_no_int", DECL_ATTRIBUTES (func)); + a = lookup_attribute ("noint_hwmul", DECL_ATTRIBUTES (func)); return a != NULL_TREE; } int -msp430_current_function_hwmul_no_int_function_p (void) +msp430_current_function_noint_hwmul_function_p (void) { int rval; if (!current_function_decl) - return (TARGET_HWMUL_NO_INT); - rval = hwmul_no_int_function_p (current_function_decl); + return (TARGET_NOINT_HWMUL); + rval = noint_hwmul_function_p (current_function_decl); - return (TARGET_HWMUL_NO_INT || rval); + return (TARGET_NOINT_HWMUL || rval); } static int @@ -392,9 +392,9 @@ return; } - msp430_has_hwmul = t->has_hwmul || TARGET_HW_MUL; + msp430_has_hwmul = t->has_hwmul || TARGET_HWMUL; - if (TARGET_NO_HW_MUL) + if (TARGET_NO_HWMUL) msp430_has_hwmul = 0; msp430_case_values_threshold = 8; /* ? or there is a better value ? */ @@ -9124,7 +9124,7 @@ if (op0mode == QImode) m_reslo = gen_lowpart (QImode, reslo_rtx); - if (!MSP430_HWMUL_NO_INT) + if (!MSP430_NOINT_HWMUL) emit_insn (gen_reent_in ()); LOAD_MPYS (operands[1]); @@ -9134,7 +9134,7 @@ if (sext) emit_insn (gen_extendqihi2 (op2_rtx, m_op2)); - if (MSP430_HWMUL_NO_INT) + if (MSP430_NOINT_HWMUL) { emit_move_insn (operands[0], m_reslo); } @@ -9193,7 +9193,7 @@ m_mpy = gen_lowpart (QImode, mpy_rtx); m_op2 = gen_lowpart (QImode, op2_rtx); - if (!MSP430_HWMUL_NO_INT) + if (!MSP430_NOINT_HWMUL) emit_insn (gen_reent_in ()); LOAD_MPY (operands[1]); @@ -9201,7 +9201,7 @@ LOAD_OP2 (operands[2]); emit_insn (gen_zero_extendqihi2 (op2_rtx, m_op2)); - if (MSP430_HWMUL_NO_INT) + if (MSP430_NOINT_HWMUL) emit_move_insn (operands[0], m_reslo); else emit_insn (gen_fetch_result_hi (operands[0])); @@ -9250,13 +9250,13 @@ emit_move_insn (operands[0], r14); return 1; } - if (!MSP430_HWMUL_NO_INT) + if (!MSP430_NOINT_HWMUL) emit_insn (gen_reent_in ()); LOAD_MPYS (operands[1]); LOAD_OP2 (operands[2]); - if (MSP430_HWMUL_NO_INT) + if (MSP430_NOINT_HWMUL) { emit_move_insn (gen_lowpart (HImode, operands[0]), reslo_rtx); emit_move_insn (gen_highpart (HImode, operands[0]), reshi_rtx); @@ -9309,13 +9309,13 @@ return 1; } - if (!MSP430_HWMUL_NO_INT) + if (!MSP430_NOINT_HWMUL) emit_insn (gen_reent_in ()); LOAD_MPY (operands[1]); LOAD_OP2 (operands[2]); - if (MSP430_HWMUL_NO_INT) + if (MSP430_NOINT_HWMUL) { emit_move_insn (gen_lowpart (HImode, operands[0]), reslo_rtx); emit_move_insn (gen_highpart (HImode, operands[0]), reshi_rtx); Index: msp430.h =================================================================== RCS file: /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430/msp430.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -w -d -r1.22 -r1.23 --- msp430.h 14 Aug 2003 13:17:16 -0000 1.22 +++ msp430.h 28 Aug 2003 14:20:18 -0000 1.23 @@ -52,20 +52,20 @@ #define MASK_RTL_DUMP 0x00000010 #define MASK_ALL_DEBUG 0x00000FE0 -#define MASK_FORCE_HW_MUL 0x00001000 +#define MASK_FORCE_HWMUL 0x00001000 #define MASK_INT8 0x00002000 #define MASK_IAR 0x00004000 #define MASK_NO_STACK_INIT 0x00008000 #define MASK_NO_VOLAT_WRKAR 0x00010000 #define MASK_REORDER 0x00020000 #define MASK_INLINESIHWMUL 0x00040000 -#define MASK_NO_HW_MUL 0x00100000 -#define MASK_HWMUL_NO_INT 0x00200000 +#define MASK_NO_HWMUL 0x00100000 +#define MASK_NOINT_HWMUL 0x00200000 #define MASK_SAVE_PROLOGUE 0x00400000 -#define TARGET_NO_HW_MUL (target_flags & MASK_NO_HW_MUL) -#define TARGET_HW_MUL (target_flags & MASK_FORCE_HW_MUL) -#define TARGET_HWMUL_NO_INT (target_flags & MASK_HWMUL_NO_INT) +#define TARGET_NO_HWMUL (target_flags & MASK_NO_HWMUL) +#define TARGET_HWMUL (target_flags & MASK_FORCE_HWMUL) +#define TARGET_NOINT_HWMUL (target_flags & MASK_NOINT_HWMUL) #define TARGET_RTL_DUMP (target_flags & MASK_RTL_DUMP) #define TARGET_ALL_DEBUG (target_flags & MASK_ALL_DEBUG) #define TARGET_INT8 (target_flags & MASK_INT8) @@ -80,15 +80,13 @@ #define TARGET_SWITCHES { \ { "rtl", MASK_RTL_DUMP, NULL }, \ { "deb", MASK_ALL_DEBUG, NULL }, \ - { "int8", MASK_INT8, N_("Assume int to be 8 bit integer") }, \ - { "force-hw-mul", MASK_FORCE_HW_MUL,N_("Force hardware multiplier") },\ + { "force-hwmul", MASK_FORCE_HWMUL,N_("Force hardware multiplier") },\ + { "disable-hwmul", MASK_NO_HWMUL, N_("Disable hardware multiplier") }, \ + { "inline-hwmul", MASK_INLINESIHWMUL, N_("Issue inline multiplication code for 32-bit integers") }, \ + { "noint-hwmul", MASK_NOINT_HWMUL, ("Assume interrupt routine does not do hardware multiply")}, \ { "IAR",MASK_IAR,N_("Produce IAR assembler syntax") }, \ { "no-stack-init",MASK_NO_STACK_INIT,N_("No stack init in main()") }, \ { "no-volatile-workaround",MASK_NO_STACK_INIT,N_("Do not perform volatile workaround for bitwise operations") }, \ - { "reorder", MASK_REORDER, N_("Reverse registers allocation order") }, \ - { "inline-hwmul", MASK_INLINESIHWMUL, N_("Issue inline multiplication code for 32-bit integers") }, \ - { "disable-hwmul", MASK_NO_HW_MUL, N_("Disable hardware multiplier") }, \ - { "hwmul-no-int", MASK_HWMUL_NO_INT, ("Assume interrupt routine does not do hardware multiply")}, \ { "save-prologue",MASK_SAVE_PROLOGUE, ("Use subroutine call for function prologue/epilogue when possible")}, \ { "", 0, NULL } \ } @@ -101,8 +99,8 @@ #define MSP430_HAS_HWMUL (msp430_has_hwmul) -int msp430_current_function_hwmul_no_int_function_p(void); -#define MSP430_HWMUL_NO_INT (msp430_current_function_hwmul_no_int_function_p()) +int msp430_current_function_noint_hwmul_function_p(void); +#define MSP430_NOINT_HWMUL (msp430_current_function_noint_hwmul_function_p()) #define TARGET_OPTIONS { \ { "init-stack=", &msp430_init_stack, N_("Specify the initial stack address") }, \ Index: msp430.md =================================================================== RCS file: /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430/msp430.md,v retrieving revision 1.57 retrieving revision 1.58 diff -u -w -d -r1.57 -r1.58 --- msp430.md 14 Aug 2003 16:59:18 -0000 1.57 +++ msp430.md 28 Aug 2003 14:20:18 -0000 1.58 @@ -61,7 +61,7 @@ (const_string "yes") (const_string "no")))) -(define_attr "msp430_hwmul_no_int" "" (symbol_ref "MSP430_HWMUL_NO_INT")) +(define_attr "msp430_noint_hwmul" "" (symbol_ref "MSP430_NOINT_HWMUL")) ;; The size of instructions in bytes. ;; XXX may depend from "cc" @@ -659,14 +659,14 @@ (define_insn "*mulsi3hw_call_ni" [(set (reg:SI 14) (mult:SI (reg:SI 10) (reg:SI 12)))] - "(!TARGET_INLINESIHWMUL) && MSP430_HWMUL_NO_INT" + "(!TARGET_INLINESIHWMUL) && MSP430_NOINT_HWMUL" "call #__umulsi3hw" [(set_attr "length" "2") (set_attr "cc" "clobber")]) (define_insn "*mulsi3hw_call_ie" [(set (reg:SI 14) (mult:SI (reg:SI 10) (reg:SI 12)))] - "(!TARGET_INLINESIHWMUL) && !MSP430_HWMUL_NO_INT" + "(!TARGET_INLINESIHWMUL) && !MSP430_NOINT_HWMUL" "push r2 dint call #__umulsi3hw @@ -676,7 +676,7 @@ (define_insn "*mulsi3hw_inline_ni" [(set (reg:SI 14) (mult:SI (reg:SI 10) (reg:SI 12)))] - "TARGET_INLINESIHWMUL && MSP430_HAS_HWMUL && MSP430_HWMUL_NO_INT" + "TARGET_INLINESIHWMUL && MSP430_HAS_HWMUL && MSP430_NOINT_HWMUL" "mov r12, &__MPY mov r10, &__OP2 mov r12, &__MAC @@ -691,7 +691,7 @@ (define_insn "*mulsi3hw_inline_ie" [(set (reg:SI 14) (mult:SI (reg:SI 10) (reg:SI 12)))] - "TARGET_INLINESIHWMUL && MSP430_HAS_HWMUL && !MSP430_HWMUL_NO_INT" + "TARGET_INLINESIHWMUL && MSP430_HAS_HWMUL && !MSP430_NOINT_HWMUL" "push r2 dint nop ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Mspgcc-commits mailing list mspgcc-comm...@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mspgcc-commits
