RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-04-21 Jennifer Averett <Jennifer.Averett@OARcorp.com

Browse Source 
PR 1777/cpukit
	* src/lib/libbsp/powerpc/shared/startup/panic.c,
	src/lib/libcpu/sh/sh7032/score/cpu_asm.c,
	src/lib/libcpu/sh/sh7045/score/cpu_asm.c,
	src/lib/libcpu/sh/sh7750/score/cpu_asm.c,
	src/lib/libcpu/sh/shgdb/score/cpu_asm.c: Consolidated access to
	_Thread_Dispatch_disable_level.
This commit is contained in:
Jennifer Averett
2011-04-21 19:04:50 +00:00
parent 0e89af816c
commit 85f5c14bd0
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/ChangeLog
View File

@@ -1,3 +1,13 @@
2011-04-21 Jennifer Averett <Jennifer.Averett@OARcorp.com
PR 1777/cpukit
* src/lib/libbsp/powerpc/shared/startup/panic.c,
src/lib/libcpu/sh/sh7032/score/cpu_asm.c,
src/lib/libcpu/sh/sh7045/score/cpu_asm.c,
src/lib/libcpu/sh/sh7750/score/cpu_asm.c,
src/lib/libcpu/sh/shgdb/score/cpu_asm.c: Consolidated access to
_Thread_Dispatch_disable_level.
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1. * configure.ac: Require autoconf-2.68, automake-1.11.1.

6
c/src/lib/libbsp/powerpc/shared/startup/panic.c
View File

@@ -9,6 +9,8 @@
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <rtems/error.h> #include <rtems/error.h>
#include <libcpu/stackTrace.h> #include <libcpu/stackTrace.h>
#include <rtems/score/thread.h>
#include <rtems/score/thread.inl>
static void static void
rebootQuestion(void) rebootQuestion(void)
@@ -101,10 +103,10 @@ void _BSP_Fatal_error(unsigned int v)
printk(" UNKNOWN (0x%x)\n",THESRC); printk(" UNKNOWN (0x%x)\n",THESRC);
break; break;
} }
if ( _Thread_Dispatch_disable_level ) if ( _Thread_Dispatch_in_critical_section() )
printk( printk(
" Error occurred in a Thread Dispatching DISABLED context (level %i)\n", " Error occurred in a Thread Dispatching DISABLED context (level %i)\n",
_Thread_Dispatch_disable_level); _Thread_Dispatch_get_disable_level());
else else
printk("enabled\n"); printk("enabled\n");

6
c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
View File

@@ -134,7 +134,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level++; _Thread_Dispatch_increment_disable_level();
#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
if ( _ISR_Nest_level == 0 ) if ( _ISR_Nest_level == 0 )
@@ -156,7 +156,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level--; _Thread_Dispatch_decrement_disable_level();
_ISR_Nest_level--; _ISR_Nest_level--;
@@ -172,7 +172,7 @@ void __ISR_Handler( uint32_t vector)
if ( _ISR_Nest_level ) if ( _ISR_Nest_level )
return; return;
if ( _Thread_Dispatch_disable_level ) { if ( _Thread_Dispatch_in_critical_section() ) {
return; return;
} }

6
c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
View File

@@ -136,7 +136,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level++; _Thread_Dispatch_increment_disable_level();
#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
if ( _ISR_Nest_level == 0 ) if ( _ISR_Nest_level == 0 )
@@ -158,7 +158,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level--; _Thread_Dispatch_decrement_disable_level();
_ISR_Nest_level--; _ISR_Nest_level--;
@@ -174,7 +174,7 @@ void __ISR_Handler( uint32_t vector)
if ( _ISR_Nest_level ) if ( _ISR_Nest_level )
return; return;
if ( _Thread_Dispatch_disable_level ) { if ( _Thread_Dispatch_in_critical_section() ) {
return; return;
} }

6
c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
View File

@@ -60,7 +60,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level++; _Thread_Dispatch_increment_disable_level();
#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
if ( _ISR_Nest_level == 0 ) if ( _ISR_Nest_level == 0 )
@@ -82,7 +82,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level--; _Thread_Dispatch_decrement_disable_level();
_ISR_Nest_level--; _ISR_Nest_level--;
@@ -97,7 +97,7 @@ void __ISR_Handler( uint32_t vector)
if ( _ISR_Nest_level ) if ( _ISR_Nest_level )
return; return;
if ( _Thread_Dispatch_disable_level ) { if ( _Thread_Dispatch_in_critical_section() ) {
return; return;
} }

6
c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
View File

@@ -33,7 +33,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level++; _Thread_Dispatch_increment_disable_level();
#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) #if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
if ( _ISR_Nest_level == 0 ) if ( _ISR_Nest_level == 0 )
@@ -55,7 +55,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Disable( level ); _ISR_Disable( level );
_Thread_Dispatch_disable_level--; _Thread_Dispatch_decrement_disable_level();
_ISR_Nest_level--; _ISR_Nest_level--;
@@ -71,7 +71,7 @@ void __ISR_Handler( uint32_t vector)
if ( _ISR_Nest_level ) if ( _ISR_Nest_level )
return; return;
if ( _Thread_Dispatch_disable_level ) { if ( _Thread_Dispatch_in_critical_section() ) {
return; return;
} }