/* Return true if STR starts with PREFIX and false, otherwise. */
#define STR_PREFIX_P(STR,PREFIX) (0 == strncmp (STR, PREFIX, strlen (PREFIX)))
+#define AVR_SECTION_PROGMEM (SECTION_MACH_DEP << 0)
+
static void avr_option_override (void);
static int avr_naked_function_p (tree);
static int interrupt_function_p (tree);
static void avr_asm_named_section (const char *name, unsigned int flags, tree decl);
static void avr_encode_section_info (tree, rtx, int);
static section* avr_asm_function_rodata_section (tree);
+static section* avr_asm_select_section (tree, int, unsigned HOST_WIDE_INT);
/* Allocate registers from r25 to r8 for parameters for function calls. */
#define FIRST_CUM_REG 26
/* Section to put switch tables in. */
static GTY(()) section *progmem_swtable_section;
+/* Unnamed section associated to __attribute__((progmem)) aka. PROGMEM. */
+static GTY(()) section *progmem_section;
+
/* To track if code will use .bss and/or .data. */
bool avr_need_clear_bss_p = false;
bool avr_need_copy_data_p = false;
#define TARGET_ASM_INIT_SECTIONS avr_asm_init_sections
#undef TARGET_ENCODE_SECTION_INFO
#define TARGET_ENCODE_SECTION_INFO avr_encode_section_info
+#undef TARGET_ASM_SELECT_SECTION
+#define TARGET_ASM_SELECT_SECTION avr_asm_select_section
#undef TARGET_REGISTER_MOVE_COST
#define TARGET_REGISTER_MOVE_COST avr_register_move_cost
struct gcc_target targetm = TARGET_INITIALIZER;
\f
+
+/* Custom function to replace string prefix.
+
+ Return a ggc-allocated string with strlen (OLD_PREFIX) characters removed
+ from the start of OLD_STR and then prepended with NEW_PREFIX. */
+
+static inline const char*
+avr_replace_prefix (const char *old_str,
+ const char *old_prefix, const char *new_prefix)
+{
+ char *new_str;
+ size_t len = strlen (old_str) + strlen (new_prefix) - strlen (old_prefix);
+
+ gcc_assert (strlen (old_prefix) <= strlen (old_str));
+
+ /* Unfortunately, ggc_alloc_string returns a const char* and thus cannot be
+ used here. */
+
+ new_str = (char*) ggc_alloc_atomic (1 + len);
+
+ strcat (stpcpy (new_str, new_prefix), old_str + strlen (old_prefix));
+
+ return (const char*) new_str;
+}
+
static void
avr_option_override (void)
{
if (error_mark_node == node0)
return;
- if (TYPE_READONLY (node0))
- {
- static const char dsec[] = ".progmem.data";
-
- *attributes = tree_cons (get_identifier ("section"),
- build_tree_list (NULL, build_string (strlen (dsec), dsec)),
- *attributes);
- }
- else
+ if (!TYPE_READONLY (node0))
{
error ("variable %q+D must be const in order to be put into"
" read-only section by means of %<__attribute__((progmem))%>",
",\"ax\",@progbits");
}
+ progmem_section
+ = get_unnamed_section (0, output_section_asm_op,
+ "\t.section\t.progmem.data,\"a\",@progbits");
+
/* Override section callbacks to keep track of `avr_need_clear_bss_p'
resp. `avr_need_copy_data_p'. */
if (STR_PREFIX_P (name, old_prefix))
{
- char *rname = (char*) alloca (1 + strlen (name)
- + strlen (new_prefix)
- - strlen (old_prefix));
-
- strcat (stpcpy (rname, new_prefix), name + strlen (old_prefix));
+ const char *rname = avr_replace_prefix (name, old_prefix, new_prefix);
flags &= ~SECTION_CODE;
flags |= AVR_HAVE_JMP_CALL ? 0 : SECTION_CODE;
static void
avr_asm_named_section (const char *name, unsigned int flags, tree decl)
{
+ if (flags & AVR_SECTION_PROGMEM)
+ {
+ const char *old_prefix = ".rodata";
+ const char *new_prefix = ".progmem.data";
+ const char *sname = new_prefix;
+
+ if (STR_PREFIX_P (name, old_prefix))
+ {
+ sname = avr_replace_prefix (name, old_prefix, new_prefix);
+ }
+
+ default_elf_asm_named_section (sname, flags, decl);
+
+ return;
+ }
+
if (!avr_need_copy_data_p)
avr_need_copy_data_p = (STR_PREFIX_P (name, ".data")
|| STR_PREFIX_P (name, ".rodata")
".noinit section");
}
- if (STR_PREFIX_P (name, ".progmem.data"))
- flags &= ~SECTION_WRITE;
+ if (decl && DECL_P (decl)
+ && avr_progmem_p (decl, DECL_ATTRIBUTES (decl)))
+ {
+ flags &= ~SECTION_WRITE;
+ flags |= AVR_SECTION_PROGMEM;
+ }
return flags;
}
}
+/* Implement `TARGET_ASM_SELECT_SECTION' */
+
+static section *
+avr_asm_select_section (tree decl, int reloc, unsigned HOST_WIDE_INT align)
+{
+ section * sect = default_elf_select_section (decl, reloc, align);
+
+ if (decl && DECL_P (decl)
+ && avr_progmem_p (decl, DECL_ATTRIBUTES (decl)))
+ {
+ if (sect->common.flags & SECTION_NAMED)
+ {
+ const char * name = sect->named.name;
+ const char * old_prefix = ".rodata";
+ const char * new_prefix = ".progmem.data";
+
+ if (STR_PREFIX_P (name, old_prefix))
+ {
+ const char *sname = avr_replace_prefix (name, old_prefix, new_prefix);
+
+ return get_section (sname, sect->common.flags, sect->named.decl);
+ }
+ }
+
+ return progmem_section;
+ }
+
+ return sect;
+}
+
/* Implement `TARGET_ASM_FILE_START'. */
/* Outputs some appropriate text to go at the start of an assembler
file. */
-# Copyright (C) 2008 Free Software Foundation, Inc.\r
-\r
-# This program is free software; you can redistribute it and/or modify\r
-# it under the terms of the GNU General Public License as published by\r
-# the Free Software Foundation; either version 3 of the License, or\r
-# (at your option) any later version.\r
-# \r
-# This program is distributed in the hope that it will be useful,\r
-# but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-# GNU General Public License for more details.\r
-# \r
-# You should have received a copy of the GNU General Public License\r
-# along with GCC; see the file COPYING3. If not see\r
-# <http://www.gnu.org/licenses/>.\r
-\r
-# GCC testsuite that uses the `gcc-dg.exp' driver, looping over\r
-# optimization options.\r
-\r
-# Exit immediately if this isn't a AVR target.\r
-if { ![istarget avr-*-*] } then {\r
- return\r
-}\r
-\r
-# Load support procs.\r
-load_lib gcc-dg.exp\r
-\r
-# If a testcase doesn't have special options, use these.\r
-global DEFAULT_CFLAGS\r
-if ![info exists DEFAULT_CFLAGS] then {\r
- set DEFAULT_CFLAGS " -ansi -pedantic-errors"\r
-}\r
-\r
-# Initialize `dg'.\r
-dg-init\r
-\r
- set AVR_TORTURE_OPTIONS [list \\r
- { -O0 } \\r
- { -O1 } \\r
- { -O2 } \\r
- { -O2 -mcall-prologues } \\r
- { -Os -fomit-frame-pointer } \\r
- { -Os -fomit-frame-pointer -finline-functions } \\r
- { -O3 -g } \\r
- { -Os -mcall-prologues} ]\r
-\r
-\r
-#Initialize use of torture lists. \r
-torture-init\r
-\r
-set-torture-options $AVR_TORTURE_OPTIONS\r
-\r
-\r
-# Main loop.\r
-gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{\[cS\],cpp}]] $DEFAULT_CFLAGS\r
-\r
-# Finalize use of torture lists.\r
-torture-finish\r
-\r
-# All done.\r
-dg-finish\r
+# Copyright (C) 2008 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3. If not see
+# <http://www.gnu.org/licenses/>.
+
+# GCC testsuite that uses the `gcc-dg.exp' driver, looping over
+# optimization options.
+
+# Exit immediately if this isn't a AVR target.
+if { ![istarget avr-*-*] } then {
+ return
+}
+
+# Load support procs.
+load_lib gcc-dg.exp
+
+# If a testcase doesn't have special options, use these.
+global DEFAULT_CFLAGS
+if ![info exists DEFAULT_CFLAGS] then {
+ set DEFAULT_CFLAGS " -ansi -pedantic-errors"
+}
+
+# Initialize `dg'.
+dg-init
+
+ set AVR_TORTURE_OPTIONS [list \
+ { -O0 } \
+ { -O1 } \
+ { -O2 } \
+ { -O2 -mcall-prologues } \
+ { -O2 -fdata-sections } \
+ { -O2 -fmerge-all-constants } \
+ { -Os -fomit-frame-pointer } \
+ { -Os -fomit-frame-pointer -finline-functions } \
+ { -O3 -g } \
+ { -Os -mcall-prologues} ]
+
+
+#Initialize use of torture lists.
+torture-init
+
+set-torture-options $AVR_TORTURE_OPTIONS
+
+
+# Main loop.
+gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{\[cS\],cpp}]] $DEFAULT_CFLAGS
+
+# Finalize use of torture lists.
+torture-finish
+
+# All done.
+dg-finish
OSDN Git Service
