sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct irqsave/restore logic

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1172 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-11-08 17:29:32 +00:00
parent 99f82fdc03
commit 215adeef29
1 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
arch/sh/include/sh1/irq.h
View File

@ -389,25 +389,29 @@ extern "C" {
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Get the current value of the SR */
static inline irqstate_t __getsr(void)
{
irqstate_t flags;
__asm__ __volatile__ ("stc sr, %0" : "=r" (flags));
return flags;
}
/* Set the new value of the SR */
static inline void __setsr(irqstate_t sr)
{
__asm__ __volatile__ ("ldc %0, sr" : : "r" (sr));
}
/* Return the current interrupt enable state & disable IRQs */ /* Return the current interrupt enable state & disable IRQs */
static inline irqstate_t irqsave(void) static inline irqstate_t irqsave(void)
{ {
irqstate_t flags; irqstate_t flags = __getsr();
uint32 tmp; __setsr(flags | 0x000000f0);
__asm__ __volatile__
(
"stc sr, %1\n\t"
"mov %1, %0\n\t"
"or #0xf0, %0\n\t"
"ldc %0, sr\n\t"
"mov %1, %0\n\t"
"and #0xf0, %0"
: "=&z" (flags), "=&r" (tmp)
:
: "memory"
);
return flags; return flags;
} }
@ -415,36 +419,15 @@ static inline irqstate_t irqsave(void)
static inline void irqdisable(void) static inline void irqdisable(void)
{ {
unsigned long tmp; uint32 flags = __getsr();
__setsr(flags | 0x000000f0);
__asm__ __volatile__
(
"stc sr, %0\n\t"
"or #0xf0, %0\n\t"
"ldc %0, sr"
: "=&z" (tmp)
:
: "memory"
);
} }
/* Enable IRQs */ /* Enable IRQs */
static inline void irqenable(void) static inline void irqenable(void)
{ {
uint32 tmp1; uint32 flags = __getsr();
uint32 tmp2; __setsr(flags & ~0x000000f0);
__asm__ __volatile__
(
"stc sr, %0\n\t"
"and %1, %0\n\t"
"stc r6_bank, %1\n\t"
"or %1, %0\n\t"
"ldc %0, sr"
: "=&r" (tmp1), "=r" (tmp2)
: "1" (~0x000000f0)
: "memory"
);
} }
/* Restore saved IRQ state */ /* Restore saved IRQ state */