cmd_bdinfo: simplify local static funcs a bit
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
If we move the local funcs to the top of the file, and use the __maybe_unused define, we can drop a lot of ugly ifdef logic and duplicated prototypes.
--- common/cmd_bdinfo.c | 89 ++++++++++++++++++-------------------------------- 1 files changed, 32 insertions(+), 57 deletions(-)
common/cmd_bdinfo.c +32 -57
@@ -26,24 +26,45 @@*/ #include <common.h> #include <command.h> +#include <linux/compiler.h> DECLARE_GLOBAL_DATA_PTR ; -static void print_num (const char *,ulong ); +__maybe_unused +static void print_num (const char *name,ulong value) +{ +printf ("%-12s= 0x%08lX\n" , name, value); +} -#if !(defined(CONFIG_ARM ) || defined(CONFIG_M68K ) || defined(CONFIG_SANDBOX )) \ - || defined(CONFIG_CMD_NET ) -#define HAVE_PRINT_ETH -static void print_eth (int idx); -#endif +__maybe_unused +static void print_eth (int idx) +{ +char name[10 ], *val; +if (idx) +sprintf (name,"eth%iaddr" , idx); +else +strcpy (name,"ethaddr" ); + val =getenv (name); +if (!val) + val ="(not set)" ; +printf ("%-12s= %s\n" , name, val); +} -#if (!defined(CONFIG_ARM ) && !defined(CONFIG_X86 ) && !defined(CONFIG_SANDBOX )) -#define HAVE_PRINT_LNUM -static void print_lnum (const char *,u64 ); -#endif +__maybe_unused +static void print_lnum (const char *name,u64 value) +{ +printf ("%-12s= 0x%.8llX\n" , name, value); +} + +__maybe_unused +static void print_mhz (const char *name,unsigned long hz) +{ +char buf[32 ]; + +printf ("%-12s= %6s MHz\n" , name,strmhz (buf, hz)); +}#if defined(CONFIG_PPC ) -static void print_mhz (const char *,unsigned long );int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {
@@ -208,8 +229,6 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])#elif defined(CONFIG_M68K ) -static void print_mhz (const char *,unsigned long ); -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {bd_t *bd = gd->bd;
@@ -257,8 +276,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#elif defined(CONFIG_BLACKFIN ) -static void print_mhz (const char *,unsigned long ); -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {bd_t *bd = gd->bd;
@@ -377,8 +394,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#elif defined(CONFIG_X86 ) -static void print_mhz (const char *,unsigned long ); -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i;
@@ -464,46 +479,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#error "a case for this architecture does not exist!"#endif -static void print_num (const char *name,ulong value) -{ -printf ("%-12s= 0x%08lX\n" , name, value); -} - -#ifdef HAVE_PRINT_ETH -static void print_eth (int idx) -{ -char name[10 ], *val; -if (idx) -sprintf (name,"eth%iaddr" , idx); -else -strcpy (name,"ethaddr" ); - val =getenv (name); -if (!val) - val ="(not set)" ; -printf ("%-12s= %s\n" , name, val); -} -#endif - -#ifdef HAVE_PRINT_LNUM -static void print_lnum (const char *name,u64 value) -{ -printf ("%-12s= 0x%.8llX\n" , name, value); -} -#endif - -#if defined(CONFIG_PPC ) || \ - defined(CONFIG_M68K ) || \ - defined(CONFIG_BLACKFIN ) || \ - defined(CONFIG_X86 ) -static void print_mhz (const char *name,unsigned long hz) -{ -char buf[32 ]; - -printf ("%-12s= %6s MHz\n" , name,strmhz (buf, hz)); -} -#endif /* CONFIG_PPC */ - -/* -------------------------------------------------------------------- */ U_BOOT_CMD(
Signature · 1 line
1.7.6.1
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Quoted 5 lines · Mike Frysinger
If we move the local funcs to the top of the file, and use the
__maybe_unuseddefine, we can drop a lot of ugly ifdef logic and duplicated prototypes.Signed-off-by Mike Frysinger <[email protected]>
This is much cleaner - is the correct style to put attribute tags on the previous line?
Quoted 4 lines
---
?common/cmd_bdinfo.c | ? 89 ++++++++++++++++++-------------------------------- ?1 files changed, 32 insertions(+), 57 deletions(-)
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Quoted 9 lines · On Monday 31 October 2011 15:11:35 Simon Glass wrote:
Quoted 5 lines · Mike Frysinger
If we move the local funcs to the top of the file, and use the
__maybe_unuseddefine, we can drop a lot of ugly ifdef logic and duplicated prototypes.Signed-off-by Mike Frysinger <[email protected]>This is much cleaner - is the correct style to put attribute tags on the previous line?
when responding to add your own, there isn't any real protocol. just normal e-mail etiquette (no top posting/etc...). patchwork/humans will do the right thing when manually updating the changelog.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111031/5fb80343/attachment.pgp
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Hi Mike,
Quoted 8 lines · Mike Frysinger
Quoted 7 lines · On Monday 31 October 2011 15:11:35 Simon Glass wrote:
Quoted 5 lines · Mike Frysinger
If we move the local funcs to the top of the file, and use the
__maybe_unuseddefine, we can drop a lot of ugly ifdef logic and duplicated prototypes.Signed-off-by Mike Frysinger <[email protected]>
Quoted 8 lines
Quoted 2 lines
This is much cleaner - is the correct style to put attribute tags on the previous line?
when responding to add your own, there isn't any real protocol. ?just normal e-mail etiquette (no top posting/etc...). ?patchwork/humans will do the right thing when manually updating the changelog.
-mike
Actually I meant the __maybe_unused tag before the function name.
Regards,
Simon
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Quoted 9 lines · On Monday 31 October 2011 16:47:08 Simon Glass wrote:
Quoted 8 lines · Mike Frysinger
Quoted 7 lines · On Monday 31 October 2011 15:11:35 Simon Glass wrote:
Quoted 5 lines · Mike Frysinger
If we move the local funcs to the top of the file, and use the
__maybe_unuseddefine, we can drop a lot of ugly ifdef logic and duplicated prototypes.Signed-off-by Mike Frysinger <[email protected]>
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
This is much cleaner - is the correct style to put attribute tags on the previous line?
when responding to add your own, there isn't any real protocol. just normal e-mail etiquette (no top posting/etc...). patchwork/humans will do the right thing when manually updating the changelog.
Actually I meant the
__maybe_unusedtag before the function name.
ah. i'm not sure there is a hard rule here. i did that because one line would make the func def too long to fit.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111031/0b6ba257/attachment.pgp
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
In reply to Mike Frysingercommon/cmd_bdinfo.c line 37
Quoted 9 lines · Mike Frysinger
common/cmd_bdinfo.c +5
-1-static void print_num (const char *,ulong ); +__maybe_unused +static void print_num (const char *name,ulong value) +{ + ? ? ? printf("%-12s= 0x%08lX\n", name, value); +}
Will the linker remove the functions from the binary if they are unusued?
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Quoted 12 lines · On Mon, Oct 31, 2011 at 2:15 PM, Tabi Timur-B04825 <[email protected]> wrote:
common/cmd_bdinfo.c line 37
Quoted 9 lines · Mike Frysinger
common/cmd_bdinfo.c +5
-1-static void print_num (const char *,ulong ); +__maybe_unused +static void print_num (const char *name,ulong value) +{ + ? ? ? printf("%-12s= 0x%08lX\n", name, value); +}Will the linker remove the functions from the binary if they are unusued?
If built with -ffunction-sections and --gc-sections,, then the linker can do this sort of thing. Otherwise it can't, but the compiler can. I just tested Mike's code on my ARM compiler to make sure and it happily removed print_eth() when it was not used.
Regards,
Simon
Quoted 9 lines
--
Timur Tabi
Linux kernel developer at Freescale
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Quoted 11 lines · On Monday 31 October 2011 17:49:58 Simon Glass wrote:
Quoted 9 lines · On Mon, Oct 31, 2011 at 2:15 PM, Tabi Timur-B04825 wrote:
common/cmd_bdinfo.c line 37
Quoted 6 lines · Mike Frysinger
common/cmd_bdinfo.c +5
-1-static void print_num (const char *,ulong ); +__maybe_unused +static void print_num (const char *name,ulong value) +{ +printf ("%-12s= 0x%08lX\n" , name, value); +}Will the linker remove the functions from the binary if they are unusued?
Quoted 4 lines
If built with -ffunction-sections and --gc-sections,, then the linker can do this sort of thing. Otherwise it can't, but the compiler can. I just tested Mike's code on my ARM compiler to make sure and it happily removed
print_eth()when it was not used.
i don't think you need function-sections to make this happen. since it is marked "static", gcc should do DCE on it. the __maybe_unused markings is just to kill off any warnings about the func not being used (which might occur in the #ifdef jungle below). that attribute does not tell gcc to retain the function even if it isn't referenced in this file (as far as gcc can tell). -mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111031/233f254c/attachment.pgp
PATCH 1/1 cmd_bdinfo: simplify local static funcs a bit
Hi Mike,
Quoted 17 lines · Mike Frysinger
Quoted 11 lines · On Monday 31 October 2011 17:49:58 Simon Glass wrote:
Quoted 9 lines · On Mon, Oct 31, 2011 at 2:15 PM, Tabi Timur-B04825 wrote:
common/cmd_bdinfo.c line 37
Quoted 6 lines · Mike Frysinger
common/cmd_bdinfo.c +5
-1-static void print_num (const char *,ulong ); +__maybe_unused +static void print_num (const char *name,ulong value) +{ + ? ? ? printf("%-12s= 0x%08lX\n", name, value); +}Will the linker remove the functions from the binary if they are unusued?
Quoted 4 lines
If built with -ffunction-sections and --gc-sections,, then the linker can do this sort of thing. Otherwise it can't, but the compiler can. I just tested Mike's code on my ARM compiler to make sure and it happily removed
print_eth()when it was not used.
Quoted 7 lines
i don't think you need function-sections to make this happen. ?since it is marked "static", gcc should do DCE on it. ?the
__maybe_unusedmarkings is just to kill off any warnings about the func not being used (which might occur in the #ifdef jungle below). ?that attribute does not tell gcc to retain the function even if it isn't referenced in this file (as far as gcc can tell). -mike
That's right, you don't need function-sections for the compiler to eliminate the code - my point was that the linker can't do this sort of thing...luckily it doesn't need to.
There might be an option to control this, a bit like -fkeep-static-consts, but I can't see it. Can't see it being very useful anyway.
Regards,
Simon
PATCH v2 1/1 cmd_bdinfo: simplify local static funcs a bit
In reply to Mike FrysingerIf we move the local funcs to the top of the file, and use the __maybe_unused define, we can drop a lot of ugly ifdef logic and duplicated prototypes.
---
v2
- rebased onto current master
common/cmd_bdinfo.c | 89 ++++++++++++++++++--------------------------------- 1 files changed, 31 insertions(+), 58 deletions(-)
common/cmd_bdinfo.c +31 -58
@@ -26,25 +26,44 @@*/ #include <common.h> #include <command.h> +#include <linux/compiler.h> DECLARE_GLOBAL_DATA_PTR ; -static void print_num (const char *,ulong ); +__maybe_unused +static void print_num (const char *name,ulong value) +{ +printf ("%-12s= 0x%08lX\n" , name, value); +} -#if !(defined(CONFIG_ARM ) || defined(CONFIG_M68K ) || \ - defined(CONFIG_SANDBOX ) || defined(CONFIG_X86 )) \ - || defined(CONFIG_CMD_NET ) -#define HAVE_PRINT_ETH -static void print_eth (int idx); -#endif +static void print_eth (int idx) +{ +char name[10 ], *val; +if (idx) +sprintf (name,"eth%iaddr" , idx); +else +strcpy (name,"ethaddr" ); + val =getenv (name); +if (!val) + val ="(not set)" ; +printf ("%-12s= %s\n" , name, val); +} -#if (!defined(CONFIG_ARM ) && !defined(CONFIG_X86 ) && !defined(CONFIG_SANDBOX )) -#define HAVE_PRINT_LNUM -static void print_lnum (const char *,u64 ); -#endif +__maybe_unused +static void print_lnum (const char *name,u64 value) +{ +printf ("%-12s= 0x%.8llX\n" , name, value); +} + +__maybe_unused +static void print_mhz (const char *name,unsigned long hz) +{ +char buf[32 ]; + +printf ("%-12s= %6s MHz\n" , name,strmhz (buf, hz)); +}#if defined(CONFIG_PPC ) -static void print_mhz (const char *,unsigned long );int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {
@@ -209,8 +228,6 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])#elif defined(CONFIG_M68K ) -static void print_mhz (const char *,unsigned long ); -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {bd_t *bd = gd->bd;
@@ -258,8 +275,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#elif defined(CONFIG_BLACKFIN ) -static void print_mhz (const char *,unsigned long ); -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {bd_t *bd = gd->bd;
@@ -378,8 +393,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#elif defined(CONFIG_X86 ) -static void print_mhz (const char *,unsigned long ); -int do_bdinfo (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {int i;
@@ -465,46 +478,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#error "a case for this architecture does not exist!"#endif -static void print_num (const char *name,ulong value) -{ -printf ("%-12s= 0x%08lX\n" , name, value); -} - -#ifdef HAVE_PRINT_ETH -static void print_eth (int idx) -{ -char name[10 ], *val; -if (idx) -sprintf (name,"eth%iaddr" , idx); -else -strcpy (name,"ethaddr" ); - val =getenv (name); -if (!val) - val ="(not set)" ; -printf ("%-12s= %s\n" , name, val); -} -#endif - -#ifdef HAVE_PRINT_LNUM -static void print_lnum (const char *name,u64 value) -{ -printf ("%-12s= 0x%.8llX\n" , name, value); -} -#endif - -#if defined(CONFIG_PPC ) || \ - defined(CONFIG_M68K ) || \ - defined(CONFIG_BLACKFIN ) || \ - defined(CONFIG_X86 ) -static void print_mhz (const char *name,unsigned long hz) -{ -char buf[32 ]; - -printf ("%-12s= %6s MHz\n" , name,strmhz (buf, hz)); -} -#endif /* CONFIG_PPC */ - -/* -------------------------------------------------------------------- */ U_BOOT_CMD(
Signature · 1 line
1.7.6.1
Wolfgang Denk
AppliedPATCH v2 1/1 cmd_bdinfo: simplify local static funcs a bit
Dear Mike Frysinger,
Quoted 4 lines · In message <[email protected]> you wrote:
If we move the local funcs to the top of the file, and use the
__maybe_unuseddefine, we can drop a lot of ugly ifdef logic and duplicated prototypes.
Quoted 8 lines
Acked-by Simon Glass <[email protected]>Signed-off-by Mike Frysinger <[email protected]>---
v2
- rebased onto current mastercommon/cmd_bdinfo.c | 89 ++++++++++++++++++--------------------------------- 1 files changed, 31 insertions(+), 58 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "I've seen it. It's rubbish." - Marvin the Paranoid Android