[AVR][committed] Remove AVR_MEGA macro.
Anatoly Sokolov
aesok@post.ru
Sun Apr 6 21:01:00 GMT 2008
Hello.
This patch for AVR backend, remove the AVR_MEGA macro and use AVR_HAVE_JMP_CALL instead.
Anatoly.
2008-04-06 Anatoly Sokolov <aesok@post.ru>
* config/avr/avr.h (avr_mega_p): Remove declaration.
(AVR_MEGA): Remove macro.
* config/avr/avr.c (avr_mega_p): Remove variable.
(avr_override_options): Remove inicializion of avr_mega_p.
Use AVR_HAVE_JMP_CALL instead of AVR_MEGA.
(print_operand): Use AVR_HAVE_JMP_CALL instead of AVR_MEGA.
(avr_jump_mode): (Ditto.).
(avr_output_progmem_section_asm_op): (Ditto.).
(avr_asm_init_sections): (Ditto.).
(avr_asm_init_sections): (Ditto.).
(avr_rtx_costs): (Ditto.).
* config/avr/avr.md: (Ditto.).
* config/avr/avr.h: Use '__AVR_HAVE_JMP_CALL__' instead of
'__AVR_MEGA__'.
Index: gcc/config/avr/libgcc.S
===================================================================
--- gcc/config/avr/libgcc.S (revision 133954)
+++ gcc/config/avr/libgcc.S (working copy)
@@ -784,7 +784,7 @@
/* __do_global_ctors and __do_global_dtors are only necessary
if there are any constructors/destructors. */
-#if defined (__AVR_MEGA__)
+#if defined (__AVR_HAVE_JMP_CALL__)
#define XCALL call
#else
#define XCALL rcall
Index: gcc/config/avr/avr.md
===================================================================
--- gcc/config/avr/avr.md (revision 133954)
+++ gcc/config/avr/avr.md (working copy)
@@ -31,7 +31,7 @@
;; o Displacement for (mem (plus (reg) (const_int))) operands.
;; p POST_INC or PRE_DEC address as a pointer (X, Y, Z)
;; r POST_INC or PRE_DEC address as a register (r26, r28, r30)
-;; ~ Output 'r' if not AVR_MEGA.
+;; ~ Output 'r' if not AVR_HAVE_JMP_CALL.
;; ! Output 'e' if AVR_HAVE_EIJMP_EICALL.
;; UNSPEC usage:
@@ -74,7 +74,7 @@
(const_string "no"))))
(define_attr "mcu_mega" "yes,no"
- (const (if_then_else (symbol_ref "AVR_MEGA")
+ (const (if_then_else (symbol_ref "AVR_HAVE_JMP_CALL")
(const_string "yes")
(const_string "no"))))
@@ -2260,7 +2260,7 @@
(label_ref (match_operand 0 "" "")))]
""
"*{
- if (AVR_MEGA && get_attr_length (insn) != 1)
+ if (AVR_HAVE_JMP_CALL && get_attr_length (insn) != 1)
return AS1 (jmp,%0);
return AS1 (rjmp,%0);
}"
@@ -2412,7 +2412,7 @@
UNSPEC_INDEX_JMP))
(use (label_ref (match_operand 1 "" "")))
(clobber (match_dup 0))]
- "AVR_MEGA && TARGET_CALL_PROLOGUES"
+ "AVR_HAVE_JMP_CALL && TARGET_CALL_PROLOGUES"
"jmp __tablejump2__"
[(set_attr "length" "2")
(set_attr "cc" "clobber")])
@@ -2422,7 +2422,7 @@
UNSPEC_INDEX_JMP))
(use (label_ref (match_operand 1 "" "")))
(clobber (match_dup 0))]
- "AVR_MEGA && AVR_HAVE_LPMX"
+ "AVR_HAVE_JMP_CALL && AVR_HAVE_LPMX"
"lsl r30
rol r31
lpm __tmp_reg__,Z+
Index: gcc/config/avr/avr.c
===================================================================
--- gcc/config/avr/avr.c (revision 133954)
+++ gcc/config/avr/avr.c (working copy)
@@ -105,9 +105,6 @@
section *progmem_section;
-/* More than 8K of program memory: use "call" and "jmp". */
-int avr_mega_p = 0;
-
/* Core have 'MUL*' instructions. */
int avr_have_mul_p = 0;
@@ -360,13 +357,13 @@
base = &avr_arch_types[t->arch];
avr_asm_only_p = base->asm_only;
avr_have_mul_p = base->have_mul;
- avr_mega_p = base->have_jmp_call;
avr_have_movw_lpmx_p = base->have_movw_lpmx;
avr_base_arch_macro = base->macro;
avr_extra_arch_macro = t->macro;
if (optimize && !TARGET_NO_TABLEJUMP)
- avr_case_values_threshold = (!AVR_MEGA || TARGET_CALL_PROLOGUES) ? 8 : 17;
+ avr_case_values_threshold =
+ (!AVR_HAVE_JMP_CALL || TARGET_CALL_PROLOGUES) ? 8 : 17;
tmp_reg_rtx = gen_rtx_REG (QImode, TMP_REGNO);
zero_reg_rtx = gen_rtx_REG (QImode, ZERO_REGNO);
@@ -1148,7 +1145,7 @@
if (code == '~')
{
- if (!AVR_MEGA)
+ if (!AVR_HAVE_JMP_CALL)
fputc ('r', file);
}
else if (code == '!')
@@ -1323,7 +1320,7 @@
return 1;
else if (-2046 <= jump_distance && jump_distance <= 2045)
return 2;
- else if (AVR_MEGA)
+ else if (AVR_HAVE_JMP_CALL)
return 3;
return 2;
@@ -4773,7 +4770,7 @@
{
fprintf (asm_out_file,
"\t.section .progmem.gcc_sw_table, \"%s\", @progbits\n",
- AVR_MEGA ? "a" : "ax");
+ AVR_HAVE_JMP_CALL ? "a" : "ax");
/* Should already be aligned, this is just to be safe if it isn't. */
fprintf (asm_out_file, "\t.p2align 1\n");
}
@@ -4783,7 +4780,7 @@
static void
avr_asm_init_sections (void)
{
- progmem_section = get_unnamed_section (AVR_MEGA ? 0 : SECTION_CODE,
+ progmem_section = get_unnamed_section (AVR_HAVE_JMP_CALL ? 0 : SECTION_CODE,
avr_output_progmem_section_asm_op,
NULL);
readonly_data_section = data_section;
@@ -5068,7 +5065,7 @@
if (AVR_HAVE_MUL)
*total = COSTS_N_INSNS (optimize_size ? 3 : 4);
else if (optimize_size)
- *total = COSTS_N_INSNS (AVR_MEGA ? 2 : 1);
+ *total = COSTS_N_INSNS (AVR_HAVE_JMP_CALL ? 2 : 1);
else
return false;
break;
@@ -5077,7 +5074,7 @@
if (AVR_HAVE_MUL)
*total = COSTS_N_INSNS (optimize_size ? 7 : 10);
else if (optimize_size)
- *total = COSTS_N_INSNS (AVR_MEGA ? 2 : 1);
+ *total = COSTS_N_INSNS (AVR_HAVE_JMP_CALL ? 2 : 1);
else
return false;
break;
@@ -5094,7 +5091,7 @@
case UDIV:
case UMOD:
if (optimize_size)
- *total = COSTS_N_INSNS (AVR_MEGA ? 2 : 1);
+ *total = COSTS_N_INSNS (AVR_HAVE_JMP_CALL ? 2 : 1);
else
return false;
*total += avr_operand_rtx_cost (XEXP (x, 0), mode, code);
Index: gcc/config/avr/avr.h
===================================================================
--- gcc/config/avr/avr.h (revision 133954)
+++ gcc/config/avr/avr.h (working copy)
@@ -96,7 +96,6 @@
extern const char *avr_base_arch_macro;
extern const char *avr_extra_arch_macro;
-extern int avr_mega_p;
extern int avr_have_mul_p;
extern int avr_asm_only_p;
extern int avr_have_movw_lpmx_p;
@@ -104,7 +103,6 @@
extern GTY(()) section *progmem_section;
#endif
-#define AVR_MEGA (avr_mega_p && !TARGET_SHORT_CALLS)
#define AVR_HAVE_JMP_CALL (avr_current_arch->have_jmp_call && !TARGET_SHORT_CALLS)
#define AVR_HAVE_MUL (avr_have_mul_p)
#define AVR_HAVE_MOVW (avr_have_movw_lpmx_p)
More information about the Gcc-patches
mailing list