diff options
| author | Gedare Bloom <gedare@rtems.org> | 2016-01-08 16:54:20 -0500 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2016-03-03 16:36:30 -0500 |
| commit | 3267f9580f2557a17a9191e37ef3323d346435ca (patch) | |
| tree | 1256dc3fb71e66ea50b85ae4b3ab4bf65d51466e | |
| parent | i386: relocate fatal halt to bsp layer (diff) | |
| download | rtems-3267f9580f2557a17a9191e37ef3323d346435ca.tar.bz2 | |
i386: prepare for paravirtualized interrupts
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/i386/cpu.c | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/i386/rtems/score/cpu.h | 7 | ||||
| -rw-r--r-- | cpukit/score/cpu/i386/rtems/score/interrupts.h | 9 |
4 files changed, 21 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c b/c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c index c9830f6bac..efc93a0350 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c @@ -11,10 +11,9 @@ void _CPU_Fatal_halt(uint32_t source, uint32_t error) { - uint32_t _error_lvalue = ( _error ); __asm__ volatile ( "cli ; movl %0,%%eax ; hlt" - : "=r" ((_error_lvalue)) - : "0" ((_error_lvalue)) + : "=r" ((error)) + : "0" ((error)) ); } diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c index 17aa990f3c..f0bbad47a3 100644 --- a/cpukit/score/cpu/i386/cpu.c +++ b/cpukit/score/cpu/i386/cpu.c @@ -115,7 +115,11 @@ uint32_t _CPU_ISR_Get_level( void ) { uint32_t level; +#if !defined(RTEMS_PARAVIRT) i386_get_interrupt_level( level ); +#else + level = i386_get_interrupt_level(); +#endif return level; } diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/rtems/score/cpu.h index 84a8c97038..ce703aec49 100644 --- a/cpukit/score/cpu/i386/rtems/score/cpu.h +++ b/cpukit/score/cpu/i386/rtems/score/cpu.h @@ -395,6 +395,7 @@ extern Context_Control_fp _CPU_Null_fp_context; * + set a particular level */ +#if !defined(RTEMS_PARAVIRT) #define _CPU_ISR_Disable( _level ) i386_disable_interrupts( _level ) #define _CPU_ISR_Enable( _level ) i386_enable_interrupts( _level ) @@ -406,6 +407,12 @@ extern Context_Control_fp _CPU_Null_fp_context; if ( _new_level ) __asm__ volatile ( "cli" ); \ else __asm__ volatile ( "sti" ); \ } +#else +#define _CPU_ISR_Disable( _level ) _level = i386_disable_interrupts( ) +#define _CPU_ISR_Enable( _level ) i386_enable_interrupts( _level ) +#define _CPU_ISR_Flash( _level ) i386_flash_interrupts( _level ) +#define _CPU_ISR_Set_level( _new_level ) i386_set_interrupt_level( _new_level) +#endif uint32_t _CPU_ISR_Get_level( void ); diff --git a/cpukit/score/cpu/i386/rtems/score/interrupts.h b/cpukit/score/cpu/i386/rtems/score/interrupts.h index 9cf0c99028..3a7971c1ff 100644 --- a/cpukit/score/cpu/i386/rtems/score/interrupts.h +++ b/cpukit/score/cpu/i386/rtems/score/interrupts.h @@ -33,7 +33,7 @@ typedef int (*rtems_raw_irq_is_enabled) (const struct __rtems_raw_irq_connect_d * */ /**@{**/ - +#if !defined(RTEMS_PARAVIRT) #define i386_disable_interrupts( _level ) \ { \ __asm__ volatile ( "pushf ; \ @@ -71,6 +71,13 @@ typedef int (*rtems_raw_irq_is_enabled) (const struct __rtems_raw_irq_connect_d \ _level = (_eflags & EFLAGS_INTR_ENABLE) ? 0 : 1; \ } while (0) +#else +uint32_t i386_disable_interrupts( void ); +void i386_enable_interrupts(uint32_t level); +void i386_flash_interrupts(uint32_t level); +void i386_set_interrupt_level(uint32_t new_level); +uint32_t i386_get_interrupt_level( void ); +#endif /* PARAVIRT */ /** @} */ |