diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-02-19 10:57:46 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-02-21 09:38:24 +0100 |
commit | 83bf1054860a09dbdc31d2661fdf5382de32774a (patch) | |
tree | 79bae04f04d7eeb18406a7bd652565c993110dfe /cpukit/score | |
parent | posix: Set pthread attribute values in detach and setschedparm methods. (diff) | |
download | rtems-83bf1054860a09dbdc31d2661fdf5382de32774a.tar.bz2 |
score: Rename _Internal_error_Occurred()
Rename _Internal_error_Occurred() into _Terminate().
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/cpu/nios2/nios2-context-initialize.c | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/nios2-isr-get-level.c | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/nios2/nios2-isr-set-level.c | 2 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/ppc-isr-vector-install.c | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/basedefs.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/coremuteximpl.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/interr.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/userext.h | 2 | ||||
-rw-r--r-- | cpukit/score/src/heap.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/interr.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/isr.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/mpci.c | 8 | ||||
-rw-r--r-- | cpukit/score/src/objectinitializeinformation.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/objectmp.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/thread.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadblockingoperationcancel.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadhandler.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/threadmp.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/wkspace.c | 4 |
19 files changed, 25 insertions, 25 deletions
diff --git a/cpukit/score/cpu/nios2/nios2-context-initialize.c b/cpukit/score/cpu/nios2/nios2-context-initialize.c index 6b884d0085..4a7c174787 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 */ - _Internal_error_Occurred( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); } } } diff --git a/cpukit/score/cpu/nios2/nios2-isr-get-level.c b/cpukit/score/cpu/nios2/nios2-isr-get-level.c index f6a51cdc10..75d51d5ebe 100644 --- a/cpukit/score/cpu/nios2/nios2-isr-get-level.c +++ b/cpukit/score/cpu/nios2/nios2-isr-get-level.c @@ -36,7 +36,7 @@ uint32_t _CPU_ISR_Get_level( void ) break; default: /* FIXME */ - _Internal_error_Occurred( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, false, 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 a753a4f7a6..a9afe2ca96 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 */ - _Internal_error_Occurred( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, false, 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 98eff81a14..3a4e456955 100644 --- a/cpukit/score/cpu/powerpc/ppc-isr-vector-install.c +++ b/cpukit/score/cpu/powerpc/ppc-isr-vector-install.c @@ -31,7 +31,7 @@ void _CPU_ISR_install_vector( proc_ptr *old_handler ) { - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, false, INTERNAL_ERROR_CPU_ISR_INSTALL_VECTOR diff --git a/cpukit/score/include/rtems/score/basedefs.h b/cpukit/score/include/rtems/score/basedefs.h index 082bfbddfd..8d2982fdfd 100644 --- a/cpukit/score/include/rtems/score/basedefs.h +++ b/cpukit/score/include/rtems/score/basedefs.h @@ -151,7 +151,7 @@ * the method will NOT return to the caller. This can assist the * compiler in code generation and avoid unreachable paths. This * can impact the code generated following calls to - * rtems_fatal_error_occurred and _Internal_error_Occurred. + * rtems_fatal_error_occurred and _Terminate. */ #ifdef __GNUC__ #define RTEMS_COMPILER_NO_RETURN_ATTRIBUTE \ diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h index d8e8bef081..d9006ad74b 100644 --- a/cpukit/score/include/rtems/score/coremuteximpl.h +++ b/cpukit/score/include/rtems/score/coremuteximpl.h @@ -258,7 +258,7 @@ RTEMS_INLINE_ROUTINE void _CORE_mutex_Seize_body( ) { if ( _CORE_mutex_Check_dispatch_for_seize( wait ) ) { - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, false, INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h index 197f648245..7dcbfba429 100644 --- a/cpukit/score/include/rtems/score/interr.h +++ b/cpukit/score/include/rtems/score/interr.h @@ -210,7 +210,7 @@ extern Internal_errors_Information _Internal_errors_What_happened; * * @see rtems_fatal_error_occurred() and rtems_fatal(). */ -void _Internal_error_Occurred( +void _Terminate( Internal_errors_Source the_source, bool is_internal, Internal_errors_t the_error diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h index bf76c35e39..deae3850f4 100644 --- a/cpukit/score/include/rtems/score/userext.h +++ b/cpukit/score/include/rtems/score/userext.h @@ -181,7 +181,7 @@ typedef void( *User_extensions_thread_exitted_extension )( /** * @brief Fatal error extension. * - * It corresponds to _Internal_error_Occurred() (used by the + * It corresponds to _Terminate() (used by the * rtems_fatal_error_occurred() directive). The first parameter contains the * error source. The second parameter indicates if it was an internal error. * The third parameter contains the error code. diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c index 8312d419c1..b13254e341 100644 --- a/cpukit/score/src/heap.c +++ b/cpukit/score/src/heap.c @@ -159,7 +159,7 @@ static uint32_t instance = 0; ) { /* FIXME */ - _Internal_error_Occurred( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); + _Terminate( INTERNAL_ERROR_CORE, false, 0xdeadbeef ); } #endif diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c index 3836f527cb..c2a9fbe00f 100644 --- a/cpukit/score/src/interr.c +++ b/cpukit/score/src/interr.c @@ -28,7 +28,7 @@ System_state_Codes _System_state_Current; Internal_errors_Information _Internal_errors_What_happened; -void _Internal_error_Occurred( +void _Terminate( Internal_errors_Source the_source, bool is_internal, Internal_errors_t the_error diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c index 0b0cbe9acd..0cea48e1a1 100644 --- a/cpukit/score/src/isr.c +++ b/cpukit/score/src/isr.c @@ -45,7 +45,7 @@ void _ISR_Handler_initialization( void ) uint32_t cpu; if ( !_Stack_Is_enough( stack_size ) ) - _Internal_error_Occurred( + _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 bc289943f3..93ca1f49ee 100644 --- a/cpukit/score/src/mpci.c +++ b/cpukit/score/src/mpci.c @@ -47,7 +47,7 @@ void _MPCI_Handler_initialization( users_mpci_table = _Configuration_MP_table->User_mpci_table; if ( _System_state_Is_multiprocessing && !users_mpci_table ) - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_NO_MPCI @@ -149,7 +149,7 @@ MP_packet_Prefix *_MPCI_Get_packet ( void ) (*_MPCI_table->get_packet)( &the_packet ); if ( the_packet == NULL ) - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_OUT_OF_PACKETS @@ -316,7 +316,7 @@ Thread _MPCI_Receive_server( the_function = _MPCI_Packet_processors[ the_packet->the_class ]; if ( !the_function ) - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_BAD_PACKET @@ -398,7 +398,7 @@ void _MPCI_Internal_packets_Process_packet ( _MPCI_Return_packet( the_packet_prefix ); - _Internal_error_Occurred( + _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 a791bd7220..6a09e09e83 100644 --- a/cpukit/score/src/objectinitializeinformation.c +++ b/cpukit/score/src/objectinitializeinformation.c @@ -78,7 +78,7 @@ void _Objects_Initialize_information( * Unlimited and maximum of zero is illogical. */ if ( information->auto_extend && maximum_per_allocation == 0) { - _Internal_error_Occurred( + _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 12daae6c91..b6a7c44190 100644 --- a/cpukit/score/src/objectmp.c +++ b/cpukit/score/src/objectmp.c @@ -33,7 +33,7 @@ void _Objects_MP_Handler_early_initialization(void) maximum_nodes = _Configuration_MP_table->maximum_nodes; if ( node < 1 || node > maximum_nodes ) - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_INVALID_NODE @@ -105,7 +105,7 @@ bool _Objects_MP_Allocate_and_open ( if ( is_fatal_error == false ) return false; - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_OUT_OF_GLOBAL_OBJECTS @@ -144,7 +144,7 @@ void _Objects_MP_Close ( } - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_INVALID_GLOBAL_ID diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c index 5587ac3a3b..c680f693c1 100644 --- a/cpukit/score/src/thread.c +++ b/cpukit/score/src/thread.c @@ -36,7 +36,7 @@ void _Thread_Handler_initialization(void) if ( rtems_configuration_get_stack_allocate_hook() == NULL || rtems_configuration_get_stack_free_hook() == NULL) - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_BAD_STACK_HOOK diff --git a/cpukit/score/src/threadblockingoperationcancel.c b/cpukit/score/src/threadblockingoperationcancel.c index 70bdb3da18..cb852b2ae1 100644 --- a/cpukit/score/src/threadblockingoperationcancel.c +++ b/cpukit/score/src/threadblockingoperationcancel.c @@ -51,7 +51,7 @@ void _Thread_blocking_operation_Cancel( #if defined(RTEMS_DEBUG) if ( (sync_state == THREAD_BLOCKING_OPERATION_SYNCHRONIZED) || (sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) ) { - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c index 80941f82de..4ecc789aff 100644 --- a/cpukit/score/src/threadhandler.c +++ b/cpukit/score/src/threadhandler.c @@ -223,7 +223,7 @@ void _Thread_Handler( void ) _User_extensions_Thread_exitted( executing ); - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_THREAD_EXITTED diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c index 1ab899b968..64d30fd765 100644 --- a/cpukit/score/src/threadmp.c +++ b/cpukit/score/src/threadmp.c @@ -77,7 +77,7 @@ Thread_Control *_Thread_MP_Allocate_proxy ( return the_thread; } - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_OUT_OF_PROXIES diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c index f437b885c0..8068c636b5 100644 --- a/cpukit/score/src/wkspace.c +++ b/cpukit/score/src/wkspace.c @@ -117,7 +117,7 @@ void _Workspace_Handler_initialization( } if ( remaining > 0 ) { - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_TOO_LITTLE_WORKSPACE @@ -185,7 +185,7 @@ void *_Workspace_Allocate_or_fatal_error( #endif if ( memory == NULL ) - _Internal_error_Occurred( + _Terminate( INTERNAL_ERROR_CORE, true, INTERNAL_ERROR_WORKSPACE_ALLOCATION |