summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-05-13 15:50:56 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-05-13 15:50:56 +0000
commit43136ea02ba83b185207d9615c781c698930b4c8 (patch)
treeedcd30c1283a0fb04841c9cfbc08c6027acc035c /tools
parent2011-05-13 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-43136ea02ba83b185207d9615c781c698930b4c8.tar.bz2
2011-05-13 Ralf Corsépius <ralf.corsepius@rtems.org>
* rtems/interr.c: Minimize diffs to cpukit/score/src/interr.c. * rtems/sched_cpu/rtems/score/cpu.h: Incorporate parts of former posix BSP.
Diffstat (limited to 'tools')
-rw-r--r--tools/schedsim/ChangeLog6
-rw-r--r--tools/schedsim/rtems/interr.c6
-rw-r--r--tools/schedsim/rtems/sched_cpu/rtems/score/cpu.h5
3 files changed, 12 insertions, 5 deletions
diff --git a/tools/schedsim/ChangeLog b/tools/schedsim/ChangeLog
index 83412832a0..6e046b05e9 100644
--- a/tools/schedsim/ChangeLog
+++ b/tools/schedsim/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-13 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * rtems/interr.c: Minimize diffs to cpukit/score/src/interr.c.
+ * rtems/sched_cpu/rtems/score/cpu.h:
+ Incorporate parts of former posix BSP.
+
2011-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* README: New file.
diff --git a/tools/schedsim/rtems/interr.c b/tools/schedsim/rtems/interr.c
index b708f41df6..526dbe033c 100644
--- a/tools/schedsim/rtems/interr.c
+++ b/tools/schedsim/rtems/interr.c
@@ -22,9 +22,6 @@
#include <rtems/score/sysstate.h>
#include <rtems/score/userext.h>
-#include <stdlib.h>
-#include <stdio.h>
-
/*PAGE
*
* _Internal_error_Occurred
@@ -63,8 +60,7 @@ void _Internal_error_Occurred(
_System_state_Set( SYSTEM_STATE_FAILED );
- fprintf( stderr, "FATAL ERROR!!\n" );
- exit( -1 );
+ _CPU_Fatal_halt( the_error );
/* will not return from this routine */
while (true);
diff --git a/tools/schedsim/rtems/sched_cpu/rtems/score/cpu.h b/tools/schedsim/rtems/sched_cpu/rtems/score/cpu.h
index 7e206fd883..f47c8c3005 100644
--- a/tools/schedsim/rtems/sched_cpu/rtems/score/cpu.h
+++ b/tools/schedsim/rtems/sched_cpu/rtems/score/cpu.h
@@ -39,6 +39,9 @@
extern "C" {
#endif
+#include <stdio.h> /* fprintf */
+#include <stdlib.h> /* exit */
+
#include <rtems/score/no_cpu.h> /* pick up machine definitions */
#ifndef ASM
#include <rtems/score/types.h>
@@ -919,6 +922,8 @@ uint32_t _CPU_ISR_Get_level( void );
*/
#define _CPU_Fatal_halt( _error ) \
{ \
+ fprintf( stderr, "FATAL ERROR!!\n" ); \
+ exit( -1 ); \
}
/* end of Fatal Error manager macros */