From ce5446476beaab8326e67ff2c02a8e81a321d423 Mon Sep 17 00:00:00 2001 From: gjl Date: Mon, 14 Jan 2013 18:09:34 +0000 Subject: [PATCH] * config/avr/avr-arch.h (struct base_arch_s): Use typedef avr_arch_t instead. (struct arch_info_s): Use typedef avr_arch_info_t instead. (struct mcu_type_s): Use typedef avr_mcu_t instead. * config/avr/avr.c: Same. * config/avr/avr-devices.c: Same. * config/avr/driver-avr.c: Same. * config/avr/gen-avr-mmcu-texi.c: Same. * config/avr/avr-mcus.def: Adjust comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195160 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 12 ++++++++++++ gcc/config/avr/avr-arch.h | 21 +++++++++++---------- gcc/config/avr/avr-devices.c | 12 +++++++----- gcc/config/avr/avr-mcus.def | 2 +- gcc/config/avr/avr.c | 4 ++-- gcc/config/avr/driver-avr.c | 4 ++-- gcc/config/avr/gen-avr-mmcu-texi.c | 2 +- 7 files changed, 36 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d45927c..eeb6c0b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +2013-01-14 Georg-Johann Lay + + * config/avr/avr-arch.h + (struct base_arch_s): Use typedef avr_arch_t instead. + (struct arch_info_s): Use typedef avr_arch_info_t instead. + (struct mcu_type_s): Use typedef avr_mcu_t instead. + * config/avr/avr.c: Same. + * config/avr/avr-devices.c: Same. + * config/avr/driver-avr.c: Same. + * config/avr/gen-avr-mmcu-texi.c: Same. + * config/avr/avr-mcus.def: Adjust comment. + 2013-01-14 Tejas Belagod * config/aarch64/aarch64-simd.md (*aarch64_simd_ld1r): New. diff --git a/gcc/config/avr/avr-arch.h b/gcc/config/avr/avr-arch.h index a267337..27cea73 100644 --- a/gcc/config/avr/avr-arch.h +++ b/gcc/config/avr/avr-arch.h @@ -45,7 +45,7 @@ enum avr_arch /* Architecture-specific properties. */ -struct base_arch_s +typedef struct { /* Assembler only. */ int asm_only; @@ -87,12 +87,12 @@ struct base_arch_s /* Architecture name. */ const char *const arch_name; -}; +} avr_arch_t; /* Device-specific properties. */ -struct mcu_type_s +typedef struct { /* Device name. */ const char *const name; @@ -134,22 +134,23 @@ struct mcu_type_s /* Name of device library. */ const char *const library_name; -}; +} avr_mcu_t; /* Map architecture to its texinfo string. */ -struct arch_info_s +typedef struct { /* Architecture ID. */ enum avr_arch arch; /* textinfo source to describe the archtiecture. */ const char *texinfo; -}; +} avr_arch_info_t; /* Preprocessor macros to define depending on MCU type. */ -extern const struct base_arch_s *avr_current_arch; -extern const struct mcu_type_s *avr_current_device; -extern const struct mcu_type_s avr_mcu_types[]; -extern const struct base_arch_s avr_arch_types[]; +extern const avr_arch_t avr_arch_types[]; +extern const avr_arch_t *avr_current_arch; + +extern const avr_mcu_t avr_mcu_types[]; +extern const avr_mcu_t *avr_current_device; diff --git a/gcc/config/avr/avr-devices.c b/gcc/config/avr/avr-devices.c index 6fa700b..48a9523 100644 --- a/gcc/config/avr/avr-devices.c +++ b/gcc/config/avr/avr-devices.c @@ -27,7 +27,7 @@ /* List of all known AVR MCU architectures. Order as of enum avr_arch from avr.h. */ -const struct base_arch_s +const avr_arch_t avr_arch_types[] = { /* unknown device specified */ @@ -56,7 +56,7 @@ avr_arch_types[] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 0x2000, 0, "107", "avrxmega7" } }; -const struct arch_info_s +const avr_arch_info_t avr_texinfo[] = { { ARCH_AVR1, @@ -101,9 +101,11 @@ avr_texinfo[] = "and more than 64@tie{}KiB of RAM." } }; -const struct mcu_type_s avr_mcu_types[] = { -#define AVR_MCU(NAME,ARCH,MACRO,SHORT_SP,ERRATA_SKIP,DATA_SEC,N_FLASH,LIB_NAME)\ - { NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH, LIB_NAME }, +const avr_mcu_t +avr_mcu_types[] = +{ +#define AVR_MCU(NAME, ARCH, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME)\ + { NAME, ARCH, MACRO, SP8, ERR_SKIP, DATA_SEC, N_FLASH, LIBNAME }, #include "avr-mcus.def" #undef AVR_MCU /* End of list. */ diff --git a/gcc/config/avr/avr-mcus.def b/gcc/config/avr/avr-mcus.def index f17058e..b410084 100644 --- a/gcc/config/avr/avr-mcus.def +++ b/gcc/config/avr/avr-mcus.def @@ -39,7 +39,7 @@ AVR_MCU (NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH, LIBRARY_NAME) - where the arguments are the fields of struct mcu_type_s: + where the arguments are the fields of avr_mcu_t: NAME Accept -mmcu= diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 93f174b..440ca69 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -184,10 +184,10 @@ static GTY(()) rtx xstring_empty; static GTY(()) rtx xstring_e; /* Current architecture. */ -const struct base_arch_s *avr_current_arch; +const avr_arch_t *avr_current_arch; /* Current device. */ -const struct mcu_type_s *avr_current_device; +const avr_mcu_t *avr_current_device; /* Section to put switch tables in. */ static GTY(()) section *progmem_swtable_section; diff --git a/gcc/config/avr/driver-avr.c b/gcc/config/avr/driver-avr.c index b319113..47a04e5 100644 --- a/gcc/config/avr/driver-avr.c +++ b/gcc/config/avr/driver-avr.c @@ -24,10 +24,10 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" /* Current architecture. */ -const struct base_arch_s *avr_current_arch = NULL; +const avr_arch_t *avr_current_arch = NULL; /* Current device. */ -const struct mcu_type_s *avr_current_device = NULL; +const avr_mcu_t *avr_current_device = NULL; /* Initialize avr_current_arch and avr_current_device variables. */ diff --git a/gcc/config/avr/gen-avr-mmcu-texi.c b/gcc/config/avr/gen-avr-mmcu-texi.c index c0307bf..55335f9 100644 --- a/gcc/config/avr/gen-avr-mmcu-texi.c +++ b/gcc/config/avr/gen-avr-mmcu-texi.c @@ -85,7 +85,7 @@ int main (void) { enum avr_arch arch = ARCH_UNKNOWN; size_t i, n_mcus = 0; - const struct mcu_type_s *mcu; + const avr_mcu_t *mcu; printf ("@c Copyright (C) 2012-2013 Free Software Foundation, Inc.\n"); printf ("@c This is part of the GCC manual.\n"); -- 2.7.4