Skip to content

Update function get_interrupts_disabled() to return a bool value rather #1883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 1, 2016
Merged

Update function get_interrupts_disabled() to return a bool value rather #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f052bc
Update function get_interrupts_disabled() to return a bool value rather
adbridge Jun 8, 2016
2292794
Reverse the logic to get_interrupts_disabled() to are_interrupts_enab…
adbridge Jun 9, 2016
329f8a1
Add core_util_ prefix to are_interrupts_enabled() function.
adbridge Jul 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions hal/api/critical.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
extern "C" {
#endif


/** Determine the current interrupts enabled state
*
* This function can be called to determine whether or not interrupts are currently enabled.
* \note
* NOTE:
* This function works for both cortex-A and cortex-M, although the underlyng implementation
* differs.
* @return true if interrupts are enabled, false otherwise
*/
bool core_util_are_interrupts_enabled(void);

/** Mark the start of a critical section
*
* This function should be called to mark the start of a critical section of code.
Expand Down
19 changes: 9 additions & 10 deletions hal/common/critical.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,25 @@
#define EXCLUSIVE_ACCESS (!defined (__CORTEX_M0) && !defined (__CORTEX_M0PLUS))

static volatile uint32_t interrupt_enable_counter = 0;
static volatile uint32_t critical_interrupts_disabled = 0;
static volatile bool critical_interrupts_disabled = false;

static inline uint32_t get_interrupts_disabled(void)
bool core_util_are_interrupts_enabled(void)
{
#if defined(__CORTEX_A9)
uint32_t interrupts_disabled = (__get_CPSR() & 0x80) >> 7;
return ((__get_CPSR() & 0x80) == 0);
#else
uint32_t interrupts_disabled = __get_PRIMASK();
return ((__get_PRIMASK() & 0x1) == 0);
#endif
return interrupts_disabled;
}

void core_util_critical_section_enter()
{
uint32_t interrupts_disabled = get_interrupts_disabled();
bool interrupts_disabled = !core_util_are_interrupts_enabled();
__disable_irq();

/* Save the interrupt disabled state as it was prior to any nested critical section lock use */
if (!interrupt_enable_counter) {
critical_interrupts_disabled = interrupts_disabled & 0x1;
critical_interrupts_disabled = interrupts_disabled;
}

/* If the interrupt_enable_counter overflows or we are in a nested critical section and interrupts
Expand All @@ -56,7 +55,7 @@ void core_util_critical_section_enter()
// FIXME
#ifndef FEATURE_UVISOR
if (interrupt_enable_counter > 0) {
MBED_ASSERT(interrupts_disabled & 0x1);
MBED_ASSERT(interrupts_disabled);
}
#else
#warning "core_util_critical_section_enter needs fixing to work from unprivileged code"
Expand All @@ -71,9 +70,9 @@ void core_util_critical_section_exit()

// FIXME
#ifndef FEATURE_UVISOR
uint32_t interrupts_disabled = get_interrupts_disabled(); /* get the current interrupt disabled state */
bool interrupts_disabled = !core_util_are_interrupts_enabled(); /* get the current interrupt disabled state */

MBED_ASSERT(interrupts_disabled & 0x1); /* Interrupts must be disabled on invoking an exit from a critical section */
MBED_ASSERT(interrupts_disabled); /* Interrupts must be disabled on invoking an exit from a critical section */
#else
#warning "core_util_critical_section_exit needs fixing to work from unprivileged code"
#endif /* FEATURE_UVISOR */
Expand Down