diff options
| author | Anatoly Sokolov <aesok@post.ru> | 2007-01-17 21:42:58 +0300 |
|---|---|---|
| committer | Anatoly Sokolov <aesok@gcc.gnu.org> | 2007-01-17 21:42:58 +0300 |
| commit | dd6d1f8c3f8cd06fa2aa436de20a88c46a84d33c (patch) | |
| tree | 5308ef5b9dccfd7d6ce87c837a5fad63b801fa09 /gcc/config/avr/libgcc.S | |
| parent | efb7e1e02617b779d8bd376d9dcccd0cdb4d3a94 (diff) | |
| download | gcc-dd6d1f8c3f8cd06fa2aa436de20a88c46a84d33c.zip gcc-dd6d1f8c3f8cd06fa2aa436de20a88c46a84d33c.tar.gz gcc-dd6d1f8c3f8cd06fa2aa436de20a88c46a84d33c.tar.bz2 | |
avr.h (AVR_HAVE_LPMX): New macro.
* config/avr/avr.h (AVR_HAVE_LPMX): New macro.
(AVR_ENHANCED): Rename to ...
(AVR_HAVE_MUL): ... new.
(avr_enhanced_p): Rename to ...
(avr_have_mul_p): ... new.
(TARGET_CPU_CPP_BUILTINS): Use 'avr_have_mul_p' instead of
'avr_enhanced_p' for "__AVR_ENHANCED__". Define "__AVR_HAVE_MUL__".
* config/avr/avr.c (avr_enhanced_p): Rename to ...
(avr_have_mul_p): ... new.
(base_arch_s): Rename 'enhanced' to 'have_mul'.
(avr_override_options): Use 'avr_have_mul_p' and 'have_mul' instead of
'avr_enhanced_p' and 'enhanced'.
(ashlhi3_out, ashrhi3_out, lshrhi3_out, avr_rtx_costs): Use
AVR_HAVE_MUL instead of AVR_ENHANCED.
* avr.md (*tablejump_enh): Use AVR_HAVE_LPMX instead of AVR_ENHANCED.
(mulqi3, *mulqi3_enh, *mulqi3_call, mulqihi3, umulqihi3, mulhi3,
*mulhi3_enh, *mulhi3_call, mulsi3, *mulsi3_call): Use AVR_HAVE_MUL
instead of AVR_ENHANCED.
(*tablejump_enh): Use AVR_HAVE_LPMX instead of AVR_ENHANCED.
* libgcc.S: Use __AVR_HAVE_MUL__ instead of __AVR_ENHANCED__.
(__tablejump__): Use __AVR_HAVE_LPMX__ instead of __AVR_ENHANCED__.
From-SVN: r120865
Diffstat (limited to 'gcc/config/avr/libgcc.S')
| -rw-r--r-- | gcc/config/avr/libgcc.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/config/avr/libgcc.S b/gcc/config/avr/libgcc.S index d542bc8..c6814fe 100644 --- a/gcc/config/avr/libgcc.S +++ b/gcc/config/avr/libgcc.S @@ -1,5 +1,5 @@ /* -*- Mode: Asm -*- */ -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2007 Free Software Foundation, Inc. Contributed by Denis Chertykov <denisc@overta.ru> This file is free software; you can redistribute it and/or modify it @@ -56,7 +56,7 @@ Boston, MA 02110-1301, USA. */ .endm /* Note: mulqi3, mulhi3 are open-coded on the enhanced core. */ -#if !defined (__AVR_ENHANCED__) +#if !defined (__AVR_HAVE_MUL__) /******************************************************* Multiplication 8 x 8 *******************************************************/ @@ -159,7 +159,7 @@ __mulhi3_exit: .endfunc #endif /* defined (L_mulhi3) */ -#endif /* !defined (__AVR_ENHANCED__) */ +#endif /* !defined (__AVR_HAVE_MUL__) */ #if defined (L_mulhisi3) .global __mulhisi3 @@ -217,7 +217,7 @@ __umulhisi3: .global __mulsi3 .func __mulsi3 __mulsi3: -#if defined (__AVR_ENHANCED__) +#if defined (__AVR_HAVE_MUL__) mul r_arg1L, r_arg2L movw r_resL, r0 mul r_arg1H, r_arg2H @@ -281,7 +281,7 @@ __mulsi3_exit: mov_h r_arg1H,r_resH mov_l r_arg1L,r_resL ret -#endif /* !defined (__AVR_ENHANCED__) */ +#endif /* defined (__AVR_HAVE_MUL__) */ #undef r_arg1L #undef r_arg1H #undef r_arg1HL @@ -668,7 +668,7 @@ __tablejump2__: rol r31 .global __tablejump__ __tablejump__: -#if defined (__AVR_ENHANCED__) +#if defined (__AVR_HAVE_LPMX__) lpm __tmp_reg__, Z+ lpm r31, Z mov r30, __tmp_reg__ |