From 1266d7902bf7f2534ee279671d48613ef9b2434c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 12 Mar 2009 19:41:40 +0000 Subject: [tables] Redefine methods for accessing linker tables Intel's C compiler (icc) chokes on the zero-length arrays that we currently use as part of the mechanism for accessing linker table entries. Abstract away the zero-length arrays, to make a port to icc easier. Introduce macros such as for_each_table_entry() to simplify the common case of iterating over all entries in a linker table. Represent table names as #defined string constants rather than unquoted literals; this avoids visual confusion between table names and C variable or type names, and also allows us to force a compilation error in the event of incorrect table names. --- src/include/gpxe/init.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/include/gpxe/init.h') diff --git a/src/include/gpxe/init.h b/src/include/gpxe/init.h index e0e9f9c84..9ce56d77f 100644 --- a/src/include/gpxe/init.h +++ b/src/include/gpxe/init.h @@ -13,9 +13,12 @@ struct init_fn { void ( * initialise ) ( void ); }; +/** Initialisation function table */ +#define INIT_FNS "init_fns" + /** Declare an initialisation functon */ #define __init_fn( init_order ) \ - __table ( struct init_fn, init_fns, init_order ) + __table ( struct init_fn, INIT_FNS, init_order ) /** @defgroup initfn_order Initialisation function ordering * @{ @@ -49,9 +52,12 @@ struct startup_fn { void ( * shutdown ) ( int flags ); }; +/** Startup/shutdown function table */ +#define STARTUP_FNS "startup_fns" + /** Declare a startup/shutdown function */ #define __startup_fn( startup_order ) \ - __table ( struct startup_fn, startup_fns, startup_order ) + __table ( struct startup_fn, STARTUP_FNS, startup_order ) /** @defgroup startfn_order Startup/shutdown function ordering * -- cgit v1.2.3-55-g7522