* [patch,avr]:
@ 2013-01-14 17:30 Georg-Johann Lay
2013-01-14 17:38 ` [patch,avr]: Weddington, Eric
0 siblings, 1 reply; 2+ messages in thread
From: Georg-Johann Lay @ 2013-01-14 17:30 UTC (permalink / raw)
To: gcc-patches; +Cc: Denis Chertykov, Eric Weddington
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
This patch is a no-op change that uses typedefs starting with avr_ in order to
make clear that they are in the avr "namespace". Old types were: struct
base_arch_s, struct arch_info_s, struct mcu_type_s.
avr-cross builds fine.
Ok to apply?
* 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.
[-- Attachment #2: arch_t.diff --]
[-- Type: text/x-patch, Size: 4683 bytes --]
Index: config/avr/gen-avr-mmcu-texi.c
===================================================================
--- config/avr/gen-avr-mmcu-texi.c (revision 195150)
+++ config/avr/gen-avr-mmcu-texi.c (working copy)
@@ -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");
Index: config/avr/avr-arch.h
===================================================================
--- config/avr/avr-arch.h (revision 195151)
+++ config/avr/avr-arch.h (working copy)
@@ -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;
Index: config/avr/avr-devices.c
===================================================================
--- config/avr/avr-devices.c (revision 195151)
+++ config/avr/avr-devices.c (working copy)
@@ -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. */
Index: config/avr/avr-mcus.def
===================================================================
--- config/avr/avr-mcus.def (revision 195150)
+++ config/avr/avr-mcus.def (working copy)
@@ -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=<NAME>
Index: config/avr/driver-avr.c
===================================================================
--- config/avr/driver-avr.c (revision 195150)
+++ config/avr/driver-avr.c (working copy)
@@ -24,10 +24,10 @@ along with GCC; see the file COPYING3.
#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. */
Index: config/avr/avr.c
===================================================================
--- config/avr/avr.c (revision 195151)
+++ config/avr/avr.c (working copy)
@@ -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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* RE: [patch,avr]:
2013-01-14 17:30 [patch,avr]: Georg-Johann Lay
@ 2013-01-14 17:38 ` Weddington, Eric
0 siblings, 0 replies; 2+ messages in thread
From: Weddington, Eric @ 2013-01-14 17:38 UTC (permalink / raw)
To: Georg-Johann Lay, gcc-patches; +Cc: Denis Chertykov
> -----Original Message-----
> From: Georg-Johann Lay
> Sent: Monday, January 14, 2013 10:31 AM
> To: gcc-patches@gcc.gnu.org
> Cc: Denis Chertykov; Weddington, Eric
> Subject: [patch,avr]:
>
> This patch is a no-op change that uses typedefs starting with avr_ in
> order to
> make clear that they are in the avr "namespace". Old types were:
> struct
> base_arch_s, struct arch_info_s, struct mcu_type_s.
>
> avr-cross builds fine.
>
> Ok to apply?
Please commit! Thanks!
Eric
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-14 17:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-14 17:30 [patch,avr]: Georg-Johann Lay
2013-01-14 17:38 ` [patch,avr]: Weddington, Eric
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).