diff options
Diffstat (limited to 'cpukit/score')
22 files changed, 29 insertions, 101 deletions
diff --git a/cpukit/score/cpu/nios2/nios2-context-initialize.c b/cpukit/score/cpu/nios2/nios2-context-initialize.c index 5313327819..7468becf35 100644 --- a/cpukit/score/cpu/nios2/nios2-context-initialize.c +++ b/cpukit/score/cpu/nios2/nios2-context-initialize.c @@ -62,7 +62,7 @@ void _CPU_Context_Initialize( if ( !ok ) { /* The task stack allocator must ensure that the stack area is valid */ - _Terminate( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, 0xdeadbeef ); } } } diff --git a/cpukit/score/cpu/nios2/nios2-isr-get-level.c b/cpukit/score/cpu/nios2/nios2-isr-get-level.c index dad40536a1..93804378d8 100644 --- a/cpukit/score/cpu/nios2/nios2-isr-get-level.c +++ b/cpukit/score/cpu/nios2/nios2-isr-get-level.c @@ -48,7 +48,7 @@ uint32_t _CPU_ISR_Get_level( void ) break; default: /* FIXME */ - _Terminate( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, 0xdeadbeef ); break; } diff --git a/cpukit/score/cpu/nios2/nios2-isr-set-level.c b/cpukit/score/cpu/nios2/nios2-isr-set-level.c index 422f990ec1..9eb8dec02d 100644 --- a/cpukit/score/cpu/nios2/nios2-isr-set-level.c +++ b/cpukit/score/cpu/nios2/nios2-isr-set-level.c @@ -48,7 +48,7 @@ uint32_t _Nios2_ISR_Set_level( uint32_t new_level, uint32_t status ) break; default: /* FIXME */ - _Terminate( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, 0xdeadbeef ); break; } diff --git a/cpukit/score/cpu/powerpc/ppc-isr-vector-install.c b/cpukit/score/cpu/powerpc/ppc-isr-vector-install.c index eab211fad0..7d75fd8e3e 100644 --- a/cpukit/score/cpu/powerpc/ppc-isr-vector-install.c +++ b/cpukit/score/cpu/powerpc/ppc-isr-vector-install.c @@ -31,9 +31,5 @@ void _CPU_ISR_install_vector( proc_ptr *old_handler ) { - _Terminate( - INTERNAL_ERROR_CORE, - false, - INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR ); } diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h index 0bd1eec831..b030a228ab 100644 --- a/cpukit/score/include/rtems/score/interr.h +++ b/cpukit/score/include/rtems/score/interr.h @@ -182,8 +182,6 @@ typedef CPU_Uint32ptr Internal_errors_t; typedef struct { /** This is the source of the error. */ Internal_errors_Source the_source; - /** This indicates if the error is internal of external. */ - bool is_internal; /** This is the error code. */ Internal_errors_t the_error; } Internal_errors_Information; @@ -225,16 +223,13 @@ extern Internal_errors_Information _Internal_errors_What_happened; * * @param[in] the_source The fatal source indicating the subsystem the fatal * condition originated in. - * @param[in] is_internal Indicates if the fatal condition was generated - * internally to the executive. * @param[in] the_error The fatal error code. This value must be interpreted * with respect to the source. * - * @see rtems_fatal_error_occurred() and rtems_fatal(). + * @see rtems_fatal() and _Internal_error(). */ void _Terminate( Internal_errors_Source the_source, - bool is_internal, Internal_errors_t the_error ) RTEMS_NO_RETURN; diff --git a/cpukit/score/include/rtems/score/smpimpl.h b/cpukit/score/include/rtems/score/smpimpl.h index 7f2de5ff70..1651a5ecc6 100644 --- a/cpukit/score/include/rtems/score/smpimpl.h +++ b/cpukit/score/include/rtems/score/smpimpl.h @@ -84,7 +84,7 @@ typedef enum { static inline void _SMP_Fatal( SMP_Fatal_code code ) { - _Terminate( RTEMS_FATAL_SOURCE_SMP, false, code ); + _Terminate( RTEMS_FATAL_SOURCE_SMP, code ); } /** diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h index e626f2f97a..61de992f23 100644 --- a/cpukit/score/include/rtems/score/userext.h +++ b/cpukit/score/include/rtems/score/userext.h @@ -195,8 +195,8 @@ typedef void( *User_extensions_thread_exitted_extension )( * * @param[in] source The fatal source indicating the subsystem the fatal * condition originated in. - * @param[in] is_internal Indicates if the fatal condition was generated - * internally to the executive. + * @param[in] is_internal This parameter is always false and provide only for + * backward compatibility reasons. * @param[in] code The fatal error code. This value must be interpreted with * respect to the source. */ diff --git a/cpukit/score/include/rtems/score/userextimpl.h b/cpukit/score/include/rtems/score/userextimpl.h index e6692c8749..6684c4a264 100644 --- a/cpukit/score/include/rtems/score/userextimpl.h +++ b/cpukit/score/include/rtems/score/userextimpl.h @@ -166,7 +166,6 @@ void _User_extensions_Thread_exitted_visitor( typedef struct { Internal_errors_Source source; - bool is_internal; Internal_errors_t error; } User_extensions_Fatal_context; @@ -300,11 +299,10 @@ static inline void _User_extensions_Thread_exitted( Thread_Control *executing ) static inline void _User_extensions_Fatal( Internal_errors_Source source, - bool is_internal, Internal_errors_t error ) { - User_extensions_Fatal_context ctx = { source, is_internal, error }; + User_extensions_Fatal_context ctx = { source, error }; _User_extensions_Iterate( &ctx, diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c index 3fddb1a04c..402f6310cd 100644 --- a/cpukit/score/src/heap.c +++ b/cpukit/score/src/heap.c @@ -157,7 +157,7 @@ ) { /* FIXME */ - _Terminate( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, 0xdeadbeef ); } #endif diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c index 8740027617..5993eb9ffc 100644 --- a/cpukit/score/src/interr.c +++ b/cpukit/score/src/interr.c @@ -28,16 +28,14 @@ System_state_Codes _System_state_Current; Internal_errors_Information _Internal_errors_What_happened; void _Terminate( - Internal_errors_Source the_source, - bool is_internal, - Internal_errors_t the_error + Internal_errors_Source the_source, + Internal_errors_t the_error ) { - _User_extensions_Fatal( the_source, is_internal, the_error ); + _User_extensions_Fatal( the_source, the_error ); - _Internal_errors_What_happened.the_source = the_source; - _Internal_errors_What_happened.is_internal = is_internal; - _Internal_errors_What_happened.the_error = the_error; + _Internal_errors_What_happened.the_source = the_source; + _Internal_errors_What_happened.the_error = the_error; _System_state_Set( SYSTEM_STATE_TERMINATED ); diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c index 1ae6e5900d..aaa05137b7 100644 --- a/cpukit/score/src/isr.c +++ b/cpukit/score/src/isr.c @@ -51,7 +51,6 @@ void _ISR_Handler_initialization( void ) if ( !_Stack_Is_enough( stack_size ) ) _Terminate( INTERNAL_ERROR_CORE, - true, INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL ); diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c index 2f0a2ded2b..e495eb455d 100644 --- a/cpukit/score/src/mpci.c +++ b/cpukit/score/src/mpci.c @@ -95,11 +95,7 @@ static void _MPCI_Handler_initialization( void ) users_mpci_table = _Configuration_MP_table->User_mpci_table; if ( _System_state_Is_multiprocessing && !users_mpci_table ) - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_NO_MPCI - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_NO_MPCI ); _MPCI_table = users_mpci_table; @@ -191,11 +187,7 @@ MP_packet_Prefix *_MPCI_Get_packet ( void ) (*_MPCI_table->get_packet)( &the_packet ); if ( the_packet == NULL ) - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_OUT_OF_PACKETS - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_OUT_OF_PACKETS ); /* * Put in a default timeout that will be used for @@ -375,11 +367,7 @@ void _MPCI_Receive_server( the_function = _MPCI_Packet_processors[ the_packet->the_class ]; if ( !the_function ) - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_BAD_PACKET - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_BAD_PACKET ); (*the_function)( the_packet ); } @@ -463,7 +451,6 @@ void _MPCI_Internal_packets_Process_packet ( _Terminate( INTERNAL_ERROR_CORE, - true, INTERNAL_ERROR_INCONSISTENT_MP_INFORMATION ); } diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c index dc8a106fa5..92a561a830 100644 --- a/cpukit/score/src/objectinitializeinformation.c +++ b/cpukit/score/src/objectinitializeinformation.c @@ -76,7 +76,6 @@ void _Objects_Do_initialize_information( if ( information->auto_extend && maximum_per_allocation == 0) { _Terminate( INTERNAL_ERROR_CORE, - true, INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0 ); } diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c index b97a9d5cff..4e6a838b0f 100644 --- a/cpukit/score/src/objectmp.c +++ b/cpukit/score/src/objectmp.c @@ -165,11 +165,7 @@ void _Objects_MP_Handler_early_initialization(void) maximum_nodes = _Configuration_MP_table->maximum_nodes; if ( node < 1 || node > maximum_nodes ) - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_INVALID_NODE - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_INVALID_NODE ); _Objects_Local_node = node; _Objects_Maximum_nodes = maximum_nodes; @@ -246,12 +242,7 @@ bool _Objects_MP_Allocate_and_open ( if ( is_fatal_error == false ) return false; - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS - ); - + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS ); } _Objects_MP_Open( information, the_global_object, the_name, the_id ); @@ -291,11 +282,7 @@ void _Objects_MP_Close ( } else { _Objects_MP_Global_release( &lock_context ); - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_INVALID_GLOBAL_ID - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_INVALID_GLOBAL_ID ); } } diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c index a0ba61d88c..1fcc639da0 100644 --- a/cpukit/score/src/thread.c +++ b/cpukit/score/src/thread.c @@ -84,11 +84,7 @@ void _Thread_Handler_initialization(void) if ( rtems_configuration_get_stack_allocate_hook() == NULL || rtems_configuration_get_stack_free_hook() == NULL) - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_BAD_STACK_HOOK - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_BAD_STACK_HOOK ); if ( stack_allocate_init_hook != NULL ) (*stack_allocate_init_hook)( rtems_configuration_get_stack_space_size() ); diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 4f89475578..6bce046d10 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -156,7 +156,6 @@ void _Thread_Do_dispatch( Per_CPU_Control *cpu_self, ISR_Level level ) ) { _Terminate( INTERNAL_ERROR_CORE, - false, INTERNAL_ERROR_BAD_THREAD_DISPATCH_ENVIRONMENT ); } @@ -241,7 +240,6 @@ void _Thread_Dispatch_direct( Per_CPU_Control *cpu_self ) if ( cpu_self->thread_dispatch_disable_level != 1 ) { _Terminate( INTERNAL_ERROR_CORE, - 0, INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL ); } diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c index a8d65804af..721dcf410b 100644 --- a/cpukit/score/src/threadhandler.c +++ b/cpukit/score/src/threadhandler.c @@ -96,9 +96,5 @@ void _Thread_Handler( void ) _User_extensions_Thread_exitted( executing ); - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_THREAD_EXITTED - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_THREAD_EXITTED ); } diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c index 22078a7d0a..59f393f23c 100644 --- a/cpukit/score/src/threadmp.c +++ b/cpukit/score/src/threadmp.c @@ -173,11 +173,7 @@ Thread_Control *_Thread_MP_Allocate_proxy ( _Thread_MP_Proxies_release( &lock_context ); - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_OUT_OF_PROXIES - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_OUT_OF_PROXIES ); /* * NOTE: The following return ensures that the compiler will diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c index cea18863d4..a96fbfcacc 100644 --- a/cpukit/score/src/threadqenqueue.c +++ b/cpukit/score/src/threadqenqueue.c @@ -372,11 +372,7 @@ void _Thread_queue_Deadlock_status( Thread_Control *the_thread ) void _Thread_queue_Deadlock_fatal( Thread_Control *the_thread ) { - _Terminate( - INTERNAL_ERROR_CORE, - false, - INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK ); } static void _Thread_queue_Timeout( @@ -525,7 +521,6 @@ Status_Control _Thread_queue_Enqueue_sticky( if ( cpu_self->thread_dispatch_disable_level != 1 ) { _Terminate( INTERNAL_ERROR_CORE, - false, INTERNAL_ERROR_THREAD_QUEUE_ENQUEUE_STICKY_FROM_BAD_STATE ); } diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c index 54491d86f2..4295bc46c2 100644 --- a/cpukit/score/src/threadrestart.c +++ b/cpukit/score/src/threadrestart.c @@ -136,11 +136,7 @@ static void _Thread_Make_zombie( Thread_Control *the_thread ) { #if defined(RTEMS_SCORE_THREAD_ENABLE_RESOURCE_COUNT) if ( _Thread_Owns_resources( the_thread ) ) { - _Terminate( - INTERNAL_ERROR_CORE, - false, - INTERNAL_ERROR_RESOURCE_IN_USE - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_RESOURCE_IN_USE ); } #endif diff --git a/cpukit/score/src/userextiterate.c b/cpukit/score/src/userextiterate.c index 6cb877452b..6e143765c2 100644 --- a/cpukit/score/src/userextiterate.c +++ b/cpukit/score/src/userextiterate.c @@ -129,7 +129,7 @@ void _User_extensions_Fatal_visitor( if ( callout != NULL ) { const User_extensions_Fatal_context *ctx = arg; - (*callout)( ctx->source, ctx->is_internal, ctx->error ); + (*callout)( ctx->source, false, ctx->error ); } } diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c index b53138db62..ae48e4482a 100644 --- a/cpukit/score/src/wkspace.c +++ b/cpukit/score/src/wkspace.c @@ -134,11 +134,7 @@ void _Workspace_Handler_initialization( } if ( remaining > 0 ) { - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_TOO_LITTLE_WORKSPACE - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_TOO_LITTLE_WORKSPACE ); } _Heap_Protection_set_delayed_free_fraction( &_Workspace_Area, 1 ); @@ -204,11 +200,7 @@ void *_Workspace_Allocate_or_fatal_error( #endif if ( memory == NULL ) - _Terminate( - INTERNAL_ERROR_CORE, - true, - INTERNAL_ERROR_WORKSPACE_ALLOCATION - ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_WORKSPACE_ALLOCATION ); return memory; } |