From 8b65b57472d5086f2c035a09fdb07a40285beb4a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 28 Jul 2021 14:41:32 +0200 Subject: score: Canonicalize _CPU_Fatal_halt() Move _CPU_Fatal_halt() declaration to and make sure it is a proper declaration of a function which does not return. Fix the type of the error code. If necessary, add the implementation to cpu.c. Implementing _CPU_Fatal_halt() as a function makes it possible to wrap this function for example to fully test _Terminate(). --- bsps/i386/pc386/start/bsp_fatal_halt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bsps/i386') diff --git a/bsps/i386/pc386/start/bsp_fatal_halt.c b/bsps/i386/pc386/start/bsp_fatal_halt.c index 07bbd793e0..954955dee1 100644 --- a/bsps/i386/pc386/start/bsp_fatal_halt.c +++ b/bsps/i386/pc386/start/bsp_fatal_halt.c @@ -7,9 +7,9 @@ * http://www.rtems.org/license/LICENSE. */ -#include +#include -void _CPU_Fatal_halt(uint32_t source, uint32_t error) +void _CPU_Fatal_halt( uint32_t source, CPU_Uint32ptr error ) { __asm__ volatile ( "cli\n\t" @@ -18,7 +18,5 @@ void _CPU_Fatal_halt(uint32_t source, uint32_t error) : "=r" ((error)) : "0" ((error)) ); - #ifdef __GNUC__ - __builtin_unreachable(); - #endif + RTEMS_UNREACHABLE(); } -- cgit v1.2.3