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

sparc: Add SPARC_INTERRUPT_TRAP_TO_SOURCE()

Browse Source 
Update #4171.
This commit is contained in:
Sebastian Huber
2020-11-05 09:50:36 +01:00
parent b7271f8c1e
commit 828114778d
7 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bsps/sparc/erc32/include/erc32.h
View File

@@ -85,7 +85,7 @@ extern "C" {
#define ERC32_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10) #define ERC32_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10)
#define ERC32_TRAP_SOURCE( _trap ) ((_trap) - 0x10) #define ERC32_TRAP_SOURCE( _trap ) SPARC_INTERRUPT_TRAP_TO_SOURCE( _trap )
#define ERC32_Is_MEC_Trap( _trap ) SPARC_IS_INTERRUPT_TRAP( _trap ) #define ERC32_Is_MEC_Trap( _trap ) SPARC_IS_INTERRUPT_TRAP( _trap )

2
bsps/sparc/erc32/start/setvec.c
View File

@@ -51,7 +51,7 @@ rtems_isr_entry set_vector( /* returns old vector */
if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) { if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) {
uint32_t source; uint32_t source;
source = ERC32_TRAP_SOURCE( SPARC_REAL_TRAP_NUMBER( vector ) ); source = SPARC_INTERRUPT_TRAP_TO_SOURCE( vector );
ERC32_Clear_interrupt( source ); ERC32_Clear_interrupt( source );
ERC32_Unmask_interrupt( source ); ERC32_Unmask_interrupt( source );

2
bsps/sparc/leon2/include/leon.h
View File

@@ -82,7 +82,7 @@ extern "C" {
#define LEON_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10) #define LEON_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10)
#define LEON_TRAP_SOURCE( _trap ) ((_trap) - 0x10) #define LEON_TRAP_SOURCE( _trap ) SPARC_INTERRUPT_TRAP_TO_SOURCE( _trap )
#define LEON_INT_TRAP( _trap ) SPARC_IS_INTERRUPT_TRAP( _trap ) #define LEON_INT_TRAP( _trap ) SPARC_IS_INTERRUPT_TRAP( _trap )

2
bsps/sparc/leon2/start/setvec.c
View File

@@ -52,7 +52,7 @@ rtems_isr_entry set_vector( /* returns old vector */
if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) { if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) {
uint32_t source; uint32_t source;
source = LEON_TRAP_SOURCE( SPARC_REAL_TRAP_NUMBER( vector ) ); source = SPARC_INTERRUPT_TRAP_TO_SOURCE( vector );
LEON_Clear_interrupt( source ); LEON_Clear_interrupt( source );
LEON_Unmask_interrupt( source ); LEON_Unmask_interrupt( source );

2
bsps/sparc/leon3/include/leon.h
View File

@@ -44,7 +44,7 @@ extern "C" {
#define LEON_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10) #define LEON_TRAP_TYPE( _source ) SPARC_ASYNCHRONOUS_TRAP((_source) + 0x10)
#define LEON_TRAP_SOURCE( _trap ) ((_trap) - 0x10) #define LEON_TRAP_SOURCE( _trap ) SPARC_INTERRUPT_TRAP_TO_SOURCE( _trap )
#define LEON_INT_TRAP( _trap ) SPARC_IS_INTERRUPT_TRAP( _trap ) #define LEON_INT_TRAP( _trap ) SPARC_IS_INTERRUPT_TRAP( _trap )

2
bsps/sparc/leon3/start/setvec.c
View File

@@ -51,7 +51,7 @@ rtems_isr_entry set_vector( /* returns old vector */
if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) { if ( SPARC_IS_INTERRUPT_TRAP( vector ) ) {
uint32_t source; uint32_t source;
source = LEON_TRAP_SOURCE( SPARC_REAL_TRAP_NUMBER( vector ) ); source = SPARC_INTERRUPT_TRAP_TO_SOURCE( vector );
LEON_Clear_interrupt( source ); LEON_Clear_interrupt( source );
LEON_Unmask_interrupt( source ); LEON_Unmask_interrupt( source );

17
cpukit/score/cpu/sparc/include/rtems/score/sparc.h
View File

@@ -223,6 +223,23 @@ extern "C" {
( SPARC_REAL_TRAP_NUMBER( _trap ) >= 0x11 && \ ( SPARC_REAL_TRAP_NUMBER( _trap ) >= 0x11 && \
SPARC_REAL_TRAP_NUMBER( _trap ) <= 0x1f ) SPARC_REAL_TRAP_NUMBER( _trap ) <= 0x1f )
/**
* @brief Maps the interrupt trap number to the associated interrupt source
* number.
*
* Interrupt trap numbers are real hardware vector numbers, synchronous trap
* numbers, and asynchronous trap numbers for which SPARC_IS_INTERRUPT_TRAP()
* returns true.
*
* @param _trap is the real hardware vector number, synchronous trap number, or
* asynchronous trap number to map.
*
* @return Returns the interrupt source number associated with the interrupt
* trap number.
*/
#define SPARC_INTERRUPT_TRAP_TO_SOURCE( _trap ) \
( SPARC_REAL_TRAP_NUMBER( _trap ) - 0x10 )
#ifndef ASM #ifndef ASM
/** /**