OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avr-arch.h (struct base_arch_s): Use typedef avr_arch_t instead. 

* 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.

From-SVN: r195160
This commit is contained in:
Georg-Johann Lay 2013-01-14 18:09:34 +00:00 committed by Georg-Johann Lay
parent a50344cbf3
commit 1c494c6a0f
7 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ChangeLog
View File

@ -1,3 +1,15 @@
2013-01-14 Georg-Johann Lay <avr@gjlay.de>
* 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 <tejas.belagod@arm.com> 2013-01-14 Tejas Belagod <tejas.belagod@arm.com>
* config/aarch64/aarch64-simd.md (*aarch64_simd_ld1r<mode>): New. * config/aarch64/aarch64-simd.md (*aarch64_simd_ld1r<mode>): New.

21
gcc/config/avr/avr-arch.h
View File

@ -45,7 +45,7 @@ enum avr_arch
/* Architecture-specific properties. */ /* Architecture-specific properties. */
struct base_arch_s typedef struct
{ {
/* Assembler only. */ /* Assembler only. */
int asm_only; int asm_only;
@ -87,12 +87,12 @@ struct base_arch_s
/* Architecture name. */ /* Architecture name. */
const char *const arch_name; const char *const arch_name;
}; } avr_arch_t;
/* Device-specific properties. */ /* Device-specific properties. */
struct mcu_type_s typedef struct
{ {
/* Device name. */ /* Device name. */
const char *const name; const char *const name;
@ -134,22 +134,23 @@ struct mcu_type_s
/* Name of device library. */ /* Name of device library. */
const char *const library_name; const char *const library_name;
}; } avr_mcu_t;
/* Map architecture to its texinfo string. */ /* Map architecture to its texinfo string. */
struct arch_info_s typedef struct
{ {
/* Architecture ID. */ /* Architecture ID. */
enum avr_arch arch; enum avr_arch arch;
/* textinfo source to describe the archtiecture. */ /* textinfo source to describe the archtiecture. */
const char *texinfo; const char *texinfo;
}; } avr_arch_info_t;
/* Preprocessor macros to define depending on MCU type. */ /* Preprocessor macros to define depending on MCU type. */
extern const struct base_arch_s *avr_current_arch; extern const avr_arch_t avr_arch_types[];
extern const struct mcu_type_s *avr_current_device; extern const avr_arch_t *avr_current_arch;
extern const struct mcu_type_s avr_mcu_types[];
extern const struct base_arch_s avr_arch_types[]; extern const avr_mcu_t avr_mcu_types[];
extern const avr_mcu_t *avr_current_device;

12
gcc/config/avr/avr-devices.c
View File

@ -27,7 +27,7 @@
/* List of all known AVR MCU architectures. /* List of all known AVR MCU architectures.
Order as of enum avr_arch from avr.h. */ Order as of enum avr_arch from avr.h. */
const struct base_arch_s const avr_arch_t
avr_arch_types[] = avr_arch_types[] =
{ {
/* unknown device specified */ /* unknown device specified */
@ -56,7 +56,7 @@ avr_arch_types[] =
{ 0, 1, 1, 1, 1, 1, 1, 1, 1, 0x2000, 0, "107", "avrxmega7" } { 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[] = avr_texinfo[] =
{ {
{ ARCH_AVR1, { ARCH_AVR1,
@ -101,9 +101,11 @@ avr_texinfo[] =
"and more than 64@tie{}KiB of RAM." } "and more than 64@tie{}KiB of RAM." }
}; };
const struct mcu_type_s avr_mcu_types[] = { const avr_mcu_t
#define AVR_MCU(NAME,ARCH,MACRO,SHORT_SP,ERRATA_SKIP,DATA_SEC,N_FLASH,LIB_NAME)\ avr_mcu_types[] =
{ NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH, LIB_NAME }, {
#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" #include "avr-mcus.def"
#undef AVR_MCU #undef AVR_MCU
/* End of list. */ /* End of list. */

2
gcc/config/avr/avr-mcus.def
View File

@ -39,7 +39,7 @@
AVR_MCU (NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH, AVR_MCU (NAME, ARCH, MACRO, SHORT_SP, ERRATA_SKIP, DATA_SEC, N_FLASH,
LIBRARY_NAME) 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=<NAME> NAME Accept -mmcu=<NAME>

4
gcc/config/avr/avr.c
View File

@ -184,10 +184,10 @@ static GTY(()) rtx xstring_empty;
static GTY(()) rtx xstring_e; static GTY(()) rtx xstring_e;
/* Current architecture. */ /* Current architecture. */
const struct base_arch_s *avr_current_arch; const avr_arch_t *avr_current_arch;
/* Current device. */ /* Current device. */
const struct mcu_type_s *avr_current_device; const avr_mcu_t *avr_current_device;
/* Section to put switch tables in. */ /* Section to put switch tables in. */
static GTY(()) section *progmem_swtable_section; static GTY(()) section *progmem_swtable_section;

4
gcc/config/avr/driver-avr.c
View File

@ -24,10 +24,10 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h" #include "tm.h"
/* Current architecture. */ /* Current architecture. */
const struct base_arch_s *avr_current_arch = NULL; const avr_arch_t *avr_current_arch = NULL;
/* Current device. */ /* 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. */ /* Initialize avr_current_arch and avr_current_device variables. */

2
gcc/config/avr/gen-avr-mmcu-texi.c
View File

@ -85,7 +85,7 @@ int main (void)
{ {
enum avr_arch arch = ARCH_UNKNOWN; enum avr_arch arch = ARCH_UNKNOWN;
size_t i, n_mcus = 0; 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 Copyright (C) 2012-2013 Free Software Foundation, Inc.\n");
printf ("@c This is part of the GCC manual.\n"); printf ("@c This is part of the GCC manual.\n");