diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-15 19:21:10 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-15 19:21:10 +0000 |
commit | bb9c80df457c8c054ae99508fed4959886f78930 (patch) | |
tree | bb80894b267958d9566904c06c951ca85d2222a7 | |
parent | 2008-12-15 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-bb9c80df457c8c054ae99508fed4959886f78930.tar.bz2 |
2008-12-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, spfatal06/testcase.h,
spfatal07/testcase.h, spfatal08/testcase.h, spfatal09/testcase.h,
spsize/size.c: Eliminate pointers to API configuration tables in the
main configuration table. Reference the main configuration table and
the API configuration tables directly using the confdefs.h version
rather than obtaining a pointer to it. This eliminated some
variables, a potential fatal error, some unnecessary default
configuration structures. Overall, about a 4.5% reduction in the code
size for minimum and hello on the SPARC.
* spfatal10/.cvsignore, spfatal10/Makefile.am, spfatal10/spfatal10.scn,
spfatal10/testcase.h: Removed.
-rw-r--r-- | testsuites/sptests/ChangeLog | 14 | ||||
-rw-r--r-- | testsuites/sptests/Makefile.am | 2 | ||||
-rw-r--r-- | testsuites/sptests/configure.ac | 1 | ||||
-rw-r--r-- | testsuites/sptests/spfatal06/testcase.h | 21 | ||||
-rw-r--r-- | testsuites/sptests/spfatal07/testcase.h | 14 | ||||
-rw-r--r-- | testsuites/sptests/spfatal08/testcase.h | 16 | ||||
-rw-r--r-- | testsuites/sptests/spfatal09/testcase.h | 14 | ||||
-rw-r--r-- | testsuites/sptests/spfatal10/.cvsignore | 2 | ||||
-rw-r--r-- | testsuites/sptests/spfatal10/Makefile.am | 27 | ||||
-rw-r--r-- | testsuites/sptests/spfatal10/spfatal10.scn | 1 | ||||
-rw-r--r-- | testsuites/sptests/spfatal10/testcase.h | 36 | ||||
-rw-r--r-- | testsuites/sptests/spsize/size.c | 4 |
12 files changed, 57 insertions, 95 deletions
diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index bbfcc1905d..e84090fce4 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,17 @@ +2008-12-15 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, spfatal06/testcase.h, + spfatal07/testcase.h, spfatal08/testcase.h, spfatal09/testcase.h, + spsize/size.c: Eliminate pointers to API configuration tables in the + main configuration table. Reference the main configuration table and + the API configuration tables directly using the confdefs.h version + rather than obtaining a pointer to it. This eliminated some + variables, a potential fatal error, some unnecessary default + configuration structures. Overall, about a 4.5% reduction in the code + size for minimum and hello on the SPARC. + * spfatal10/.cvsignore, spfatal10/Makefile.am, spfatal10/spfatal10.scn, + spfatal10/testcase.h: Removed. + 2008-12-14 Joel Sherrill <joel.sherrill@oarcorp.com> * sp07/init.c, sp12/init.c, sp12/pridrv.c, sp12/pritask.c, diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 8ff5e5e453..92dbf71f50 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \ sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 sp29 \ sp30 sp31 sp32 sp33 sp34 sp35 sp37 sp38 sp39 sp40 sp41 sp42 sp43 sp44 \ sp45 sp46 spsize spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 \ - spfatal06 spfatal07 spfatal08 spfatal09 spfatal10 + spfatal06 spfatal07 spfatal08 spfatal09 DIST_SUBDIRS = $(SUBDIRS) spfatal spfatal_support EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 54706e4d68..64b3d2fefc 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -82,6 +82,5 @@ spfatal06/Makefile spfatal07/Makefile spfatal08/Makefile spfatal09/Makefile -spfatal10/Makefile ]) AC_OUTPUT diff --git a/testsuites/sptests/spfatal06/testcase.h b/testsuites/sptests/spfatal06/testcase.h index 4573bf1bf9..81d1c1e8fe 100644 --- a/testsuites/sptests/spfatal06/testcase.h +++ b/testsuites/sptests/spfatal06/testcase.h @@ -1,6 +1,13 @@ /* * Classic API Init task create failure * + * COPYRIGHT (c) 1989-2008. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -29,22 +36,18 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_BAD_STACK_HOOK -void *New_stack_allocate_hook( uint32_t unused) +void *New_stack_allocate_hook(uint32_t unused) { } void force_error() { - rtems_configuration_table New_Configuration; - - New_Configuration = *_Configuration_Table; - - if (_Configuration_Table->stack_free_hook != NULL) - New_Configuration.stack_allocate_hook = NULL; + if (Configuration.stack_free_hook != NULL) + Configuration.stack_allocate_hook = NULL; else - New_Configuration.stack_allocate_hook = &New_stack_allocate_hook; + Configuration.stack_allocate_hook = &New_stack_allocate_hook; - rtems_initialize_data_structures( &New_Configuration ); + rtems_initialize_data_structures(); /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal07/testcase.h b/testsuites/sptests/spfatal07/testcase.h index 33691f4c56..9a2892e3ce 100644 --- a/testsuites/sptests/spfatal07/testcase.h +++ b/testsuites/sptests/spfatal07/testcase.h @@ -1,6 +1,13 @@ /* * Classic API Init task create failure * + * COPYRIGHT (c) 1989-2008. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -31,11 +38,8 @@ rtems_initialization_tasks_table Initialization_tasks[] = { void force_error() { - rtems_configuration_table New_Configuration; - New_Configuration = *_Configuration_Table; - - New_Configuration.interrupt_stack_size = (STACK_MINIMUM_SIZE-1); - rtems_initialize_data_structures( &New_Configuration ); + Configuration.interrupt_stack_size = (STACK_MINIMUM_SIZE-1); + rtems_initialize_data_structures(); /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal08/testcase.h b/testsuites/sptests/spfatal08/testcase.h index a44b72dd5a..77432026fe 100644 --- a/testsuites/sptests/spfatal08/testcase.h +++ b/testsuites/sptests/spfatal08/testcase.h @@ -1,6 +1,13 @@ /* * Classic API Init task create failure * + * COPYRIGHT (c) 1989-2008. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -33,12 +40,9 @@ char Workspace[ 256 ] CPU_STRUCTURE_ALIGNMENT; void force_error() { - rtems_configuration_table New_Configuration; - New_Configuration = *_Configuration_Table; - - New_Configuration.work_space_start = Workspace; - New_Configuration.work_space_size = 256; + Configuration.work_space_start = Workspace; + Configuration.work_space_size = 256; - rtems_initialize_data_structures( &New_Configuration ); + rtems_initialize_data_structures();; /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal09/testcase.h b/testsuites/sptests/spfatal09/testcase.h index 151fdfeb21..ab8cd1aaae 100644 --- a/testsuites/sptests/spfatal09/testcase.h +++ b/testsuites/sptests/spfatal09/testcase.h @@ -1,6 +1,13 @@ /* * Classic API Init task create failure * + * COPYRIGHT (c) 1989-2008. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * * $Id$ */ @@ -31,11 +38,8 @@ rtems_initialization_tasks_table Initialization_tasks[] = { void force_error() { - rtems_configuration_table New_Configuration; - New_Configuration = *_Configuration_Table; - - New_Configuration.work_space_start = NULL; + Configuration.work_space_start = NULL; - rtems_initialize_data_structures( &New_Configuration ); + rtems_initialize_data_structures(); /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal10/.cvsignore b/testsuites/sptests/spfatal10/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/testsuites/sptests/spfatal10/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/testsuites/sptests/spfatal10/Makefile.am b/testsuites/sptests/spfatal10/Makefile.am deleted file mode 100644 index 286fd3a9f2..0000000000 --- a/testsuites/sptests/spfatal10/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - -MANAGERS = all - -rtems_tests_PROGRAMS = spfatal10.exe -spfatal10_exe_SOURCES = ../spfatal_support/init.c ../spfatal_support/system.h testcase.h - -dist_rtems_tests_DATA = spfatal10.scn - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - -spfatal10_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(spfatal10_exe_OBJECTS) $(spfatal10_exe_LDADD) -LINK_LIBS = $(spfatal10_exe_LDLIBS) - -spfatal10.exe$(EXEEXT): $(spfatal10_exe_OBJECTS) $(spfatal10_exe_DEPENDENCIES) - @rm -f spfatal10.exe$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spfatal10/spfatal10.scn b/testsuites/sptests/spfatal10/spfatal10.scn deleted file mode 100644 index d3dcd3c360..0000000000 --- a/testsuites/sptests/spfatal10/spfatal10.scn +++ /dev/null @@ -1 +0,0 @@ -Fatal error (Core NULL Configuration Table) hit diff --git a/testsuites/sptests/spfatal10/testcase.h b/testsuites/sptests/spfatal10/testcase.h deleted file mode 100644 index b559a0e4ed..0000000000 --- a/testsuites/sptests/spfatal10/testcase.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Classic API Init task create failure - * - * $Id$ - */ - -/* - * Way too much stack space. Should generate a fatal error - * on the init task create. - */ -#define CONFIGURE_HAS_OWN_INIT_TASK_TABLE -#define CONFIGURE_INIT_TASK_STACK_SIZE RTEMS_MINIMUM_STACK_SIZE -rtems_initialization_tasks_table Initialization_tasks[] = { - { rtems_build_name('I', 'N', 'I', ' '), - RTEMS_MINIMUM_STACK_SIZE, - 1, - RTEMS_DEFAULT_ATTRIBUTES, - Init, - RTEMS_DEFAULT_MODES, - 0 - } -}; -#define CONFIGURE_INIT_TASK_TABLE Initialization_tasks -#define CONFIGURE_INIT_TASK_TABLE_SIZE \ - sizeof(CONFIGURE_INIT_TASK_TABLE) / sizeof(rtems_initialization_tasks_table) - -#define FATAL_ERROR_DESCRIPTION "Core NULL Configuration Table" -#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE -#define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_NO_CONFIGURATION_TABLE - -void force_error() -{ - rtems_initialize_data_structures( NULL ); - /* we will not run this far */ -} diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c index b04ab1d27c..c90f8a31e7 100644 --- a/testsuites/sptests/spsize/size.c +++ b/testsuites/sptests/spsize/size.c @@ -3,7 +3,7 @@ * This program is run to determine the data space and work space * requirements of the current version of RTEMS. * - * COPYRIGHT (c) 1989-2007. + * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -222,7 +222,7 @@ uninitialized = /*clock.h*/ 0 + -/*config.h*/ (sizeof _Configuration_Table) + +/*config.h*/ #if defined(RTEMS_MULTIPROCESSING) (sizeof _Configuration_MP_table) + #endif |